lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run code formatter

Browse source 
🦀 Way is gone 🦀
This commit is contained in:
Nicholas Ignoffo 2019-04-14 08:22:42 -07:00
parent 7c1565a68c
commit 53b6030ba9
77 changed files with 1289 additions and 2232 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java
View file

@ -98,7 +98,8 @@ public class ElementRegistry {
return;
try (FileReader reader = new FileReader(CONFIG)) {
Map<String, Vector2f> toLoad = GSON.fromJson(reader, new TypeToken<Map<String, Vector2f>>() {}.getType());
Map<String, Vector2f> toLoad = GSON.fromJson(reader, new TypeToken<Map<String, Vector2f>>() {
}.getType());
for (Map.Entry<String, Vector2f> entry : toLoad.entrySet()) {
ElementInfo info = ELEMENT_INFO.get(new ResourceLocation(entry.getKey()));
if (info != null)

4
src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java
View file

@ -34,7 +34,9 @@ public class GuiEditHUD extends GuiScreen {
public void initGui() {
super.initGui();
addButton(new GuiButtonExt(0, width / 2 - 155, height - 30, 70, 20, I18n.format("gui.bloodmagic.toggle")){{enabled = false;}});
addButton(new GuiButtonExt(0, width / 2 - 155, height - 30, 70, 20, I18n.format("gui.bloodmagic.toggle")) {{
enabled = false;
}});
addButton(new GuiButtonExt(1, width / 2 - 75, height - 30, 70, 20, I18n.format("gui.bloodmagic.default")));
addButton(new GuiButtonExt(2, width / 2 + 5, height - 30, 70, 20, I18n.format("gui.bloodmagic.save")));
addButton(new GuiButtonExt(3, width / 2 + 90, height - 30, 70, 20, I18n.format("gui.bloodmagic.cancel")));

2
src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java
View file

@ -55,7 +55,7 @@ public abstract class ElementDivinedInformation<T extends TileEntity> extends El
if (sigilStack.getItem() instanceof ItemSigilHolding) {
List<ItemStack> internalInv = ItemSigilHolding.getInternalInventory(sigilStack);
int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilStack);
if(internalInv != null && !internalInv.get(currentSlot).isEmpty()) {
if (internalInv != null && !internalInv.get(currentSlot).isEmpty()) {
return (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_SEER && !simple) || (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION && simple);
}
}

3
src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java
View file

@ -46,7 +46,8 @@ public enum KeyBindings {
if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding)
ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1);
}
},;
},
;
// @formatter:on
private final IKeyConflictContext keyConflictContext;

12
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java
View file

@ -2,21 +2,17 @@ package WayofTime.bloodmagic.client.render.alchemyArray;
import net.minecraft.util.ResourceLocation;
public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer
{
public LowAlchemyCircleRenderer()
{
public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer {
public LowAlchemyCircleRenderer() {
this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"));
}
public LowAlchemyCircleRenderer(ResourceLocation arrayResource)
{
public LowAlchemyCircleRenderer(ResourceLocation arrayResource) {
super(arrayResource);
}
@Override
public float getVerticalOffset(float craftTime)
{
public float getVerticalOffset(float craftTime) {
return 0;
}
}

15
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java
View file

@ -2,25 +2,20 @@ package WayofTime.bloodmagic.client.render.alchemyArray;
import net.minecraft.util.ResourceLocation;
public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer
{
public LowStaticAlchemyCircleRenderer()
{
public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer {
public LowStaticAlchemyCircleRenderer() {
this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"));
}
public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource)
{
public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) {
super(arrayResource);
}
@Override
public float getRotation(float craftTime)
{
public float getRotation(float craftTime) {
float offset = 2;
float duration = 180;
if (craftTime >= offset && craftTime < offset + duration)
{
if (craftTime >= offset && craftTime < offset + duration) {
float modifier = (craftTime - offset) * 2f;
return modifier * 1f;
}

160
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java
View file

@ -13,41 +13,33 @@ import net.minecraft.world.World;
import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
import WayofTime.bloodmagic.tile.TileAlchemyArray;
public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
{
public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer {
private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png");
private ResourceLocation mobSacrificeSwirlResource = new ResourceLocation("bloodmagic", "textures/models/mobsacrificeswirl.png");
public MobSacrificeAlchemyCircleRenderer(ResourceLocation location)
{
public MobSacrificeAlchemyCircleRenderer(ResourceLocation location) {
super(location);
}
public MobSacrificeAlchemyCircleRenderer()
{
public MobSacrificeAlchemyCircleRenderer() {
this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/mobsacrifice.png"));
}
@Override
public float getSizeModifier(float craftTime)
{
if (craftTime < 40)
{
public float getSizeModifier(float craftTime) {
if (craftTime < 40) {
return 0;
} else if (craftTime > 40 && craftTime < 100)
{
} else if (craftTime > 40 && craftTime < 100) {
return (craftTime - 40) / 60f;
}
return 1;
}
@Override
public float getRotation(float craftTime)
{
public float getRotation(float craftTime) {
float offset = 50;
if (craftTime >= offset)
{
if (craftTime >= offset) {
float modifier = (craftTime - offset) * 5f;
return modifier * 1f;
}
@ -55,16 +47,13 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
}
@Override
public float getSecondaryRotation(float craftTime)
{
public float getSecondaryRotation(float craftTime) {
return 0;
}
@Override
public void renderAt(TileEntity tile, double x, double y, double z, float craftTime)
{
if (!(tile instanceof TileAlchemyArray))
{
public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
if (!(tile instanceof TileAlchemyArray)) {
return;
}
@ -94,30 +83,29 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit)
{
case DOWN:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(-90.0f, 1, 0, 0);
break;
case EAST:
GlStateManager.rotate(-90.0f, 0, 1, 0);
GlStateManager.translate(0, 0, -1);
break;
case NORTH:
break;
case SOUTH:
GlStateManager.rotate(180.0f, 0, 1, 0);
GlStateManager.translate(-1, 0, -1);
break;
case UP:
GlStateManager.translate(0, 1, 0);
GlStateManager.rotate(90.0f, 1, 0, 0);
break;
case WEST:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(90.0f, 0, 1, 0);
break;
switch (sideHit) {
case DOWN:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(-90.0f, 1, 0, 0);
break;
case EAST:
GlStateManager.rotate(-90.0f, 0, 1, 0);
GlStateManager.translate(0, 0, -1);
break;
case NORTH:
break;
case SOUTH:
GlStateManager.rotate(180.0f, 0, 1, 0);
GlStateManager.translate(-1, 0, -1);
break;
case UP:
GlStateManager.translate(0, 1, 0);
GlStateManager.rotate(90.0f, 1, 0, 0);
break;
case WEST:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(90.0f, 0, 1, 0);
break;
}
GlStateManager.pushMatrix();
@ -136,8 +124,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
// GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1);
// GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0);
for (int i = 1; i <= 3; i++)
{
for (int i = 1; i <= 3; i++) {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource);
translateAndRotateFloatingArray(tessellator, wr, size, rot, craftTime, i);
@ -153,11 +140,9 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
//Render the swirlz
float swirlSize = 3;
if (craftTime <= 40)
{
if (craftTime <= 40) {
swirlSize = 0;
} else if (craftTime <= 100)
{
} else if (craftTime <= 100) {
swirlSize = 3 * (craftTime - 40) / 60;
}
GlStateManager.pushMatrix();
@ -180,66 +165,58 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
GlStateManager.popMatrix();
}
public float getStartupPitchYawRatio(float craftTime)
{
if (craftTime <= 80)
{
public float getStartupPitchYawRatio(float craftTime) {
if (craftTime <= 80) {
return 0;
} else if (craftTime > 80 && craftTime < 140)
{
} else if (craftTime > 80 && craftTime < 140) {
return (craftTime - 80) / 60f;
}
return 1;
}
private void translateAndRotateFloatingArray(Tessellator tessellator, BufferBuilder builder, double size, float rotation, float craftTime, int circle)
{
private void translateAndRotateFloatingArray(Tessellator tessellator, BufferBuilder builder, double size, float rotation, float craftTime, int circle) {
double verticalOffset = 2;
float primaryRotation = 0;
float secondaryRotation = 0;
if (craftTime >= 40)
{
if (craftTime >= 40) {
primaryRotation = (craftTime - 40) * 4f;
secondaryRotation = (craftTime - 40) * 2f;
}
float translationOffset = 1;
if (craftTime < 80)
{
if (craftTime < 80) {
translationOffset = 0;
} else if (craftTime < 140)
{
} else if (craftTime < 140) {
translationOffset = (craftTime - 80) / 60;
}
switch (circle)
{
case 1:
GlStateManager.translate(0, 0, -verticalOffset);
GlStateManager.rotate(rotation / 200, 1, 0, 0);
GlStateManager.rotate(rotation / 10, 0, 0, 1);
GlStateManager.translate(1.7 * translationOffset, 0, 0);
break;
case 2:
GlStateManager.translate(0, 0, -verticalOffset);
switch (circle) {
case 1:
GlStateManager.translate(0, 0, -verticalOffset);
GlStateManager.rotate(rotation / 200, 1, 0, 0);
GlStateManager.rotate(rotation / 10, 0, 0, 1);
GlStateManager.translate(1.7 * translationOffset, 0, 0);
break;
case 2:
GlStateManager.translate(0, 0, -verticalOffset);
// GlStateManager.rotate(254, 0, 0, 1);
GlStateManager.rotate((float) (rotation / 150 + 120), 1, 0, 0);
GlStateManager.rotate(120, 0, 1, 0);
GlStateManager.rotate(-rotation / 10, 0, 0, 1);
GlStateManager.translate(1.2 * translationOffset, 0, 0);
break;
case 3:
GlStateManager.translate(0, 0, -verticalOffset);
GlStateManager.rotate((float) (rotation / 150 + 120), 1, 0, 0);
GlStateManager.rotate(120, 0, 1, 0);
GlStateManager.rotate(-rotation / 10, 0, 0, 1);
GlStateManager.translate(1.2 * translationOffset, 0, 0);
break;
case 3:
GlStateManager.translate(0, 0, -verticalOffset);
// GlStateManager.rotate(130, 0, 0, 1);
GlStateManager.rotate((float) (rotation / 100 + 284), 1, 0, 0);
GlStateManager.rotate(240, 0, 1, 0);
GlStateManager.rotate(-rotation / 7 + 180, 0, 0, 1);
GlStateManager.translate(2 * translationOffset, 0, 0);
break;
default:
//What are you doing, Way???
GlStateManager.rotate((float) (rotation / 100 + 284), 1, 0, 0);
GlStateManager.rotate(240, 0, 1, 0);
GlStateManager.rotate(-rotation / 7 + 180, 0, 0, 1);
GlStateManager.translate(2 * translationOffset, 0, 0);
break;
default:
//What are you doing, Way???
}
GlStateManager.rotate(primaryRotation, 0, 1, 0);
@ -249,8 +226,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
renderStandardCircle(tessellator, builder, size);
}
private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size)
{
private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) {
double var31 = 0.0D;
double var33 = 1.0D;
double var35 = 0;

143
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java
View file

@ -15,33 +15,27 @@ import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret;
import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
import WayofTime.bloodmagic.tile.TileAlchemyArray;
public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
{
public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer {
private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png");
private ResourceLocation middleArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png");
public TurretAlchemyCircleRenderer(ResourceLocation location)
{
public TurretAlchemyCircleRenderer(ResourceLocation location) {
super(location);
}
public TurretAlchemyCircleRenderer()
{
public TurretAlchemyCircleRenderer() {
this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"));
}
@Override
public float getSizeModifier(float craftTime)
{
public float getSizeModifier(float craftTime) {
return 1;
}
@Override
public float getRotation(float craftTime)
{
public float getRotation(float craftTime) {
float offset = 50;
if (craftTime >= offset)
{
if (craftTime >= offset) {
float modifier = (craftTime - offset) * 5f;
return modifier * 1f;
}
@ -49,16 +43,13 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
}
@Override
public float getSecondaryRotation(float craftTime)
{
public float getSecondaryRotation(float craftTime) {
return 0;
}
@Override
public void renderAt(TileEntity tile, double x, double y, double z, float craftTime)
{
if (!(tile instanceof TileAlchemyArray))
{
public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
if (!(tile instanceof TileAlchemyArray)) {
return;
}
@ -69,8 +60,7 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
double pitch = 0;
double yaw = 0;
int arrowTimer = -1;
if (effect instanceof AlchemyArrayEffectArrowTurret)
{
if (effect instanceof AlchemyArrayEffectArrowTurret) {
AlchemyArrayEffectArrowTurret turretEffect = (AlchemyArrayEffectArrowTurret) effect;
pitch = (turretEffect.getPitch() - turretEffect.getLastPitch()) * f + turretEffect.getLastPitch();
yaw = (turretEffect.getYaw() - turretEffect.getLastYaw()) * f + turretEffect.getLastYaw();
@ -103,30 +93,29 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit)
{
case DOWN:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(-90.0f, 1, 0, 0);
break;
case EAST:
GlStateManager.rotate(-90.0f, 0, 1, 0);
GlStateManager.translate(0, 0, -1);
break;
case NORTH:
break;
case SOUTH:
GlStateManager.rotate(180.0f, 0, 1, 0);
GlStateManager.translate(-1, 0, -1);
break;
case UP:
GlStateManager.translate(0, 1, 0);
GlStateManager.rotate(90.0f, 1, 0, 0);
break;
case WEST:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(90.0f, 0, 1, 0);
break;
switch (sideHit) {
case DOWN:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(-90.0f, 1, 0, 0);
break;
case EAST:
GlStateManager.rotate(-90.0f, 0, 1, 0);
GlStateManager.translate(0, 0, -1);
break;
case NORTH:
break;
case SOUTH:
GlStateManager.rotate(180.0f, 0, 1, 0);
GlStateManager.translate(-1, 0, -1);
break;
case UP:
GlStateManager.translate(0, 1, 0);
GlStateManager.rotate(90.0f, 1, 0, 0);
break;
case WEST:
GlStateManager.translate(0, 0, 1);
GlStateManager.rotate(90.0f, 0, 1, 0);
break;
}
GlStateManager.pushMatrix();
@ -177,93 +166,71 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
GlStateManager.popMatrix();
}
public float getStartupPitchYawRatio(float craftTime)
{
if (craftTime <= 80)
{
public float getStartupPitchYawRatio(float craftTime) {
if (craftTime <= 80) {
return 0;
} else if (craftTime > 80 && craftTime < 140)
{
} else if (craftTime > 80 && craftTime < 140) {
return (craftTime - 80) / 60f;
}
return 1;
}
public double getBottomHeightOffset(double craftTime, double arrowAnimation)
{
if (craftTime <= 40)
{
public double getBottomHeightOffset(double craftTime, double arrowAnimation) {
if (craftTime <= 40) {
return 0;
} else if (craftTime > 40 && craftTime < 100)
{
} else if (craftTime > 40 && craftTime < 100) {
return -0.4 * (craftTime - 40) / 60d;
} else if (craftTime >= 100 && craftTime < 140)
{
} else if (craftTime >= 100 && craftTime < 140) {
return -0.4 * (140 - craftTime) / 40d;
}
if (arrowAnimation > 0 && arrowAnimation < 45)
{
if (arrowAnimation > 0 && arrowAnimation < 45) {
return -0.4 * (arrowAnimation) / 45;
} else if (arrowAnimation >= 45 && arrowAnimation < 50)
{
} else if (arrowAnimation >= 45 && arrowAnimation < 50) {
return -0.4 * (50 - arrowAnimation) / 5;
}
return 0;
}
public double getMiddleHeightOffset(double craftTime, double arrowAnimation)
{
if (craftTime <= 40)
{
public double getMiddleHeightOffset(double craftTime, double arrowAnimation) {
if (craftTime <= 40) {
return 0;
} else if (craftTime > 40 && craftTime < 100)
{
} else if (craftTime > 40 && craftTime < 100) {
return 0.1 * (craftTime - 40) / 60d;
} else if (craftTime >= 100 && craftTime < 140)
{
} else if (craftTime >= 100 && craftTime < 140) {
return 0.1 * (140 - craftTime) / 40d;
}
if (arrowAnimation > 0 && arrowAnimation < 45)
{
if (arrowAnimation > 0 && arrowAnimation < 45) {
return 0.1 * (arrowAnimation) / 45;
} else if (arrowAnimation >= 45 && arrowAnimation < 50)
{
} else if (arrowAnimation >= 45 && arrowAnimation < 50) {
return 0.1 * (50 - arrowAnimation) / 5;
}
return 0;
}
public double getTopHeightOffset(double craftTime, double arrowAnimation)
{
if (craftTime <= 40)
{
public double getTopHeightOffset(double craftTime, double arrowAnimation) {
if (craftTime <= 40) {
return 0;
} else if (craftTime > 40 && craftTime < 100)
{
} else if (craftTime > 40 && craftTime < 100) {
return 0.4 * (craftTime - 40) / 60d;
} else if (craftTime >= 100 && craftTime < 140)
{
} else if (craftTime >= 100 && craftTime < 140) {
return 0.4 * (140 - craftTime) / 40d;
}
if (arrowAnimation > 0 && arrowAnimation < 45)
{
if (arrowAnimation > 0 && arrowAnimation < 45) {
return 0.4 * (arrowAnimation) / 45;
} else if (arrowAnimation >= 45 && arrowAnimation < 50)
{
} else if (arrowAnimation >= 45 && arrowAnimation < 50) {
return 0.4 * (50 - arrowAnimation) / 5;
}
return 0;
}
private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size)
{
private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) {
double var31 = 0.0D;
double var33 = 1.0D;
double var35 = 0;