From e5d1f1637cfb0f13cb8758656a7e2ec6577f8028 Mon Sep 17 00:00:00 2001 From: fewizz Date: Sun, 13 Dec 2015 21:24:42 +0300 Subject: [PATCH 1/4] Shield focus rewrite. --- .../emt/client/model/ModelCpecialArmor.java | 19 +-- .../emt/client/renderer/RenderLaser.java | 65 ++++------ .../emt/client/renderer/RenderShield.java | 61 +++++++++ .../emt/common/entities/EntityShield.java | 122 ++++++++++++++++++ .../emt/common/init/EntityRegistry.java | 3 +- .../emt/common/items/ItemMaterials.java | 7 +- .../common/items/foci/ItemShieldFocus.java | 95 +++----------- .../tombenpotter/emt/proxies/ClientProxy.java | 3 + .../textures/blocks/shield.png | Bin 2262 -> 455 bytes .../textures/blocks/solars/air/airbottom.png | Bin 0 -> 1821 bytes .../textures/blocks/solars/air/airside.png | Bin 5073 -> 821 bytes .../textures/blocks/solars/air/airside32.png | Bin 0 -> 5261 bytes .../blocks/solars/air/doublesolartop.png | Bin 0 -> 2091 bytes .../textures/blocks/solars/air/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/air/triplesolartop.png | Bin 0 -> 2661 bytes .../textures/blocks/solars/bottom32.png | Bin 0 -> 1053 bytes .../blocks/solars/dark/darkbottom.png | Bin 0 -> 1821 bytes .../textures/blocks/solars/dark/darkside.png | Bin 4682 -> 833 bytes .../blocks/solars/dark/darkside32.png | Bin 0 -> 4735 bytes .../blocks/solars/dark/doublesolartop.png | Bin 0 -> 2091 bytes .../textures/blocks/solars/dark/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/dark/triplesolartop.png | Bin 0 -> 2661 bytes .../blocks/solars/doublesolartop32.png | Bin 0 -> 1265 bytes .../blocks/solars/earth/doublesolartop.png | Bin 0 -> 2091 bytes .../blocks/solars/earth/earthbottom.png | Bin 0 -> 1821 bytes .../blocks/solars/earth/earthside.png | Bin 5187 -> 853 bytes .../blocks/solars/earth/earthside32.png | Bin 0 -> 5236 bytes .../textures/blocks/solars/earth/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/earth/triplesolartop.png | Bin 0 -> 2661 bytes .../blocks/solars/fire/doublesolartop.png | Bin 0 -> 2091 bytes .../blocks/solars/fire/firebottom.png | Bin 0 -> 1821 bytes .../textures/blocks/solars/fire/fireside.png | Bin 5253 -> 830 bytes .../blocks/solars/fire/fireside32.png | Bin 0 -> 5431 bytes .../textures/blocks/solars/fire/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/fire/triplesolartop.png | Bin 0 -> 2661 bytes .../blocks/solars/order/doublesolartop.png | Bin 0 -> 2091 bytes .../blocks/solars/order/orderbottom.png | Bin 0 -> 1821 bytes .../blocks/solars/order/orderside.png | Bin 4987 -> 835 bytes .../blocks/solars/order/orderside32.png | Bin 0 -> 5120 bytes .../textures/blocks/solars/order/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/order/triplesolartop.png | Bin 0 -> 2661 bytes .../textures/blocks/solars/side.png | Bin 2001 -> 861 bytes .../textures/blocks/solars/side32.png | Bin 0 -> 1122 bytes .../textures/blocks/solars/solartop32.png | Bin 0 -> 1967 bytes .../blocks/solars/triplesolartop32.png | Bin 0 -> 1724 bytes .../blocks/solars/water/doublesolartop.png | Bin 0 -> 2091 bytes .../textures/blocks/solars/water/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/water/triplesolartop.png | Bin 0 -> 2661 bytes .../blocks/solars/water/waterbottom.png | Bin 0 -> 1821 bytes .../blocks/solars/water/waterside.png | Bin 4990 -> 854 bytes .../blocks/solars/water/waterside32.png | Bin 0 -> 5065 bytes .../textures/models/shield.png | Bin 0 -> 185 bytes 52 files changed, 241 insertions(+), 134 deletions(-) create mode 100644 src/main/java/tombenpotter/emt/client/renderer/RenderShield.java create mode 100644 src/main/java/tombenpotter/emt/common/entities/EntityShield.java create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png create mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png create mode 100644 src/main/resources/assets/electromagictools/textures/models/shield.png diff --git a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java index a596be0..b9f7e0c 100644 --- a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java +++ b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java @@ -15,35 +15,22 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelCpecialArmor extends ModelBiped { - public ModelRenderer bipedHead; - public ModelRenderer bipedBody; - public ModelRenderer bipedRightArm; - public ModelRenderer bipedLeftArm; - public ModelRenderer rightWing; public ModelRenderer leftWing; public ModelRenderer center; - public ModelRenderer jetpack; - public boolean isJumping; - public int type = 0;// 0 - nothing, 1 - jetpack, 2 - wings - public int heldItemLeft; - public int heldItemRight; - public boolean isSneak; - public boolean aimedBow; public ModelCpecialArmor() { - this(0.0F, 0); + this(1, 0); } - public ModelCpecialArmor(float p_i1148_1_, int type) { - this(p_i1148_1_, 0.0F, 64, 32, type); + public ModelCpecialArmor(float scale, int type) { + this(scale, 0.0F, 64, 32, type); } public ModelCpecialArmor(float p_i1149_1_, float p_i1149_2_, int p_i1149_3_, int p_i1149_4_, int type) { - this.type = type; switch (this.type) { case 1: diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java index 603ce8b..2b34017 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java @@ -13,54 +13,45 @@ public class RenderLaser extends Render { private static final ResourceLocation laserTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/lasermodel.png"); - public void renderArrow(EntityLaser entityLaser, double par2, double par4, double par6, float par8, float par9) { - + public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) { this.bindEntityTexture(entityLaser); GL11.glPushMatrix(); - GL11.glTranslatef((float) par2, (float) par4, (float) par6); - GL11.glRotatef(entityLaser.prevRotationYaw + (entityLaser.rotationYaw - entityLaser.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(entityLaser.prevRotationPitch + (entityLaser.rotationPitch - entityLaser.prevRotationPitch) * par9, 0.0F, 0.0F, 1.0F); + GL11.glTranslated(x, y, z); + GL11.glRotatef(entityLaser.prevRotationYaw + (entityLaser.rotationYaw - entityLaser.prevRotationYaw) * par9 - 90, 0, 1, 0); + GL11.glRotatef(entityLaser.prevRotationPitch + (entityLaser.rotationPitch - entityLaser.prevRotationPitch) * par9, 0, 0, 1); Tessellator tessellator = Tessellator.instance; byte b0 = 0; - float f2 = 0.4F; - float f3 = 0.7F; - float f4 = (float) (0 + b0 * 10) / 32.0F; - float f5 = (float) (5 + b0 * 10) / 32.0F; - float f6 = 0.0F; - float f7 = 0.15625F; - float f8 = (float) (5 + b0 * 10) / 32.0F; - float f9 = (float) (10 + b0 * 10) / 32.0F; + float f2 = 0.4f; + float f3 = 0.7f; + float f4 = (float) (0 + b0 * 10) / 32f; + float f5 = (float) (5 + b0 * 10) / 32f; float f10 = 0.05625F; GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45, 1, 0, 0); GL11.glScalef(f10, f10, f10); - GL11.glTranslatef(-4.0F, 0.0F, 0.0F); - GL11.glNormal3f(f10, 0.0F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f8); - tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f8); - tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f9); - tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f9); - tessellator.draw(); - GL11.glNormal3f(-f10, 0.0F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f8); - tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f8); - tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f9); - tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f9); - tessellator.draw(); + GL11.glTranslatef(-4, 0, 0); + GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); for (int i = 0; i < 4; ++i) { - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glNormal3f(0.0F, 0.0F, f10); + GL11.glRotatef(90, 1, 0, 0); + GL11.glNormal3f(0, 0, f10); tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double) f2, (double) f4); - tessellator.addVertexWithUV(8.0D, -2.0D, 0.0D, (double) f3, (double) f4); - tessellator.addVertexWithUV(8.0D, 2.0D, 0.0D, (double) f3, (double) f5); - tessellator.addVertexWithUV(-8.0D, 2.0D, 0.0D, (double) f2, (double) f5); + tessellator.addVertexWithUV(-8, 0, 0, f2, f4); + tessellator.addVertexWithUV(8, 0, 0, f3, f4); + tessellator.addVertexWithUV(8, 4, 0, f3, f5); + tessellator.addVertexWithUV(-8, 4, 0, f2, f5); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(8, 0, 0, f2, f4); + tessellator.addVertexWithUV(-8, 0, 0, f3, f4); + tessellator.addVertexWithUV(-8, 4, 0, f3, f5); + tessellator.addVertexWithUV(8, 4, 0, f2, f5); tessellator.draw(); } + GL11.glPopAttrib(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); @@ -73,8 +64,4 @@ public class RenderLaser extends Render { protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.getArrowTextures((EntityLaser) par1Entity); } - - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - this.renderArrow((EntityLaser) par1Entity, par2, par4, par6, par8, par9); - } } diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java new file mode 100644 index 0000000..69e8754 --- /dev/null +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java @@ -0,0 +1,61 @@ +package tombenpotter.emt.client.renderer; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.entities.EntityLaser; + +public class RenderShield extends Render { + private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/shield.png"); + + public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) { + this.bindEntityTexture(entityLaser); + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + Tessellator tessellator = Tessellator.instance; + GL11.glEnable(GL11.GL_BLEND); + GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + for (float h = 0; h < 360; h += 15) { + for (float angle = 0; angle < 360; angle += 15) { + float sin1 = (float) Math.sin(Math.toRadians(angle)); + float sin2 = (float) Math.sin(Math.toRadians(angle + 15)); + + float cos1 = (float) Math.cos(Math.toRadians(angle)); + float cos2 = (float) Math.cos(Math.toRadians(angle + 15)); + + float hsin1 = (float) Math.sin(Math.toRadians(h)); + float hsin2 = (float) Math.sin(Math.toRadians(h + 15)); + + float hcos1 = (float) Math.cos(Math.toRadians(h)); + float hcos2 = (float) Math.cos(Math.toRadians(h + 15)); + + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(sin1 * 2 * hcos1, 2 * hsin1, cos1 * 2 * hcos1, 1, 1); + tessellator.addVertexWithUV(sin1 * 2 * hcos2, 2 * hsin2, cos1 * 2 * hcos2, 1, 0); + tessellator.addVertexWithUV(sin2 * 2 * hcos2, 2 * hsin2, cos2 * 2 * hcos2, 0, 0); + tessellator.addVertexWithUV(sin2 * 2 * hcos1, 2 * hsin1, cos2 * 2 * hcos1, 0, 1); + tessellator.draw(); + } + } + + GL11.glPopAttrib(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } + + @Override + protected ResourceLocation getEntityTexture(Entity texture) { + return shieldTexture; + } + +} diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityShield.java b/src/main/java/tombenpotter/emt/common/entities/EntityShield.java new file mode 100644 index 0000000..d42e830 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/entities/EntityShield.java @@ -0,0 +1,122 @@ +package tombenpotter.emt.common.entities; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.core.IC2; +import net.minecraft.client.Minecraft; +import net.minecraft.command.IEntitySelector; +import net.minecraft.entity.Entity; +import net.minecraft.entity.IProjectile; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class EntityShield extends Entity implements IProjectile { + EntityPlayer owner; + + public EntityShield(World world) { + super(world); + this.setSize(4, 4); + this.ignoreFrustumCheck = true; + owner = Minecraft.getMinecraft().thePlayer; + this.setPosition(owner.posX, owner.posY, owner.posZ); + } + + public EntityShield(World world, EntityPlayer player) { + super(world); + this.setSize(4, 4); + owner = player; + this.setPosition(player.posX, player.posY, player.posZ); + this.ignoreFrustumCheck = true; + } + + @Override + protected void entityInit() { + this.dataWatcher.addObject(16, Byte.valueOf((byte) 0)); + } + + @SideOnly(Side.CLIENT) + public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) { + this.setPosition(par1, par3, par5); + this.setRotation(par7, par8); + } + + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { + } + + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { + } + + public AxisAlignedBB getBoundingBox() { + return this.boundingBox; + } + + @Override + public boolean canBePushed() { + return true; + } + + public void setPosition(double x, double y, double z) { + this.posX = x; + this.posY = y + 0.5f; + this.posZ = z; + float f = this.width / 2.0F; + float f1 = this.height; + this.boundingBox.setBounds(x - (double) f, y - (double) this.yOffset - 2 + (double) this.ySize, z - (double) f, x + (double) f, y - (double) this.yOffset - 2 + (double) this.ySize + (double) f1, z + (double) f); + } + + public void onUpdate() { + super.onUpdate(); + if (!owner.worldObj.isRemote) { + this.setPosition(owner.posX, owner.posY, owner.posZ); + if (!owner.isUsingItem()) { + this.setDead(); + } + } + } + + public void applyEntityCollision(Entity entity) { + if (entity.riddenByEntity != this && entity.ridingEntity != this) { + double ePosX = entity.posX - this.posX; + double ePosZ = entity.posZ - this.posZ; + double d2 = MathHelper.abs_max(ePosX, ePosZ); + d2 = (double) MathHelper.sqrt_double(d2); + ePosX /= d2; + ePosZ /= d2; + double d3 = 1.0D / d2; + + if (d3 > 1.0D) { + d3 = 1.0D; + } + + ePosX *= d3; + ePosZ *= d3; + ePosX *= 0.05000000074505806D; + ePosZ *= 0.05000000074505806D; + ePosX *= (double) (1.0F - this.entityCollisionReduction); + ePosZ *= (double) (1.0F - this.entityCollisionReduction); + this.addVelocity(-ePosX * 1000, 0.0D, -ePosZ * 1000); + entity.addVelocity(ePosX * 1000, 0.0D, ePosZ * 1000); + + } + } + + @SideOnly(Side.CLIENT) + @Override + public boolean isInRangeToRender3d(double x, double y, double z) { + return true; + } + + @Override + public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_) { + } +} diff --git a/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java b/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java index 9be62d9..a828bce 100644 --- a/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java @@ -7,6 +7,7 @@ import net.minecraft.entity.EntityLiving; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.common.entities.EntityArcher; import tombenpotter.emt.common.entities.EntityLaser; +import tombenpotter.emt.common.entities.EntityShield; public class EntityRegistry { @@ -22,7 +23,6 @@ public class EntityRegistry { return startEID; } - @SuppressWarnings("unchecked") public static void registerEntityEgg(Class entity, int colPrim, int colSec) { int id = getUniqueEntityID(); EntityList.IDtoClassMapping.put(id, entity); @@ -34,6 +34,7 @@ public class EntityRegistry { cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityLaser.class, "laser", entityIDs++, ElectroMagicTools.instance, 80, 3, true); cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityArcher.class, "archer", entityIDs++, ElectroMagicTools.instance, 80, 3, true); + cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityShield.class, "shield", entityIDs++, ElectroMagicTools.instance, 80, 3, true); registerEntityEgg(EntityArcher.class, 0x99111F, 0xE5685); } } diff --git a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java index 756b469..ba24d95 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java @@ -130,9 +130,8 @@ public class ItemMaterials extends Item { list.add(new ItemStack(this, 1, i)); } } - - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) - { + + public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { if (stack != null && stack.getItemDamage() == 6 && this.getMaxItemUseDuration(stack) - count >= 40) { World world = player.worldObj; player.swingItem(); @@ -171,7 +170,7 @@ public class ItemMaterials extends Item { } player.stopUsingItem(); } - } + } public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (stack.getItemDamage() == 6) { diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java index dd0b5e3..a9371a1 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java @@ -1,8 +1,13 @@ package tombenpotter.emt.common.items.foci; +import java.util.ArrayList; +import java.util.LinkedList; + +import ic2.core.IC2; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -11,13 +16,11 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.common.entities.EntityShield; import tombenpotter.emt.common.init.BlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { - int y1 = 0; - ItemStack milk; - - private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10); + private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5); public ItemShieldFocus() { super(".focus.shield", "focus_shield"); @@ -46,80 +49,24 @@ public class ItemShieldFocus extends ItemBaseFocus { @Override public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - - if (player.capabilities.isCreativeMode || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { - - player.motionX = 0.0D; - if (!player.capabilities.isCreativeMode && player.motionY < 0) - player.motionY = player.motionY / 2; - player.motionZ = 0.0D; - - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.posY); - int z = MathHelper.floor_double(player.posZ); - - if (milk == null) - milk = (new ItemStack(Items.milk_bucket)); - player.curePotionEffects(milk); - - if (player.motionY > -5) { - // Player Level - if (player.worldObj.isAirBlock(x + 1, y, z) && player.worldObj.isAirBlock(x - 1, y, z) && player.worldObj.isAirBlock(x, y, z + 1) && player.worldObj.isAirBlock(x, y, z - 1)) { - player.worldObj.setBlock(x + 1, y, z, BlockRegistry.shield); - player.worldObj.setBlock(x - 1, y, z, BlockRegistry.shield); - player.worldObj.setBlock(x, y, z + 1, BlockRegistry.shield); - player.worldObj.setBlock(x, y, z - 1, BlockRegistry.shield); - } - - // Above the player - if (player.worldObj.isAirBlock(x + 1, y + 1, z) && player.worldObj.isAirBlock(x - 1, y + 1, z) && player.worldObj.isAirBlock(x, y + 1, z + 1) && player.worldObj.isAirBlock(x, y + 1, z - 1)) { - player.worldObj.setBlock(x + 1, y + 1, z, BlockRegistry.shield); - player.worldObj.setBlock(x - 1, y + 1, z, BlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z + 1, BlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z - 1, BlockRegistry.shield); - } - - if (y > y1 && (player.worldObj.isAirBlock(x + 1, y - 2, z) && player.worldObj.isAirBlock(x - 1, y - 2, z) && player.worldObj.isAirBlock(x, y - 2, z + 1) && player.worldObj.isAirBlock(x, y - 2, z - 1)) - || (player.worldObj.getBlock(x + 1, y - 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x - 1, y - 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x, y - 2, z + 1) == BlockRegistry.shield && player.worldObj.getBlock(x, y - 2, z - 1) == BlockRegistry.shield)) { - player.worldObj.setBlockToAir(x + 1, y - 2, z); - player.worldObj.setBlockToAir(x - 1, y - 2, z); - player.worldObj.setBlockToAir(x, y - 2, z + 1); - player.worldObj.setBlockToAir(x, y - 2, z - 1); - } - - if (y < y1 && (player.worldObj.isAirBlock(x + 1, y + 2, z) && player.worldObj.isAirBlock(x - 1, y + 2, z) && player.worldObj.isAirBlock(x, y + 2, z + 1) && player.worldObj.isAirBlock(x, y + 2, z - 1)) - || (player.worldObj.getBlock(x + 1, y + 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x - 1, y + 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x, y + 2, z + 1) == BlockRegistry.shield && player.worldObj.getBlock(x, y + 2, z - 1) == BlockRegistry.shield)) { - player.worldObj.setBlockToAir(x + 1, y + 2, z); - player.worldObj.setBlockToAir(x - 1, y + 2, z); - player.worldObj.setBlockToAir(x, y + 2, z + 1); - player.worldObj.setBlockToAir(x, y + 2, z - 1); - } - } - - y1 = y; + for (PotionEffect effect : new LinkedList(player.getActivePotionEffects())) { + IC2.platform.removePotion(player, effect.getPotionID()); + } + if (player.capabilities.isCreativeMode) + return; + if (!wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { + player.stopUsingItem(); } } @Override - public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) { - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.posY); - int z = MathHelper.floor_double(player.posZ); - - // Player Level - if ((player.worldObj.getBlock(x + 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == BlockRegistry.shield)) { - player.worldObj.setBlockToAir(x + 1, y, z); - player.worldObj.setBlockToAir(x - 1, y, z); - player.worldObj.setBlockToAir(x, y, z + 1); - player.worldObj.setBlockToAir(x, y, z - 1); - } - - // Above the player - if ((player.worldObj.getBlock(x + 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == BlockRegistry.shield)) { - player.worldObj.setBlockToAir(x + 1, y + 1, z); - player.worldObj.setBlockToAir(x - 1, y + 1, z); - player.worldObj.setBlockToAir(x, y + 1, z + 1); - player.worldObj.setBlockToAir(x, y + 1, z - 1); + public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition paramMovingObjectPosition) { + ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); + player.setItemInUse(itemstack, Integer.MAX_VALUE); + if (!world.isRemote && (player.capabilities.isCreativeMode || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true))) { + EntityShield shield = new EntityShield(world, player); + world.spawnEntityInWorld(shield); } + return itemstack; } } diff --git a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java index e2b299d..5b89636 100644 --- a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java +++ b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java @@ -8,8 +8,10 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.client.renderer.RenderLaser; +import tombenpotter.emt.client.renderer.RenderShield; import tombenpotter.emt.common.entities.EntityArcher; import tombenpotter.emt.common.entities.EntityLaser; +import tombenpotter.emt.common.entities.EntityShield; public class ClientProxy extends CommonProxy { @@ -22,5 +24,6 @@ public class ClientProxy extends CommonProxy { public void registerRenders() { RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser()); RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderSnowMan()); + RenderingRegistry.registerEntityRenderingHandler(EntityShield.class, new RenderShield()); } } diff --git a/src/main/resources/assets/electromagictools/textures/blocks/shield.png b/src/main/resources/assets/electromagictools/textures/blocks/shield.png index eee71316d473d3c02f13fb8643670fa2b4950b73..54056a2294790d1f23598ca7ec0d682ca5c8ccf4 100644 GIT binary patch delta 440 zcmca6c$|5HWIYoD1H&JQw~K+4Lb6AYF9SoBDg#49GXulV|3LaB14F3+1H-EX1_rAc z3=HD=lj4uM0o8IActjR6FmMZjFyp1Wb$@_@5+$w?CBgY=CFO}lsSE{)nRz98d8s7| zCVB>XW`BB;?=vtkYI?djhIn|top@J|*-_+pefoyn$E!^=I%9+O7OSQx3r-Z#4UNxV z#5-HaTcs&u$A;VQw$*Ap*Zg<>;hB=chpaI^pH4qXc{acJ*%S4wSef#|Ltg^AH-7BW zl-G3J)F|lqjk(Ne&R5}crp=GGEWeSJ_>6Dbxz9UaBwGjY)(fz)nwhSq#yAxdbPvCj+_Ja6;mk$;!mI_nmhzovuJ3P6}dClI$ zd+y6P?-)p2)4#iZneC1K0z+n7g-gsy670ts3ln4z f)WQD+0*|?Wm)w@=?RXao3|j_IS3j3^P6*m4u^9J4-<&75tw-K_ShFOn}@JrJ{l@P*TD+Z2g2WIg zPu+SO3dG^;wyI(zs6@1uD}yy8aKeUU(&#WW4i^|?(t)yM2nD22l1j@X^i^LW04h0; z5X%%%L^?jCRE3%K&^mKujLe)YCmh(iViIK(8WjlOkf=-she}-z&?rbPXG(P$(Y=_FX6M5b~$95RJQrqPI)1rbTrqM(VWMSLb1 z1P~(At8}Oe)&diZpcFQsJObwFyCZ0HBGCt8E%H84SjfmGP)DYcC}fRh;#_a75mXHQ z*Nu-_BQdEuh%AN>*r1nT`B3;wg0a~BvCxDe<_-5RdKH!wP%VIE1`VV|!v#D7_J<@_ z$+-bij!ep;vxp2(DkXw!hJpynXbK{m!lAI)bPAgZQYU#nh7YB&Xw+a9hr-}sIS6G0 z^JxMhpUvm6X-o=DD4fKGYY`OG%AiSY6{h_j%l<FF6xPSUuzIozqLeTSBT85Y z@cDpmtV%0~jfmewhTa`m0O?gJkX)#THNe{tb5$RaXM-#jLm`tBp#YhJ$f7WqM7CVP zBC@0u8iTEnaTFkf@E$M!e?v#coFY%u$^X>N8O>>g!5z5Aj%n|@ z6<3c0CDk0>V0%G@X`Z|od8G?n2Kq`a4ZKMGGO4_;>{-gU+=9`-iu=cJHfK1r6+|v8 zxv;UVV-fEfa~7W$bj2OXdj+#=jX-Q=h{gT;{tE8P=eA>&(+HYveUDoGJP)pG9ycFt zbQ!aa`_*r$3|S$HR#v?ZdhD$CeztaftASH+F^44(_T7EZMaZv?Y6fY?DsP+%k9Gfo zD{1mxw)E97{Q>MHKzu(v%6DmN9UORa%K7QMJTb+UE@g=KNggxe#(ulKr5kO2X#4Ad z%)0fK3*y?+spjE91G^^TrzJz}4od>k>$-UjWnM~URlfa^ zh|1&#RdvxP(+O@R_THN0^}Xl*)mrU-K&;L$Yk9eyh2zeeK39CACO<}2cj8W-r0uh)(b+>6ZaeN*FOldui2>?!mz&;hdf&FKX(OpLir(G#7+LE z#PNx254*o_pCehARbM*&mrXDKQBz1prT`BS{kVrX*Jp39eWUnt)`5#kocmtKpCWy> zF>>14caH9O(iCzuHZ57{=}mK#MA9-(Zn*U4?=svD5;Z^#}?ikqOU#eejh>}x)bec)c&_2Urk=y_)Kc+5y#n=(}^ zygXMMJz{QDW0mrFUrEu-^Oz=&b`cGdK-ucSpQ1&=`^Z4(hxIUa;*v;eg z#95_I6$bosirhN$bNL`;1N(?Kv&60caKk~v?$8BoZ+^A+?X2A&ZTKu@g-egZ_1YlE@ojhy#lhB;wY_$z|6JhAurB0HVeZeGGDvojU+H*S37W}OqX ztif)-D4f3RUVPjYC)M^E`Q3VGKPPEKyCx~Q>dW{ROKQ?!phWAT{-kzkT3pVdZFPqJ zAEifzdM(VAo_U98uZcUahSi=;`(BeOPIgN|C3OQ?w+JUk z@WGB&*^0s?uEhKO1yg4i$^9E_1s%8}r!IeTyLixd<;qc2LtO6Z$HPT9JM60R=~j>9 SDNz$QjquP&!I_Z6UH<`A?xw&1 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9ddf27c63a790f9f6ad5d719b1dceeefee001b9c GIT binary patch literal 1821 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 n1)vNrSXf!i9buqr^_v6w- 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png new file mode 100644 index 0000000000000000000000000000000000000000..68c7fe501e6e958d47fe57934b571ac397efbb5b GIT binary patch literal 1053 zcmV+&1mgRNP)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMHD!e|WdHyJn@L1LR7gvmmRnB~Q4~h|7v<5&rBE)VK%p%lB7uKmG?)kkt5GAy z2Ol&F5~C=_8Wm824ynCz~SK`6?S)be?)9-Y%B+;a4ql;g8lvd{}(I-UK>kG zO9+S-N(Zj%fM_Wpb_fPwdU`q$Xy$qR!h)hx*4Nib-!$q3LKi*W1hFF(XeuWH`X?4B zy-olKwzjs?>wAXMS65d(etCI*eqQN`AlI2G^ba5qak_{F9HauSkS>&ds-UH{Eu(dN z&p_bWhUF)@9Edf;Pa>p@9XA5U0$ZdHJvc;*odBn22t=(`lS98Ak3d~Sy7+ATjPUrK zo$m&M?d@%H)j6bpG88S;4b^H@>H5_G9}Bb^&lVgV9g(XkMAr+RUEr`mOazb!N|g$0 zU97CENWjeVfW18?rP5=8;9s={c(@ma$5*RK7fHa}5UfK#3D7M>$8g;%1xV0Nbu7?E zuiY*Fo8uIMJT-#rUMWBVyP*WF*>)EImA)Cj40SFYa$pcmccopFER(R*senMZ;AH>- zlR&iEq`)Qkm;!LY|0o?WYv#SGz2LAU6@+H;_ED!3smNkwbpaly#N zu}6l|&ARx+pepwhlnO`}{42Dpr|Ci=ws|gecJ~|$L@dx-jGL_+{7LCUk3T6$-yC`Z z(uE7283;ZY2*mqol*e-{8=zqD*M^&?A+Yk z-GF8SFAcT#fuUCwT_hMYp$%BDON*O^qOKU-`TSXe)X^vqe=E>;HR&mh0&!{!NPlO< z0@B5~rY8S<@98b5wC6fi_%zpdYf^M-r7}E{FZ5CLy-XP@SF}zkeEL&bvspzarK#yR Xb*Cv`mbI>o00000NkvXXu0mjf%(Bcm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9ddf27c63a790f9f6ad5d719b1dceeefee001b9c GIT binary patch literal 1821 zcmbVNX;2eq7>21;?s0t$iITnj+MD&+G+@S-wLPU?? z$e1#%7>mO~$P@kwF5fiAg0hq#pDAGS`R+_U2Z3koe2nkzBj#{9K71xyz=L5wwy%Wm@8>7> z@%Ljf#lHT2GhC@gPa+x=o6*K8?P)IWlU$)#han`P3nPg5nJNg0BS=CYM`!`D7;uZg zH44J0Ut`YD`wL4j9d5uB{yIVpOodp8e?*>-aJg(HssJ$_ssy=AHV5P@lw6Q2XR_FQ zB`Q!NZ2B}`@qa@HQBFbTI{8oC%xqD`Xr6xP0&4N0k1!3@JUXgNqHa_vspj*QN_@gh zt+$S}1v+n9vey;f*J#SwHwWD5aBHO1+HIsJ6)fX@J{H$e^)jTiqbUmlvVc>ar6UV+ z8;eHkC%biv%C0qBw|F;LI4DY_%&V?@Y&uyGSeCwJ!t+wty5~=to6C2x7db>n zN6&>AyW??uBsTo~wR4q~TOu!pdDd5p_4I{ZwWBwggPh;#b(1OEy;4lj;Ly-D@9vT7 zm%GPX+uI!s21Cw)194h|p|-QPS8}wzKYeU$tfr?2EjBjwSNDf=iha8J{0rpYxsBhr zxpp^?7kj&^s>(=`2Xb>=^QGPwoSkbbD%P}T1q27@Y9hkJJ6*R$MJ*26xN+`hEiF(@ z=bJaphldS@a8pVOW7V%++Q`&{r%Ez^mcwfT?Hix;_MRE;>|DxPOLPfZ$8Dzv@>g_UTy+ra%6{Ocy4UA^H{ki=rxjh9=WAQfjKP|{ zCkpRW9y7LDk4y{=J&tkyBfG+`{BY}FY;kT*jt!5;TV90n!uFK?hCi@=`0#I)t9s#~ zv(I#ecaGMjMCQp{ER(l43^?ZXY>)5bT^|!o9=2>gZ7r0p&L2tMS@CL6E>Qf5ctu;g zd^^$J(&9RP?W!XG;qVu8($dnxH!F^o6i#T>=<4IIiQBth^Grq6?=Y*&wVeY4zZjM| zIbCTeK6&y<FR?EAAJ((UGtd=07K%pvb?c|(Iu9j~C9%N)>*qv=dN34iC_Z2o* zN{=_g>-BaP>9dwL*#_*kY;F7c#k|P zON%b#GdA?$;@9vyvkB@1>`d!=3Wu+Qx5?v__-heL_m@uHu8 zoUc70r{4!p`3jyE6r^9;n~`mFNeisp`gZ@Ew}fq;b^q4d*RPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0fCLUEegU8K9e+$`$5u_4JPEtA@4FA| z&Mtear#A-^NfpME3XF`EOJn6qZ5rw`4`H-C4t@Q3$PW~uzc2u``V7p@%>zH0Jc8Nz z1-Ns!3vOOeo=jkA>FM9F(b$1t@=x^hdkhpKf_nXN8XfWlK|tt`aDu_1VX#?3i;GXv zsBD7vG11lC11$p8EMZtP5Lm$Q9ZsNI$9~XZ+b1gU@rw#;A;bj=`Doq*5CnoQ8%|If z9Rn2WWF@^77II zT(M|f%ja64kkGCKKbphu>l8RHE-p-vt~)_eodQh-@V9do|LmIg9cO1}y2)u;1X|z$ zESQs%6E3<0epvzz5g-;6g%jvi92^7I`+p1cxMXvE-~@izIQaDW^z^jjCE|gwijNZ{ zQ#H^O9id$<)8;*n-{e3L)O)hMa4qmpp^yYxj&d06YMwuFZL1NjJHhmW8L$K!mSFwS zHvxl-&iL6JCRkowi`EOpLFg>-2e*_Vft%_mn44dKXyV!P7cbX0fNO;eSTOMZ@JR3k zz{=+9Xx-i9Hi9(&^tyI}iAojxgoS)GuVt?7AP{uf&<9Rjpq!67CQ#VNFSZE$cTwOl ztP=<)JziFyhae(ogD>ca6X@f2aJU40 z`2y&3Lmz(n$6c*W!%%4i#wQbFvQh;-s`_vi*<228XEJcZf=uQYMqY!3F%O6900000 LNkvXXu0mjf4ee=R literal 4682 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png new file mode 100644 index 0000000000000000000000000000000000000000..797aa005ddb172ededa23ef3b51ce716cf6c0646 GIT binary patch literal 2091 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png new file mode 100644 index 0000000000000000000000000000000000000000..5f564413d16c7c0db151053ff22bf28380b51335 GIT binary patch literal 1265 zcmVN2bZe?^J zG%heMHD!e|WdHyKZ%IT!R7gv;mS0aIR~U!;Szyi?rpDAkfwim~L_lV6`0ETH?x2Ep zDC(}&8f7)Of=epy#$^RX5SO*ONt-m=O?t6SdeNIEz3WHnOV1=7jHc(N$&+m*FjUefbpe^j*G0##7mupk`wF`120oS9W|`{%MYhopekh>h;y@ibRtr3R z5(MWLoj$>L>5#&UdeTH&x&Dk*8bp zUYADdE&qp_aP!wsW8EVMeUdC#pJ07xl02La4JJd@q{J(d zRf$?>LxYN9OQ#%~Q9zR!7cg14Rs!XD=pP4oaXp*{s4CHK& z|LwvK63l0DJk=znA zfyi*egQZ&|ph@bBY!s+=EosY!2a@68MA!<~WOO7c4n*Vjd397X3TTpj01ZjSAt4eUbABD6w- zK%k%~Dk>sN7e%(pL7&BMGOMsU6or5GXb;YTf=m3P`y7!V zlW>W#j8Gs{<&UJwf^yVIWR4&T&PjvW5~8;k!BfY<49F1_BIxAl3JpicCBCxD!RAZb zR3hOO1Wn@-UpplV4JY_3)d+z>VUS^fP9u1*DKv&Vn?`db&;gnol?G7hY%-0;arfZR zn1nYM5mQr3q#Pm0d!vP|xWrTxRdJ|PtyW9Xx>1zs6e^9)W>Wz=l};yP2(l(yfkHa6 zLgTz_0Yo&gTBbr}N(EubA|zI3qFf^8>FW^Ws?gB4h83DOiNaDw)j=vMjRH{R@};<5 zp*5%w`OA%WqBT+3DugOTG|EghjGc$nd6|sm?(c<`fS5O&FtrRj6et~3!kKbJf$~8v z5&J@s$Rr#OF&h>$-I!!|NGv8pEO#jxg6UE+3t$5*mK(rgK(u8$@8YvT(9NI8<^}iy z0F4&l#sZmsERaVF@ME$7H;}o^Dw;A7H|6qQDDuZ z#=2yqb2bf!GYaQ}zEQdx-&Ai?ItEznoM&*$3~-Ob%{Y^bmv)h|j)GGKEW##IF2CN9 zwPJB+q>)K|kS{x`u>X0A9pI?8tv;E)quYR4xK&weEL4s2r57RDDlBa{O!44e%(5Hs8kZr{Om#7nBQlspL5dt zSR+nP2kezCb^-)k*w=LnD1Lr)O+f{zsWQWI<(Li0oPI6Bt5dYO`%u;mzdn|~jOD~` z^=b4Ab%`V$!#{N@0%Dl9?N$c*@e|I0c2@5FQDXkrjk(Q?j&RbM!as@D5sJ{j)vb+I z-Bl$78kYE{mrri6qdvBA6=QkE{34rrPv~-t+i=gUot)p|g)y(%XEf)hX zio*CdRfDx9o+d7hhi63hLtx|5Ev_fQg(q;u5rfFzCYG>b=6M{9AP$ zT|1K_PsMqg9qXGa^53o#G!RV8|AdFl`TAh`L08u#Jy(Bqk7aglLRXibJxd?`avORj z5{jyx6&#Z6)q&Q<>axpbXY(+?7vOSukEzEap_(y|BC`r zbj+h~H?GlJPF)2`rdmk{Jo_1K)5DGbB&&0Xr}aF?R=70wBmMzR3a8>=faB4!^ZCFX zxAB(Wat`w-27)m+vHgd%$cy3;@c@a(7KZgDXWq7%iD}8s)O=2~KQhW|%N`l;I)%r3 zIb~M|6#j0wX7{zJseC*>ucN)v`+ktRE$jH)C-Yx`vKIfX+?vAH>Dg)i-EprL+nH^_ zMT_9-)|t_D^MNyuUwrw#aU71bMk;~(6CQ@;GQOXjIO55v3T~;G_GIs<#KWBvJ5Cx5 z57zef6u4I0>HUgqsQxVXSB921;?s0t$iITnj+MD&+G+@S-wLPU?? z$e1#%7>mO~$P@kwF5fiAg0hq#pDAGS`R+_U2Z3koe2nkzBj#{9K71xyz=L5wwy%Wm@8>7> z@%Ljf#lHT2GhC@gPa+x=o6*K8?P)IWlU$)#han`P3nPg5nJNg0BS=CYM`!`D7;uZg zH44J0Ut`YD`wL4j9d5uB{yIVpOodp8e?*>-aJg(HssJ$_ssy=AHV5P@lw6Q2XR_FQ zB`Q!NZ2B}`@qa@HQBFbTI{8oC%xqD`Xr6xP0&4N0k1!3@JUXgNqHa_vspj*QN_@gh zt+$S}1v+n9vey;f*J#SwHwWD5aBHO1+HIsJ6)fX@J{H$e^)jTiqbUmlvVc>ar6UV+ z8;eHkC%biv%C0qBw|F;LI4DY_%&V?@Y&uyGSeCwJ!t+wty5~=to6C2x7db>n zN6&>AyW??uBsTo~wR4q~TOu!pdDd5p_4I{ZwWBwggPh;#b(1OEy;4lj;Ly-D@9vT7 zm%GPX+uI!s21Cw)194h|p|-QPS8}wzKYeU$tfr?2EjBjwSNDf=iha8J{0rpYxsBhr zxpp^?7kj&^s>(=`2Xb>=^QGPwoSkbbD%P}T1q27@Y9hkJJ6*R$MJ*26xN+`hEiF(@ z=bJaphldS@a8pVOW7V%++Q`&{r%Ez^mcwfT?Hix;_MRE;>|DxPOLPfZ$8Dzv@>g_UTy+ra%6{Ocy4UA^H{ki=rxjh9=WAQfjKP|{ zCkpRW9y7LDk4y{=J&tkyBfG+`{BY}FY;kT*jt!5;TV90n!uFK?hCi@=`0#I)t9s#~ zv(I#ecaGMjMCQp{ER(l43^?ZXY>)5bT^|!o9=2>gZ7r0p&L2tMS@CL6E>Qf5ctu;g zd^^$J(&9RP?W!XG;qVu8($dnxH!F^o6i#T>=<4IIiQBth^Grq6?=Y*&wVeY4zZjM| zIbCTeK6&y<FR?EAAJ((UGtd=07K%pvb?c|(Iu9j~C9%N)>*qv=dN34iC_Z2o* zN{=_g>-BaP>9dwL*#_*kY;F7c#k|P zON%b#GdA?$;@9vyvkB@1>`d!=3Wu+Qx5?v__-heL_m@uHu8 zoUc70r{4!p`3jyE6r^9;n~`mFNeisp`gZ@Ew}fq;b^q4d*RPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0>(*1K~zXfwU*sZ6G0e;xdKlNH)48ffd1KE zOQCqhm8kqllH*G8}RLX-|WuJPP@j0$&=8X zecyRtced<8G@bxerw%HP3)V{IVyWylnqaf_9ITfsAel;obT$W4nJj2*w!qeQ8{miF z1=woufX7SA;Qj^WngbT@7XO9A?kO-PXOY71k4!S46m}I<)tUpO-z&yd*)Az^c7XTlK-Oe63IyGgWJ=qynCLV!~UAZ8Q^7SLC*aSmX=|F?i1mslbRSfG_9mtVj2 z`~A>Mga^W_sIb7WX&*btTT%ZozQVbICRH$IPy#uU?m#<#G zIXDEkR*(T~7;trcL*NMjouhZwI^X0uf*>JZ*H%H*tphFLg;c~mZF9~T0i%1jNG~`u z1e8+|9bZ6U6}6}ewC^Ir;UPPwK+O;`3HWtF698%ku?m97)d35tjtjimDF_7-r+mTO z7?FEg05-vFG(i|FpqJnLY7r#U89=Wa^x{YVxa*B3C=}N~rRI3l+&Z8~m0p~QSRw%) fMIzvy1(C>K%QHG2*8;^f00000NkvXXu0mjfWaw^p literal 5187 zcmaJ_c|4SB*naK1DCAftvSt~KWia+7F(G@&HpUWWFf)xMOOmX~lBDcpCn1q#PDGR? z4vMVBIAmW2WBJBezdye7J@50r&+@zP>t6r4-Z+b^#%#=d%m4tenOruwMp+|IUq))m z*UWMEIc50;YiN(PLVIBGu7OBE*B$MK1ey4`dLpkOUEPBNdXSm`Ky$&{+8%2UH&aKT z{p4IvW#oeV{3+T1ps5|??~3q2VnJ?5Pj3`VWbJLc2*}$VCSs=y2gCjKkzU@HLjsXj zAy=&tAwCGGyNI?HNHa*C0^oxaySs>9xEF=noOB4@~4wr|jVt zAboTo5~M7rEQatg{2sDgqFND-`{B(DILSA@zcD5yhJ)fH4ge+?0ewLo_d z^=k%3f7zm(U?N^vtiQUvJRXmi!z;<513l#xpirnhSW#Y4QI;YhiwQD^Q{X2^mUT7>D zFa|e?YvR$Xgo&h4{GD z=#Pliz5m-6<^RO{OV|CseNp*OU3rQ#@~3tEUv>Wbiqbr%+kd*2a`>n3ktj;D2U5EF z_cSLT0N{9IVxVgsH2(8us5O^e*4k1z5YsL)wGa5Kl@r}~>3i+0M_hEaX}7~AnR~S(Rt3`05Es5{?*JD7 z3}k`k)d!B;j zhJ;`tknPNz93jc+?;AS%etv!y;ds2NW?TO32ApNC=_RcTcQh4&G69!A%&-{>fYvp) z6CR<$oy~0;i1~-XbajQBq&^Q!(anI@;zQz1;m64ta(8pcs~J`6Y9I-Tq1$Q#DZ3@) zUH#;Ca`n@c-Oq)_3`yGC)=7&Gek(GNbY`TlJvGBb6ZwxN)@N!uT!xG1OEsTDmDZv+ zTb<<7le3-Un z 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 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d05e5366d50b0547e41e3f0b69d7be8900dfff GIT binary patch literal 5236 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 a*&&-OQjjk(~1UTTe*gK5m1F&BoELF=y6q^w(N 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png new file mode 100644 index 0000000000000000000000000000000000000000..797aa005ddb172ededa23ef3b51ce716cf6c0646 GIT binary patch literal 2091 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 IM6N<$g1OstAOHXW literal 5253 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 OL8PjVO1Y9{_M6 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png new file mode 100644 index 0000000000000000000000000000000000000000..d902d48c6ba571b109885b3e454a7ac85874982c GIT binary patch literal 5431 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png new file mode 100644 index 0000000000000000000000000000000000000000..ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a GIT binary patch literal 2707 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png new file mode 100644 index 0000000000000000000000000000000000000000..797aa005ddb172ededa23ef3b51ce716cf6c0646 GIT binary patch literal 2091 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png new file mode 100644 index 0000000000000000000000000000000000000000..ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a GIT binary patch literal 2707 zcmbVOdpJ~iAD<;PZfRSrC}yV!nK^UCOk`zDX>(~1UTTe*gK5m1F&BoELF=y6q^w(N zs1&-nluM+G5OPV8RNGQ{NfYIg%R4IjzJKhqf4t{;&iUOwpYP}U`(B>sB)Pe4(^S(} zgTY{$PTMIo#fVsZ;Yy0{tlp?hF{}|fdJEm5Kw&tY55nx3PymQ<;?RRY8c1hGgf@XT zFqm>E%fnmf?YxuBfH-LSA_gty@Dywq%*Ia4qchl`5D@?dvADL#vFbV`g2l8&dJ&y5 z&O8S&n6*8U54uOXcrYT_3=$J*w*_G%CMyhZKp`C==7ewsWU(#si(Rr}zPJq_5nmue zwk`6jQ{K*Q2nUD{B8X@rih;pl5mqELmPjCBu@(p%28#!<7yw5?VX3e;o<0TJR0H$0ay}=1YmFg4u?`8P=W}qkS<1X1?!hA zP(T5L&*BML5Erp%ksbhvgtkb9r(dtY;W<11Wtc1Y7AQr?05P2hV9^+W!&$u77qmb~ z1OMyB-=YN`5j+r}fdWXxXDIR!xPFPOh}}O6EdmwZkX`vKMN;S?6o?_>fLx&y#TKbJ zK{HuQvQ+?y5nze8L=or#0VujPArM7p-~v(B7!tc+{*I4V1m6*Lmb4H5R+MdBOkyZViig9uJR~IN2fAtZ_ zRWuJ@(Is)!&9N}p^6O3%dk=A6@$RQwhLcW7pQorzZtT(*x|RD3D>KyWw0W;wgOvXS zzoTv^xnuNRa%kCu%?p^-z$|Qa@bZGwzrQ;q+<3rgBB@;mir?lyP&{g#V?Rb=m^>%lY;l zMJuRdM>2djbuF-iGbJ7OdR|A*eVnZD1x%+6w&G^aOLawR2P#irupNpR&rJe1YZ-x= z02(#alxnviACs<#fx;VRUN;Uk?Va%|UorJb(z5j;Hz76 z6iPK5+u3GvxMasF71W0g@#Lc>l3;2Os*AGK;w;odjN%L-t%muobv5mQ<0bO2*0k{!ZZ{FQ zboS)agxlt5l8%a*+4hIRgS~dcQo{1+?$M@Mek5^zLQi*#LHKiY@KAraXPN%Sc30)k zGS`(0)1zJ%QG-AF?6t`1ZF||4;?*wG5EWZ}yw?Db&(__z77;2ZlkF|=xvD*{&bhj@ zxnxJ8>>@q)T`Q^;XPe(wzbO~!!rRSC46YPxwGbN?e8j1(`O(kG`1{?bstdCXhW%5( z6);X&+NP$5t(_Se=QxpiF|TmP1pO8_c2m1=(ssc%1&$Sl-{LdR>92E!`w39m$*o6| zwE4f4g%%MU=k+?cTCkQfIL`lEzIS}#GTNPZ{KjGPo`30?$i`z+Z8wgHJc0eU(Hrl=X%w?vQjd&5|L&F|hXQ^xZn(Q8 zaAIyWHTm;}^5q?aZ#B@9lPO(Zmtut{*cS~j>OHT!ZlrA4vAf<>sUZY2@~i96F^K6w z{k`POV|n>Gl&Kx|CYY2b;%q{m z^6%xJe!jY{GB-u_i1JIyh}$;(^mt9sG&=LpKK%^i+ll66j~1?P+c~jl*OUi9}eq>d>9F8`S-RX@z_wpPlqIB_p_>c*Kz~R+uRC4KtnU?OupEv>Pwy?VvaP_u5jy)L#mv);rs!6%vDGQTLc`SwX#zn!ev%t0t)=Dzo(M%$uXW zIax`m8ItpeXKO@1v`Z6z>#fPN7)@Tm{$3mTxZsD!PS>FHrxjzyb2#)5=CP*a7eRhX z$DO=i-9uFQ7!}5782IQ(&&(!fo#`(-hN9d*J$7G7HTY-|8?9QH(44TpBgp(>$Jy`K zf|uEsH6LX7}Sq}Obq@sweX&1U6@pOr2tHw!0&g`qPh z@RMY(U-Xtuilb(SMsh`ud0E~%5eG3_Yz~AS`|<8mwx||vfRa8&ZiiP8Sb#8w7QHQD z{Jz@Gg6LFx#_c&we0rt|MjPYmKj0&NBK0EVJ(!)|EWcw+CEJN}{Kv!2JARd-2W$1ODiDO%E^E z_S)Zgrx9bX+F7r4`CVA&4Af5BT%9-GWi&Tbn>FlvoOjPW>rqW-!&%~SdG6ygA<=vG zBzv*B(0NYwlQn0FvQN2h;(YHeu>0%YEqF=3gEfyTUHH^m9JdKw>S(CHAC1RK)WaIcH5l?2aG+Q~1j3xz0wxHjMFSC_9|*AH_OyWx zFxYo{xBaqL|h@n74YHniU3m}fgBNPPd|qcEu_=G3iHKZ5~WTVS_%l!SQG{w9X%h{C$t#y z1OMyBH__sNI3bAk1H}S~h^4*{&W{UZb?*M&&^%D>4cS}7RbL9gqY7A(Xpj%lsE!Er z35v~SlL<@`i)n9bkF*1rOe8?G;~)VRj)Np(NEjl~7DL1X*ae+$@hJp1R~*)v>gtTa zV6m>YL?YFV*RmxW?@TRjPuj4U7%ik?IVz{ zZXS`kOMoZsM_@3mbQ;w;K>GATE?vfOU%qd8Zl>dPhhp}Ad~B=Js8gB;X+%@I`Pg>N z74C>qhJgpQDPx@xB2{NuV2;(Xty_tEent%Cz>9wN@K{a_w*+3-#EwZER397S=4R^F zPxSX*h~SuJQ9eBAiud2Sqi@HAr1SZ%gj53!ST`?ZH3@H3W;yC`-@8YKm8Tk{>J8j6 zQVgroxxVrYY}a0~VkE~av%PZLgwfLd*4AZ&=X-&(Ay32?Zk@!YKFsykA*n8#B~3q0 z?Vc$}Xk)E%CZTH#6(xmF5~PL>6Q`q6wY84K7OQN+nBp3PbDL9r0@p_Nr0*TYhom*k zs+PdsPu>_h@aB5O7=GPIW01W3hpx>2xW+3#1d|j3!kN0r8xtSVewCY_M=GDcS`lbP zFM9Cnp39Qafz3`+eWNx=PDqTK-09=^?-NT#_4z70^HPT@gz71O+G`Tl;b1b;CaTCFl)jPIS`FOLWrIa0TB{ch5 z!GziC@IGX6vlS~KYKD0DT<1(_6b!YiVO-gu-&wOY^EfM`Bx(9tOY3w(SC+Q>p~{S& zn|&z`Wzyj7Pc^6R*wpvU@J(8upHUQBcS9|9XO0_IETQX|(>&TWGew!du_LuM9=6!O ztb{iRP9|6lbZ3lJP}&#{Q9M5lyJXC^MAY{dIu56dhKygi#Y=}c(4B23q= zEVDbEt0yroG;?@t0a#b${UN*a!oNdL>Q{uU<#pIz(6->ZJ!Is|Z<)W-d11;nxsY?9 zdRpXJrGwCY)Gn93vn<|#}r#ynNMJo<|JUAK>4i-lbwu0*n)b~r9xmUDOCh7cSw zZ+V8+3XhzC#Z>EBE6^g-KfADPjrX}zb#cZ>k7}rB%^Iw+es1llmD%F#utKIza-?6_ zS-POwXotavj2(}Qm$4XFP)ryv>3(N(L?|%3qrbkaGUKONP5mvV)aG4JE>BL@Z=`77 z4yJ~-)~t$sWahbjnf5?x*@r5p@)w=*?I?zCFHf-k8Cm$-cCU!eyD9xmKTVdM5H?(m zY`<=eJNLU(Z=Y|W$;F%2zx=zF(Ah6*OVzNPE_jA=kz9(2K*ewOceTvUdQFT65aQ=@29g9><+xUf1S88C3zibH{Q_r=c&c? zO5Enrg04qPzQ34)naGNJvID&+>s+%`sPS&#bb@kr>imOorP*r!mPA_OM*5|>frycU z_jI5zzS25Be7duG|C@hAjMdjFcWPf5Q{3~0O7L?h>J$Zh$F~)h*scw_A8#^ErFTEUvUT096OEGPW4(c%(9)u-_G2kN^ zhCYm?6|fEaw^~`eDb~Df+S@Xco80``J^v!=yk&D?Lw(?&=tgZK(7Khl$V_%-uu++@ zIc!Ady)tbuuks!{Oa3R%`el^~zPg;D`=PVvubB69)9*q8IwAd2i(O(a#nch_*jyve z+_j6ZH#Q_GRlb5|_r}gOQ_J;~844&SK6X0Pd*9%SoQOlG`>Ola?d-j3lW!mRay+51 z>hjd}BHJu0mum`~dDXr=W1+#6Zzt@u_Yc)Xj@L2Hid{LxGZ}#)ZL8=732*Mt9V$QY zX#Fw-wWrMMT@B&VO3{oVeU3!w$|mG3-oMjW#oV>c{{WxXwJS-I|Bx^{e&QOcERO=sIj2QhuyLECgMq~(R`Wl8G*>U`MVH;l F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png index 1ded25eda126c55db171b35ac5bbcff37f8986ef..d3527e3d48c3d4357d14b28808987943e510bb30 100644 GIT binary patch delta 838 zcmV-M1G)Us58VckB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st&PhZ; zR7gv;mQPO;K^VsUOr}>OQi`+`p+JFcDM&;D-@=O~#Dsq$1%ClWO%zVzNAL@9_DDPc z2^>s3dGptKhGBMg(p3|Fc@k#cd7ph?cXpXOy?rG#nKaQv(m!GiUul!s5Lu><`)(bKa8HD`Nbu4?|u)u{eb#Zf`0!U8|@urCwUC;dkj`1 z0V^@I=O;}F{TcT)vS#W4^Wej>Mj86!Zm@HfeomQjU(o+$#rB|Z*L6>aYBYP$E~Biep<5VhL?UMm#s;L<(Q$cs=>oW8QM1pmQ;)PH>zy>7KEu<12p{cg1dB*XF z90V9^2Tgm6eds2D1?x6`DhkkcREC48>imgoTkWXb2FyI3L#~5?>tO%kcLBgnhhGL4 zu)Mk!wO6V`C_li5M+yqCrQCpp#U&K&c=r6o%YXF^#JwU6v0>2r!y}0|0Ih7kj@s=* z?h=sYpFY<%V6xFfeg~+@M|Ev;jqSoUftP^}IPm~r>?4m0P_vIQbzqzd@V`YthQoP+ z0JE6Fb%Kr);m1zSEYW~0?&@FzCX)uTH3LmqwB!Q7E~L?ts6HA-k$^7v0lC-!9e#&K zYCovITtPZ+=-{V++|AYu8m^6^iK)bCs?kJxRdsNdilq{|TPUDg4k#4<017Q8p0tpT Q3;+NC07*qoM6N<$g1^&zBme*a literal 2001 zcmbVNYg7|w8V=xsi{Pb#MoX78Aaa`|lY0UIV-hVM2_$3%sk%&(2^m5%AsI}-!h$Y~ zMMNVvt5Sg!aV-@QZM6uBaMadIDH{$(5Vi_(yjD@vs7`90`kvor^zHl zEg&be;%V_l5v)Z%$~D1Bxl)BHSEu5s$+0n{Xe%E#pocMtWYuRH%zUeW{Ms%bpS!lH zWYTL0rW26g1eFq>ND`qYn8c#602Pf6k~lmH$YSz9Fp@;4feb20qtbZ*2=bX6KFB6b zJ!IUQNv+|_#Ve+K;VS`Ii(y7Sm1?nAC>90uRb}g80~RM1knt0W z8d38(N}fu|X0QP!q*MYBm#G0D66D0YM3q z$E1sd47!L;Wo zn^8yHJU6UI{(bKP?Y8t=j=GA`EphFurAxa8pFQ|&(}S9Htr^qqS(B17Bl_(A14VP@ zJSw-@3Qxvy+;Bk@L`AtL$>rTw>_MZIRaKs)V*8$u{e^;WXYbov^QXnfgZFMoJAR{a z>_<_WR9g08Wo|B?7Jf5z!v;?c3~Wx%SvFTi41=w`}>zOT2Bw^Dl036 z$lBgDoMiw!BAtNK)udi=t1>nqN z*ACoYFmm{+V}5VL?D8K7UfTo5uMP}&+!`GXYk1$sbFEif>go|?mQJ_r&e=K-27^(k zXD&$HB;D6mAmcwVix1WPwpkl81|Nh57W<0BmsH* zc8>%TeQGa*8|a~7VKSCPa--)}%<#X57LFYXEws~D{W@IQ;b$ooPK=r=hmIble|RJ(kJ7tew}2XX$o!d=e7%M3U{e=D6^* z*zxFk`=rO2^Vgr9C=8?rTMQpOZ#Z%=pt$S9#Z~9+9sY{Pb?1EcXxk$qB1$Vx@y2R| z)GN-KU4OSP8qGU1KY*C;)xG4>!0uuii}Qn|uX--s(9&s}cM0w9lPMHe8k>i^ZK;<^ zEaQu4n@;u5e%9^WzGKIi9T$GhIG)Nd!#~!GG$lCPR!FY zfBnZJ)ozs+o3!sa6Pm_fR$kk>qdKQPb$M^~t%*!RUd-@sX%ANxxDhIlNr7MX=y}&q NHclcHA6}le`M(cjBgp^& diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png new file mode 100644 index 0000000000000000000000000000000000000000..f9515c642e8a4c4ba865635b7a13f7853cd84a4c GIT binary patch literal 1122 zcmV-o1fBbdP)N2bZe?^J zG%heMHD!e|WdHyJ;7LS5R7gv;mP=1lK^TVn7wyu>wcN_B&=wHU;E!;jE26oim+z-t)Q=yl@ar8>eHJc(G0 z@zQu7^f z5qO7xMv!W2cLp;vGpLiQ{d;3|b@h{>!k{U1M_Skz983=Cq;>W6305A`!fQwB z!2qOHWgxu#Ndw^x)O}KPKg8JD+LAgMA%mTr9Xye zD4reP4ZXAV^>qxUrlw?&YH3ZdZ)ay`Q74rFpiakWtPuo08~!1JYK#Nvz`cn2hDL87 z)Fag62Em4m3{-+>sK6=$q{$OrUItw~z3d>=!#+AVIQV9e-`m^!9YY38h)upDZU9nX zieP$rx?;d?B>iGwAP*V%wNfr0A0NAc?Cz4M9CcC|@Y=mYvB(UcFv#Zfc33&y7=H}f z(^9F_$;dz@`is#hrDrl&US398u!5WcHEIQ0TGJwFY{EEHPKBx_@%Zls4Nc7nZW4cf zE-q3Vei(;`htyzlNtuwNqa!ksCWB3Uir6vK0aeg>4$dH(A6SWyf!4BwNYxTQu;y+Y zlwbhCKxlz@`9eW2xne+7;#32nY4Hz+hRD8=ffSJD?5P+mEG(c-s=uEZY8j>o$jE>U zGo}(%SX*1OvAI4Gc5*se+dC42mxqyFT3RBtVHKpVmdXS)hp2-uI%%NMBaK?cK?iu!VS zJE|Qr0IBn0f`Q6qz;=}ZM+FAl{?ZND$?2$RKpR_DE3Xapj`DvE?CZk85#;5~U~+Pj zlutCblP4x7P$yM;HL!D~$n~j079xepOI>;9jdHt094bUzaN&Ccp}&K=P+^rpxS#cI zpvquuY|I<Rs`tu1>Le3JTOof?dh~LaD$2P+J@UI z=5e-x)IsXvbc6T^g8DfPG(~ZBa0Yx`D>^#6np;{4eVX%8=7L9y{J>zkt2-WibN1)* o1UpH=r+-6Jlj1@$=^~l@3pCNUP12KCLjV8(07*qoM6N<$f~?K>TL1t6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png new file mode 100644 index 0000000000000000000000000000000000000000..39b5f9b5030a498c42f35792c24cef3cf430d549 GIT binary patch literal 1967 zcmV;g2T=HlP)N2bZe?^J zG%heMHD!e|WdHyNElET{R7gv;mfKSs$rZ-)x6JgkMy9gskwFLsNh6`VG#cGz&`4qg zVk8D+NeD0oyclf7akAdsWNm{lV7%VV_qV}Va` zHQc9Qp+6~rFA(UPr%w;NpMP~Ifv@lRz>@B{>S-E2_D61x~Mfd;{NEP&{)z^jW(fb?O5kD{-@q5qpNlwa(HzucA| zZplX*^LMPzHl4XUtw3)j&|L}i*5-QlT;GzMb$RH>cWwvww!%mI%E-C33k~qk-v{4) zHOnk8AaZqoZF%CjaNTC~5!*$r{C%vo!*1C7)*!Az5~?pe-~N=aO{0!~G=%EZ#S zrb%s+I78)r<3`sY?Fj*vBG>?h>WL$V9_8y>)SaTOJvtQx!WU!O}feo|@(9 zMut`rycXxwxS*zlLY&j|84EHhS;~t>ky;hH;sm!%Z~K13I$&^%4ZasMD#_Hjt~sgyidm@l<o zo#5!Ud~eM+T$$}7@A|Y=@mYwTnbI;+F)bBRQa&xI8L5z!O35iz^_8)Yioapbu2^$U z{g!P92Tu476JWh-Lcpf5_RyKTtC3|Dp5e<_X@pNBqCyffACpNmC@e0J#V|=`d<8{F z;om5iMXprQXv$8Wm=)Tb5MUcYdqD%R=$1)0oWM>&ST1_%C}u*)$4D+MX(1uDAjD)L z3Jn*wIpNQ}&g-^tY8mF2C0cw`01;@X8?4PhH6R6X^PC9FWAqtS;^|Vk%im^sy zMkb2PEAxC916PTQBqVi#i$!S~8jG9?`!3C`mc6i3b3%Zn2yGJkYI=v(RNoE^VZOAW zXJ|PteenuR z2v{EYtYgm&ac*Ormf#DhfkIN)!2*fRV+Wk_UL%T(rF<%Cpzx`vkWEr8#;Fb2E_kep z*qRVvEom%32UX&%%=Pl5mL*2gqb<@LG~gLl04yBQWljl_SjLwR3Gs-KiBT39d@B3~8Q35|O4Ve_-D6sYzcB7K%@0F`1t+ z%Kmy8PMx>)&ztSga6`F!jQ}fhi|(Mub>#zs4q<5#ZOwh>%vN z^{|kN(|ioggH}|pi5;LX!64%z|F?iG?jcJX^4&6BRXH<9mr|Y*G_+|$;nNYCQTSwt zPa-XgG+UT4BP0_i`2;Pesg4vigZ(@~idqu_>`j2{7Z+rM_6)8w2p;Klwdh&S(Q3xs zhoSqImG^c;7m9nd5J|%IWq&PBv>1iWvMCSxt7!$h8nudI6Kj2TERAh?RRH&wMYeXr zBi&=W9hfvS1R91p+k#1uiU``AP{6TD(V`J(#z_%mJxhq5r`B3%SiaG^UI5Psw^fL{ zO)}h3PU^U4Xv>wsi6cgBu7eW?r^7H=QOEM*v{aq96I?mt-VJW_%2cZr8WhErMw@^8 z?$+7p<~0KB!o$tiSMKBXu!Gy}h2b)Kq_2qrf`;6w$!+}B<&G{j>+(ACz7ia)hWd`O zZ%I8{*#*}KJl>Oj_sf|o>4KqhjMGqKH=4Iy7F+0%1$1v}VmAzwrxn^Nh|L_SA&ptC zhRn2;UDyv9R^{9c8yH zvK&?smkHn(;|YO_%kRL!=8s>TNH`z>8w4m6fZ+g}XRsNZ%8$TB53ovbKJwuuH%<|v zvu7SOo;?TvH+`d<9GVNY6? z#+Mgw0BeqH-|Ubw*gQL2EHt|a{yzfmaRtsV{srfK&K1g71K9uo002ovPDHLkV1nMs BoVx%3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png new file mode 100644 index 0000000000000000000000000000000000000000..192696c252de0cd21c1a4a431a4f944f0046e71f GIT binary patch literal 1724 zcmV;t21EIYP)N2bZe?^J zG%heMHD!e|WdHyMI!Q!9R7gv;mS0aIR~W|oS@6smN7J-`i(OF)GN6LPAToo4?4UT} zhy{vNWruaevb(m6yV-y0uA;l!|7nw^ZPJ@2z35Go-t{B(p@-OEtBJj6^2>xA4)2fi zo^u{}>)GLR@Z{hSJbrd?_~PUOj@$oW8$UW}gOjtDp#AbSIDP&38*~MiVJ~+Xtn{S< z%wV-{7T(_5bb<$U7iisdg6EA6FYgU8SVfFHu->G-=K+s*hJm&A4yz7jSAgnA4d-`{ zu7RHqJ>bWK4!@pu`2DL9#;xMJ_%KG;96Nt}?FGM_`arwsVvdf0_3`QMdw8QEyr^>r zPs86>{JteT1{-_}?1@JuuJO}>r)4?u1u?TE+-``EO2STow+aHNm4)qw_}CPz6~2a< z`<4@eQ)x+>tt?-xkg2&CkLEV49-M_mT_}B{GzbihedKz#5bPT)5HmpZb6CQ5x`*4)$of7?c*|E7Q)OAO( z;@#1RX%}e1a^AbH33-jIq#Y|+TFi3gTVl%?+|aplkD%M49VfP~)@k~~miSqT?wHhC zp|vHUq7M{}k%~eWu*t`Fhj3u<`5BtdU0;h64dXLJS4d8AENzT8b^1Y8DC2bC1hUFK z0_F@@Z0WS93&j*&&J5?{G-DS;9J89okm+2U%qN7jLJdqS`z?Lo5&_nZ z4ph0;*5HF?@Mx)j(-`BuF?qRi>2HBFTs0Zk~^^hs`J%8`gsP3F@wpIPx$=c$L2GTds9fNe4^Fs|5L@%VNChv81iyN$lM^L5vMcUjN`xIwJp-VEEkMK&UFBWsDK@zbG z{A42Hiu<|AK;P83BO2mjQop+BEyyIJQlm$}7J{37(sbbsfb$AiNMNx5H;eIl&x0Vs z2xM=74g*{@Z8#@7B)b4RpY&uzB8fzv z;*|(hC3?f~t*Zn1lwe*UU}0Aj8W8M=4;F>$95uCmbCxbfNh&j9hN+AmqLWxVI)Jt) z*B3&L_#~ahcSm()a4GMvri4|MH_=Soi3ggPK3GvX6A7%4 zPDY*!VkB+)Hx(hDpo@cT5d1%azv&20+J6BG&s6D- SGz8HA00006w- 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9ddf27c63a790f9f6ad5d719b1dceeefee001b9c GIT binary patch literal 1821 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 W=S{(XXqf%{BZhz*YL#lBBL4@y(;-^` diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png new file mode 100644 index 0000000000000000000000000000000000000000..77fd80205a4f52de565d67bb9d514596c8b619d8 GIT binary patch literal 5065 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electromagictools/textures/models/shield.png b/src/main/resources/assets/electromagictools/textures/models/shield.png new file mode 100644 index 0000000000000000000000000000000000000000..2002bd2ceb54e6a951a142ecf3858dde79566a4b GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r+UAk1jN8ms~olqhkHC<)F_D=AMbN@XZW%*-p%%S$a$Fwry6GyBt%d>^RB+|$J| zB*OjexrKrZ20TYL9LSsaH=M_FeQ-@ Date: Mon, 14 Dec 2015 19:32:25 +0300 Subject: [PATCH 2/4] optimisation --- .../emt/client/renderer/RenderShield.java | 47 ++++++++++++------ .../emt/common/entities/EntityShield.java | 5 ++ .../textures/blocks/solars/air/airbottom.png | Bin 1821 -> 0 bytes .../textures/blocks/solars/air/airside32.png | Bin 5261 -> 0 bytes .../blocks/solars/air/doublesolartop.png | Bin 2091 -> 0 bytes .../textures/blocks/solars/air/solartop.png | Bin 2707 -> 0 bytes .../blocks/solars/air/triplesolartop.png | Bin 2661 -> 0 bytes .../blocks/solars/dark/darkbottom.png | Bin 1821 -> 0 bytes .../blocks/solars/dark/darkside32.png | Bin 4735 -> 0 bytes .../blocks/solars/dark/doublesolartop.png | Bin 2091 -> 0 bytes .../textures/blocks/solars/dark/solartop.png | Bin 2707 -> 0 bytes .../blocks/solars/dark/triplesolartop.png | Bin 2661 -> 0 bytes .../blocks/solars/earth/doublesolartop.png | Bin 2091 -> 0 bytes .../blocks/solars/earth/earthbottom.png | Bin 1821 -> 0 bytes .../blocks/solars/earth/earthside32.png | Bin 5236 -> 0 bytes .../textures/blocks/solars/earth/solartop.png | Bin 2707 -> 0 bytes .../blocks/solars/earth/triplesolartop.png | Bin 2661 -> 0 bytes .../blocks/solars/fire/doublesolartop.png | Bin 2091 -> 0 bytes .../blocks/solars/fire/firebottom.png | Bin 1821 -> 0 bytes .../blocks/solars/fire/fireside32.png | Bin 5431 -> 0 bytes .../textures/blocks/solars/fire/solartop.png | Bin 2707 -> 0 bytes .../blocks/solars/fire/triplesolartop.png | Bin 2661 -> 0 bytes .../blocks/solars/order/doublesolartop.png | Bin 2091 -> 0 bytes .../blocks/solars/order/orderbottom.png | Bin 1821 -> 0 bytes .../blocks/solars/order/orderside32.png | Bin 5120 -> 0 bytes .../textures/blocks/solars/order/solartop.png | Bin 2707 -> 0 bytes .../blocks/solars/order/triplesolartop.png | Bin 2661 -> 0 bytes .../blocks/solars/water/doublesolartop.png | Bin 2091 -> 0 bytes .../textures/blocks/solars/water/solartop.png | Bin 2707 -> 0 bytes .../blocks/solars/water/triplesolartop.png | Bin 2661 -> 0 bytes .../blocks/solars/water/waterbottom.png | Bin 1821 -> 0 bytes .../blocks/solars/water/waterside32.png | Bin 5065 -> 0 bytes 32 files changed, 36 insertions(+), 16 deletions(-) delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java index 69e8754..d1375b4 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java @@ -21,31 +21,46 @@ public class RenderShield extends Render { GL11.glTranslated(x, y, z); Tessellator tessellator = Tessellator.instance; GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + float sin1; + float cos1; + + float sin2; + float cos2; + + float hsin1 = 0; + float hcos1 = 1; + + float hsin2; + float hcos2; + for (float h = 0; h < 360; h += 15) { + sin1 = 0; + cos1 = 1; + + hsin2 = MathHelper.sin((float) Math.toRadians(h + 15)); + hcos2 = MathHelper.cos((float) Math.toRadians(h + 15)); + for (float angle = 0; angle < 360; angle += 15) { - float sin1 = (float) Math.sin(Math.toRadians(angle)); - float sin2 = (float) Math.sin(Math.toRadians(angle + 15)); - - float cos1 = (float) Math.cos(Math.toRadians(angle)); - float cos2 = (float) Math.cos(Math.toRadians(angle + 15)); - - float hsin1 = (float) Math.sin(Math.toRadians(h)); - float hsin2 = (float) Math.sin(Math.toRadians(h + 15)); - - float hcos1 = (float) Math.cos(Math.toRadians(h)); - float hcos2 = (float) Math.cos(Math.toRadians(h + 15)); + sin2 = MathHelper.sin((float) Math.toRadians(angle + 15)); + cos2 = MathHelper.cos((float) Math.toRadians(angle + 15)); tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(sin1 * 2 * hcos1, 2 * hsin1, cos1 * 2 * hcos1, 1, 1); - tessellator.addVertexWithUV(sin1 * 2 * hcos2, 2 * hsin2, cos1 * 2 * hcos2, 1, 0); - tessellator.addVertexWithUV(sin2 * 2 * hcos2, 2 * hsin2, cos2 * 2 * hcos2, 0, 0); - tessellator.addVertexWithUV(sin2 * 2 * hcos1, 2 * hsin1, cos2 * 2 * hcos1, 0, 1); + tessellator.addVertexWithUV(sin1 * hcos1, hsin1, cos1 * hcos1, 1, 1); + tessellator.addVertexWithUV(sin1 * hcos2, hsin2, cos1 * hcos2, 1, 0); + tessellator.addVertexWithUV(sin2 * hcos2, hsin2, cos2 * hcos2, 0, 0); + tessellator.addVertexWithUV(sin2 * hcos1, hsin1, cos2 * hcos1, 0, 1); tessellator.draw(); + + sin1 = sin2; + cos1 = cos2; } + + hsin1 = hsin2; + hcos1 = hcos2; } GL11.glPopAttrib(); diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityShield.java b/src/main/java/tombenpotter/emt/common/entities/EntityShield.java index d42e830..408d00e 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityShield.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityShield.java @@ -83,6 +83,11 @@ public class EntityShield extends Entity implements IProjectile { } } } + + @SideOnly(Side.CLIENT) + public int getBrightnessForRender(float p_70070_1_){ + return 240; + } public void applyEntityCollision(Entity entity) { if (entity.riddenByEntity != this && entity.ridingEntity != this) { diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png deleted file mode 100644 index 9ddf27c63a790f9f6ad5d719b1dceeefee001b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1821 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 n1)vNrSXf!i9buqr^_v6w- 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 F{{eyKaA*Jk diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png deleted file mode 100644 index 9ddf27c63a790f9f6ad5d719b1dceeefee001b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1821 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 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png deleted file mode 100644 index 797aa005ddb172ededa23ef3b51ce716cf6c0646..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2091 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 F{{eyKaA*Jk diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png deleted file mode 100644 index 797aa005ddb172ededa23ef3b51ce716cf6c0646..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2091 zcmbVNc~lek7LFDU1W*6w- zK%k%~Dk>sN7e%(pL7&BMGOMsU6or5GXb;YTf=m3P`y7!V zlW>W#j8Gs{<&UJwf^yVIWR4&T&PjvW5~8;k!BfY<49F1_BIxAl3JpicCBCxD!RAZb zR3hOO1Wn@-UpplV4JY_3)d+z>VUS^fP9u1*DKv&Vn?`db&;gnol?G7hY%-0;arfZR zn1nYM5mQr3q#Pm0d!vP|xWrTxRdJ|PtyW9Xx>1zs6e^9)W>Wz=l};yP2(l(yfkHa6 zLgTz_0Yo&gTBbr}N(EubA|zI3qFf^8>FW^Ws?gB4h83DOiNaDw)j=vMjRH{R@};<5 zp*5%w`OA%WqBT+3DugOTG|EghjGc$nd6|sm?(c<`fS5O&FtrRj6et~3!kKbJf$~8v z5&J@s$Rr#OF&h>$-I!!|NGv8pEO#jxg6UE+3t$5*mK(rgK(u8$@8YvT(9NI8<^}iy z0F4&l#sZmsERaVF@ME$7H;}o^Dw;A7H|6qQDDuZ z#=2yqb2bf!GYaQ}zEQdx-&Ai?ItEznoM&*$3~-Ob%{Y^bmv)h|j)GGKEW##IF2CN9 zwPJB+q>)K|kS{x`u>X0A9pI?8tv;E)quYR4xK&weEL4s2r57RDDlBa{O!44e%(5Hs8kZr{Om#7nBQlspL5dt zSR+nP2kezCb^-)k*w=LnD1Lr)O+f{zsWQWI<(Li0oPI6Bt5dYO`%u;mzdn|~jOD~` z^=b4Ab%`V$!#{N@0%Dl9?N$c*@e|I0c2@5FQDXkrjk(Q?j&RbM!as@D5sJ{j)vb+I z-Bl$78kYE{mrri6qdvBA6=QkE{34rrPv~-t+i=gUot)p|g)y(%XEf)hX zio*CdRfDx9o+d7hhi63hLtx|5Ev_fQg(q;u5rfFzCYG>b=6M{9AP$ zT|1K_PsMqg9qXGa^53o#G!RV8|AdFl`TAh`L08u#Jy(Bqk7aglLRXibJxd?`avORj z5{jyx6&#Z6)q&Q<>axpbXY(+?7vOSukEzEap_(y|BC`r zbj+h~H?GlJPF)2`rdmk{Jo_1K)5DGbB&&0Xr}aF?R=70wBmMzR3a8>=faB4!^ZCFX zxAB(Wat`w-27)m+vHgd%$cy3;@c@a(7KZgDXWq7%iD}8s)O=2~KQhW|%N`l;I)%r3 zIb~M|6#j0wX7{zJseC*>ucN)v`+ktRE$jH)C-Yx`vKIfX+?vAH>Dg)i-EprL+nH^_ zMT_9-)|t_D^MNyuUwrw#aU71bMk;~(6CQ@;GQOXjIO55v3T~;G_GIs<#KWBvJ5Cx5 z57zef6u4I0>HUgqsQxVXSB921;?s0t$iITnj+MD&+G+@S-wLPU?? z$e1#%7>mO~$P@kwF5fiAg0hq#pDAGS`R+_U2Z3koe2nkzBj#{9K71xyz=L5wwy%Wm@8>7> z@%Ljf#lHT2GhC@gPa+x=o6*K8?P)IWlU$)#han`P3nPg5nJNg0BS=CYM`!`D7;uZg zH44J0Ut`YD`wL4j9d5uB{yIVpOodp8e?*>-aJg(HssJ$_ssy=AHV5P@lw6Q2XR_FQ zB`Q!NZ2B}`@qa@HQBFbTI{8oC%xqD`Xr6xP0&4N0k1!3@JUXgNqHa_vspj*QN_@gh zt+$S}1v+n9vey;f*J#SwHwWD5aBHO1+HIsJ6)fX@J{H$e^)jTiqbUmlvVc>ar6UV+ z8;eHkC%biv%C0qBw|F;LI4DY_%&V?@Y&uyGSeCwJ!t+wty5~=to6C2x7db>n zN6&>AyW??uBsTo~wR4q~TOu!pdDd5p_4I{ZwWBwggPh;#b(1OEy;4lj;Ly-D@9vT7 zm%GPX+uI!s21Cw)194h|p|-QPS8}wzKYeU$tfr?2EjBjwSNDf=iha8J{0rpYxsBhr zxpp^?7kj&^s>(=`2Xb>=^QGPwoSkbbD%P}T1q27@Y9hkJJ6*R$MJ*26xN+`hEiF(@ z=bJaphldS@a8pVOW7V%++Q`&{r%Ez^mcwfT?Hix;_MRE;>|DxPOLPfZ$8Dzv@>g_UTy+ra%6{Ocy4UA^H{ki=rxjh9=WAQfjKP|{ zCkpRW9y7LDk4y{=J&tkyBfG+`{BY}FY;kT*jt!5;TV90n!uFK?hCi@=`0#I)t9s#~ zv(I#ecaGMjMCQp{ER(l43^?ZXY>)5bT^|!o9=2>gZ7r0p&L2tMS@CL6E>Qf5ctu;g zd^^$J(&9RP?W!XG;qVu8($dnxH!F^o6i#T>=<4IIiQBth^Grq6?=Y*&wVeY4zZjM| zIbCTeK6&y<FR?EAAJ((UGtd=07K%pvb?c|(Iu9j~C9%N)>*qv=dN34iC_Z2o* zN{=_g>-BaP>9dwL*#_*kY;F7c#k|P zON%b#GdA?$;@9vyvkB@1>`d!=3Wu+Qx5?v__-heL_m@uHu8 zoUc70r{4!p`3jyE6r^9;n~`mFNeisp`gZ@Ew}fq;b^q4d*R0WXm>|>}7DXq?ELX>{7CC*_k1YU0Jha zCf6i8lV$Ahnd#p9zn}N>dEd`Gb7szS&htCJ?L6oA{U%&9(q>^i$q0c!Safx?Ou#Ri z@}-A?*1&e_75JfX(=gP4Kq?+F?K{Cip8=&~6##*-Vkuu}U9#sgxXBZE)iTi3*EKNM z$=?Nna`NyAMEJM_3SC4k0lkJvusr zwtnqQ1Lt*NHKqRp!l231#tF^ifyVIgt3S2&G_ziOAW+RE9`nO{wI}_}WZ(FlS1x|U zENpeB*sXr1zpKA%PPhN^%g#uzoxq|_?!qLNlqX@Bi&?As?BgOt4EAF3Mmul8c>0q{ zCsq9k*EDaXptLg{d#pqJ25Meuy~X@PpLkDPc24VkWjho>{){WAU{YtEzB;P^0(nF5 z5wQBg^OTAX)F`%&Nq@?bK^7_CRIHb;vV969Aj;T1&2;m@P zMj<8t(T}=VEsWo@LPAIaif4}HY4<)+?}Q!u4R7U`syF)*9^0XXlKXk3tvt1p7Ah2!brVFS6j7m%uFI7+n0ulw>!wYQ4 z#Ew63I?t{!>dcMCs2nR}o{~ik5WGH0KclDWFHF%twQQPQxz+iUZm$g_k`dL#<5NZ7 zKN>yH30yGci4BmXZQ*5>5%e7wcIJkFd;FeJNT3a~Oc3-8&{km-h68eWoGHOWN}`J4 zNnmN|55?l@hmSeHWD7~)=UP~VXA~biCYW8}uGC*bB>yXb8u?!j*L;Def>fZ+sgQu| z*;1EZ>z<0xKBWiZ)jtXnjbsT+JiqS@hXvH;0U? z{TR>sJe$oa&~xVv=O2}ZNK3Ew{2R*!OMYie=|~M&5LwFhkh=;E#GT!=Dv3MS&jDY3 z`UKVD!JO!wIy`ZQa{+zoUo)3rj}7h6T%`Nmz?3?-S)vDr0bf*Ie8J0!V7+$Y$swK- zlhWe?abmoZbf#bTW^cFetuvx}J9~P-P6&d=+o8b+gSW?IHt%Vz9neuj6uZb_^_Yx> zh3-tLyN;`C5W9Z6k4@B>d-gm8W~v(5YoliUC*upHy~Kcq3o|RTpB()h?0434(~|vt zd%0457U~ur;iOA+_M;QHg+!#J=mxNyw5Jbs;nfaX^2Tx@xGB$tz59AG_nQC2Cd!{( zJqq-7^7z(w)RgmyVONTUHgEZ!UH#SOP~x|lU0KA@&MxM`0D>S%A|-ID2S?zojP3Fp z{Ijdyl`SoK1$wyndAQ6^d>vmKb`+X0QCljY3PF@gnB-O=`ww&PM?IO)aT(IGb9~n& zT>=a)MepjDess6%>tdYv&ivs@Vvp2ZR==Rqn8TpeWBv!l5-S zqtQgbKg_7%?XfWa58HH6MXKyYu(eFqV|eSe{S<11<-(!Zm+FgJA_*dU0o%T6k?T`x zUv5m!kuo-dv~2dI;Cuy!tRe2@2hIWQ^Aqn5D|6rPr#X&DF%9@kH);rc`qRA=Vx*6RUqDh?2R2-++wb?(T-4=Q=%)~5X@rX9ZsZ?qKo*v+ubq)o9HYSmR=x}&i*3%J(uNkfw<7fH?}BW z$uSAb_mDCV8PY@LlbwYM<}-@djgpz@KSbO*!zwP@}e~$Xp-B&snD_!u~+o!&& zgo|49_ijIE0Ea~pY@uz0h<);!C>j}Q>OYb6DdCzev1HZfL z$E*ES4i1u=+}G*ux6B;grJkds($E-g8z~cA+h6iz!*(vkpiX?c?Js_BH18lU(kXU~>} zg~hzX$$_;3;s}vnY(S`fy((Uo11WVk+;3-hW4g_*qG-+}Lu~rgKuM##oxn5gMSlzX zlBUp~-}fzK(rjBwHJ1xHwFA1R({8pe9K0SMhUd!*)NRjB_de{&e-N@xf*&kRk0DD3-md}Nh~cwuz~d2?~>(VQUe zHD7k(l4?Ur5N-8Ce^%~>j~Ueg{i|KOZJVK!Vn?JRmqv8$XHNC=IJaDzLDj(bTmw_D zRA>Ee%H`7;)hvnWOoyR*EaXc&Zl{wrr#3Y=lbTjU@~363uExC?aqE8jq~TA5qI}gQ zLyAf%Fr5=G-!1svT`^cWdAv@}SRO9BBW2;EMta@pUJg-R=F7!qmxvBcjqJ1(YpTV-%qem5*x z2sm6@>YB={pXwK>HVhbkZF}J38n$9$Py z$arOZ{rHV8;}7qy^nVIDE(8UANP%5H#@H3vAJoJZG{jUSVJrg<9KC;L`}&2-1YI5t zY6|rTt&p(%!Kk!Md5c6KJ*7Toqzhyng{n?I+u0aVgOH*P%C*?~t_AxieYI3@e5n4*-#g-J2ORScjoBR4&PjV31h=I>)A z>d}P2^wr*pm~5rNt8pqUDw$2OOYiL6dbE(+2HA6ZO0WGU1ZsWhmj+^Y4=9}x+*zy zjU0|Z1+AEAtfGl=`e8*Odqd|^iTF)?q&$ggHSgbW^TBsD4*?Lw8uzUM)7y z=CUfcm);6cJJRAsf3k_@ zbyVP+E$rnZN>f245gK|K)k_Fp0jMGJcPM8Ve|4tkt@vS3k=WfKy1C`u405?m{Mfvh zT-1(DKu1<5UpZ^k_bOW>?4vr9LGSM#P7U;Sj}b;GJOx}8Okc9mHQt{MvJaxOsMLO(G2P(Mb+t-&2?{ebo6{I&ZC9qu=}%tQCT zz`bnIUqnCshwZXxRkc&aZir$AmxVFY(A5teEJOFb8ektq3F%liWSwfVF4K&l?|o2L zsglA05-%_j??&HF`SzyN+F~2QxQ!&h6~S2ggm1M9cX8 z-ZsD1s)UeTQI}~odux9qHz8v1Zb;yX$I%fn@|tTlzcKu5rkRqxR?tB~E@{$K+~Pt3 zVK9IsC@AND5B+u?5?PdhWjnUb2(D)a)5J2XCP5H|>8UTlDqbdBrKOrzV9uFWk z0=Hp>5{9nTpQdef$wp1U_Ki*=>-vPrEkZHdk2u%lX~Bv4gOiYX*%cb$IbQGi0stfm zjYGxWfHMJZq~J>M?nwf0-U|XSGzE79YbqfMMm!;gJX8t?B+M^Hhl=1S==>L>gJuA_ z+EWth7pDL+ZmqMEJ$uNk8S!#1VIJK?f87N)bM9yEBd%9 a*&&-OQjjk(~1UTTe*gK5m1F&BoELF=y6q^w(N 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 F{{eyKaA*Jk diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png deleted file mode 100644 index 797aa005ddb172ededa23ef3b51ce716cf6c0646..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2091 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 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png deleted file mode 100644 index ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2707 zcmbVOdpJ~iAD<;PZfRSrC}yV!nK^UCOk`zDX>(~1UTTe*gK5m1F&BoELF=y6q^w(N zs1&-nluM+G5OPV8RNGQ{NfYIg%R4IjzJKhqf4t{;&iUOwpYP}U`(B>sB)Pe4(^S(} zgTY{$PTMIo#fVsZ;Yy0{tlp?hF{}|fdJEm5Kw&tY55nx3PymQ<;?RRY8c1hGgf@XT zFqm>E%fnmf?YxuBfH-LSA_gty@Dywq%*Ia4qchl`5D@?dvADL#vFbV`g2l8&dJ&y5 z&O8S&n6*8U54uOXcrYT_3=$J*w*_G%CMyhZKp`C==7ewsWU(#si(Rr}zPJq_5nmue zwk`6jQ{K*Q2nUD{B8X@rih;pl5mqELmPjCBu@(p%28#!<7yw5?VX3e;o<0TJR0H$0ay}=1YmFg4u?`8P=W}qkS<1X1?!hA zP(T5L&*BML5Erp%ksbhvgtkb9r(dtY;W<11Wtc1Y7AQr?05P2hV9^+W!&$u77qmb~ z1OMyB-=YN`5j+r}fdWXxXDIR!xPFPOh}}O6EdmwZkX`vKMN;S?6o?_>fLx&y#TKbJ zK{HuQvQ+?y5nze8L=or#0VujPArM7p-~v(B7!tc+{*I4V1m6*Lmb4H5R+MdBOkyZViig9uJR~IN2fAtZ_ zRWuJ@(Is)!&9N}p^6O3%dk=A6@$RQwhLcW7pQorzZtT(*x|RD3D>KyWw0W;wgOvXS zzoTv^xnuNRa%kCu%?p^-z$|Qa@bZGwzrQ;q+<3rgBB@;mir?lyP&{g#V?Rb=m^>%lY;l zMJuRdM>2djbuF-iGbJ7OdR|A*eVnZD1x%+6w&G^aOLawR2P#irupNpR&rJe1YZ-x= z02(#alxnviACs<#fx;VRUN;Uk?Va%|UorJb(z5j;Hz76 z6iPK5+u3GvxMasF71W0g@#Lc>l3;2Os*AGK;w;odjN%L-t%muobv5mQ<0bO2*0k{!ZZ{FQ zboS)agxlt5l8%a*+4hIRgS~dcQo{1+?$M@Mek5^zLQi*#LHKiY@KAraXPN%Sc30)k zGS`(0)1zJ%QG-AF?6t`1ZF||4;?*wG5EWZ}yw?Db&(__z77;2ZlkF|=xvD*{&bhj@ zxnxJ8>>@q)T`Q^;XPe(wzbO~!!rRSC46YPxwGbN?e8j1(`O(kG`1{?bstdCXhW%5( z6);X&+NP$5t(_Se=QxpiF|TmP1pO8_c2m1=(ssc%1&$Sl-{LdR>92E!`w39m$*o6| zwE4f4g%%MU=k+?cTCkQfIL`lEzIS}#GTNPZ{KjGPo`30?$i`z+Z8wgHJc0eU(Hrl=X%w?vQjd&5|L&F|hXQ^xZn(Q8 zaAIyWHTm;}^5q?aZ#B@9lPO(Zmtut{*cS~j>OHT!ZlrA4vAf<>sUZY2@~i96F^K6w z{k`POV|n>Gl&Kx|CYY2b;%q{m z^6%xJe!jY{GB-u_i1JIyh}$;(^mt9sG&=LpKK%^i+ll66j~1?P+c~jl*OUi9}eq>d>9F8`S-RX@z_wpPlqIB_p_>c*Kz~R+uRC4KtnU?OupEv>Pwy?VvaP_u5jy)L#mv);rs!6%vDGQTLc`SwX#zn!ev%t0t)=Dzo(M%$uXW zIax`m8ItpeXKO@1v`Z6z>#fPN7)@Tm{$3mTxZsD!PS>FHrxjzyb2#)5=CP*a7eRhX z$DO=i-9uFQ7!}5782IQ(&&(!fo#`(-hN9d*J$7G7HTY-|8?9QH(44TpBgp(>$Jy`K zf|uEsH6LX7}Sq}Obq@sweX&1U6@pOr2tHw!0&g`qPh z@RMY(U-Xtuilb(SMsh`ud0E~%5eG3_Yz~AS`|<8mwx||vfRa8&ZiiP8Sb#8w7QHQD z{Jz@Gg6LFx#_c&we0rt|MjPYmKj0&NBK0EVJ(!)|EWcw+CEJN}{Kv!2JARd-2W$1ODiDO%E^E z_S)Zgrx9bX+F7r4`CVA&4Af5BT%9-GWi&Tbn>FlvoOjPW>rqW-!&%~SdG6ygA<=vG zBzv*B(0NYwlQn0FvQN2h;(YHeu>0%YEqF=3gEfyTUHH^m9JdKw>S(CHAC1RK)WaIcH5l?2aG+Q~1j3xz0wxHjMFSC_9|*AH_OyWx zFxYo{xBaqL|h@n74YHniU3m}fgBNPPd|qcEu_=G3iHKZ5~WTVS_%l!SQG{w9X%h{C$t#y z1OMyBH__sNI3bAk1H}S~h^4*{&W{UZb?*M&&^%D>4cS}7RbL9gqY7A(Xpj%lsE!Er z35v~SlL<@`i)n9bkF*1rOe8?G;~)VRj)Np(NEjl~7DL1X*ae+$@hJp1R~*)v>gtTa zV6m>YL?YFV*RmxW?@TRjPuj4U7%ik?IVz{ zZXS`kOMoZsM_@3mbQ;w;K>GATE?vfOU%qd8Zl>dPhhp}Ad~B=Js8gB;X+%@I`Pg>N z74C>qhJgpQDPx@xB2{NuV2;(Xty_tEent%Cz>9wN@K{a_w*+3-#EwZER397S=4R^F zPxSX*h~SuJQ9eBAiud2Sqi@HAr1SZ%gj53!ST`?ZH3@H3W;yC`-@8YKm8Tk{>J8j6 zQVgroxxVrYY}a0~VkE~av%PZLgwfLd*4AZ&=X-&(Ay32?Zk@!YKFsykA*n8#B~3q0 z?Vc$}Xk)E%CZTH#6(xmF5~PL>6Q`q6wY84K7OQN+nBp3PbDL9r0@p_Nr0*TYhom*k zs+PdsPu>_h@aB5O7=GPIW01W3hpx>2xW+3#1d|j3!kN0r8xtSVewCY_M=GDcS`lbP zFM9Cnp39Qafz3`+eWNx=PDqTK-09=^?-NT#_4z70^HPT@gz71O+G`Tl;b1b;CaTCFl)jPIS`FOLWrIa0TB{ch5 z!GziC@IGX6vlS~KYKD0DT<1(_6b!YiVO-gu-&wOY^EfM`Bx(9tOY3w(SC+Q>p~{S& zn|&z`Wzyj7Pc^6R*wpvU@J(8upHUQBcS9|9XO0_IETQX|(>&TWGew!du_LuM9=6!O ztb{iRP9|6lbZ3lJP}&#{Q9M5lyJXC^MAY{dIu56dhKygi#Y=}c(4B23q= zEVDbEt0yroG;?@t0a#b${UN*a!oNdL>Q{uU<#pIz(6->ZJ!Is|Z<)W-d11;nxsY?9 zdRpXJrGwCY)Gn93vn<|#}r#ynNMJo<|JUAK>4i-lbwu0*n)b~r9xmUDOCh7cSw zZ+V8+3XhzC#Z>EBE6^g-KfADPjrX}zb#cZ>k7}rB%^Iw+es1llmD%F#utKIza-?6_ zS-POwXotavj2(}Qm$4XFP)ryv>3(N(L?|%3qrbkaGUKONP5mvV)aG4JE>BL@Z=`77 z4yJ~-)~t$sWahbjnf5?x*@r5p@)w=*?I?zCFHf-k8Cm$-cCU!eyD9xmKTVdM5H?(m zY`<=eJNLU(Z=Y|W$;F%2zx=zF(Ah6*OVzNPE_jA=kz9(2K*ewOceTvUdQFT65aQ=@29g9><+xUf1S88C3zibH{Q_r=c&c? zO5Enrg04qPzQ34)naGNJvID&+>s+%`sPS&#bb@kr>imOorP*r!mPA_OM*5|>frycU z_jI5zzS25Be7duG|C@hAjMdjFcWPf5Q{3~0O7L?h>J$Zh$F~)h*scw_A8#^ErFTEUvUT096OEGPW4(c%(9)u-_G2kN^ zhCYm?6|fEaw^~`eDb~Df+S@Xco80``J^v!=yk&D?Lw(?&=tgZK(7Khl$V_%-uu++@ zIc!Ady)tbuuks!{Oa3R%`el^~zPg;D`=PVvubB69)9*q8IwAd2i(O(a#nch_*jyve z+_j6ZH#Q_GRlb5|_r}gOQ_J;~844&SK6X0Pd*9%SoQOlG`>Ola?d-j3lW!mRay+51 z>hjd}BHJu0mum`~dDXr=W1+#6Zzt@u_Yc)Xj@L2Hid{LxGZ}#)ZL8=732*Mt9V$QY zX#Fw-wWrMMT@B&VO3{oVeU3!w$|mG3-oMjW#oV>c{{WxXwJS-I|Bx^{e&QOcERO=sIj2QhuyLECgMq~(R`Wl8G*>U`MVH;l F{{eyKaA*Jk diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png deleted file mode 100644 index 797aa005ddb172ededa23ef3b51ce716cf6c0646..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2091 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 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png deleted file mode 100644 index ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2707 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 F{{eyKaA*Jk diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png deleted file mode 100644 index 797aa005ddb172ededa23ef3b51ce716cf6c0646..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2091 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 F{{eyKaA*Jk diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png deleted file mode 100644 index 9ddf27c63a790f9f6ad5d719b1dceeefee001b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1821 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 From 3f8d860b950ef984d7239f3fbb290f78b0f724a3 Mon Sep 17 00:00:00 2001 From: fewizz Date: Mon, 14 Dec 2015 19:56:55 +0300 Subject: [PATCH 3/4] who faster? --- .../emt/client/renderer/RenderShield.java | 62 +++++++++++++------ 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java index d1375b4..1fc236a 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java @@ -14,17 +14,10 @@ import tombenpotter.emt.common.entities.EntityLaser; public class RenderShield extends Render { private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/shield.png"); - - public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) { - this.bindEntityTexture(entityLaser); - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); - Tessellator tessellator = Tessellator.instance; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glPushAttrib(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_LIGHTING); - + + private static float[] values = new float[6912]; + + static{ float sin1; float cos1; @@ -37,6 +30,8 @@ public class RenderShield extends Render { float hsin2; float hcos2; + int i = 0; + for (float h = 0; h < 360; h += 15) { sin1 = 0; cos1 = 1; @@ -47,13 +42,24 @@ public class RenderShield extends Render { for (float angle = 0; angle < 360; angle += 15) { sin2 = MathHelper.sin((float) Math.toRadians(angle + 15)); cos2 = MathHelper.cos((float) Math.toRadians(angle + 15)); - - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(sin1 * hcos1, hsin1, cos1 * hcos1, 1, 1); - tessellator.addVertexWithUV(sin1 * hcos2, hsin2, cos1 * hcos2, 1, 0); - tessellator.addVertexWithUV(sin2 * hcos2, hsin2, cos2 * hcos2, 0, 0); - tessellator.addVertexWithUV(sin2 * hcos1, hsin1, cos2 * hcos1, 0, 1); - tessellator.draw(); + + values[i] = sin1 * hcos1; + values[i + 1] = hsin1; + values[i + 2] = cos1 * hcos1; + + values[i + 3] = sin1 * hcos2; + values[i + 4] = hsin2; + values[i + 5] = cos1 * hcos2; + + values[i + 6] = sin2 * hcos2; + values[i + 7] = hsin2; + values[i + 8] = cos2 * hcos2; + + values[i + 9] = sin2 * hcos1; + values[i + 10] = hsin1; + values[i + 11] = cos2 * hcos1; + + i += 12; sin1 = sin2; cos1 = cos2; @@ -62,6 +68,26 @@ public class RenderShield extends Render { hsin1 = hsin2; hcos1 = hcos2; } + } + + public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) { + this.bindEntityTexture(entityLaser); + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + Tessellator tessellator = Tessellator.instance; + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); + + for (int v = 0; v < values.length; v += 12) { + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(values[v] , values[v + 1] , values[v + 2] , 1, 1); + tessellator.addVertexWithUV(values[v + 3] , values[v + 4] , values[v + 5] , 1, 0); + tessellator.addVertexWithUV(values[v + 6] , values[v + 7] , values[v + 8] , 0, 0); + tessellator.addVertexWithUV(values[v + 9] , values[v + 10], values[v + 11], 0, 1); + tessellator.draw(); + } GL11.glPopAttrib(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); From e34b5adec671fda3631c0eb74587eb0c85a9c589 Mon Sep 17 00:00:00 2001 From: fewizz Date: Mon, 14 Dec 2015 21:29:29 +0300 Subject: [PATCH 4/4] renames, fixes, additions. --- .../tombenpotter/emt/ElectroMagicTools.java | 14 +- .../java/tombenpotter/emt/ModInformation.java | 4 +- .../java/tombenpotter/emt/client/EMTKeys.java | 4 +- .../emt/client/gui/GuiEtherealMacerator.java | 6 +- .../gui/GuiIndustrialWandRecharger.java | 6 +- .../emt/client/gui/config/EMTGuiConfig.java | 2 +- .../emt/client/renderer/RenderLaser.java | 2 +- .../emt/client/renderer/RenderShield.java | 4 +- .../common/{blocks => block}/BlockBase.java | 2 +- .../{blocks => block}/BlockBaseContainer.java | 2 +- .../common/{blocks => block}/BlockEMT.java | 2 +- .../{blocks => block}/BlockEMTMachines.java | 2 +- .../{blocks => block}/BlockEMTSolars.java | 34 +-- .../{blocks => block}/BlockEMTSolars2.java | 12 +- .../BlockEssentiaGenerators.java | 19 +- .../{blocks => block}/BlockPortableNode.java | 2 +- .../common/{blocks => block}/BlockShield.java | 2 +- .../{blocks => block}/BlockToolRefiller.java | 2 +- .../{commands => command}/CommandOutputs.java | 12 +- .../{entities => entity}/EntityArcher.java | 2 +- .../{entities => entity}/EntityLaser.java | 2 +- .../{entities => entity}/EntityShield.java | 2 +- .../emt/common/init/BlockRegistry.java | 22 +- .../emt/common/init/EntityRegistry.java | 6 +- .../emt/common/init/ItemRegistry.java | 66 ++--- .../emt/common/init/RecipeRegistry.java | 168 ++++++------- .../emt/common/init/TileRegistry.java | 52 ++-- .../emt/common/{items => item}/ItemBase.java | 6 +- .../ItemElectricScribingTools.java | 2 +- .../{items => item}/ItemIC2Baubles.java | 8 +- .../common/{items => item}/ItemMaterials.java | 2 +- .../common/{items => item}/ItemOneRing.java | 6 +- .../boots/ItemElectricBootsTraveller.java | 12 +- .../armor/boots/ItemNanoBootsTraveller.java | 8 +- .../boots/ItemQuantumBootsTraveller.java | 8 +- .../ItemInfusedQuantumChestplate.java | 16 +- .../armor/goggles/ItemElectricGoggles.java | 12 +- .../armor/goggles/ItemNanoGoggles.java | 6 +- .../armor/goggles/ItemQuantumGoggles.java | 6 +- .../goggles/ItemSolarHelmetRevealing.java | 6 +- .../armor/wings/ItemFeatherWing.java | 6 +- .../armor/wings/ItemNanoWing.java | 10 +- .../armor/wings/ItemQuantumWing.java | 4 +- .../wings/ItemThaumiumReinforcedWing.java | 8 +- .../block}/ItemBlockEMTMachines.java | 2 +- .../common/item/block/ItemBlockEMTSolars.java | 184 ++++++++++++++ .../item/block/ItemBlockEMTSolars2.java | 91 +++++++ .../block}/ItemBlockEssentiaGenerator.java | 2 +- .../block/ItemBlockEssentiaGenerators.java | 53 ++++ .../foci => item/focus}/ItemBaseFocus.java | 2 +- .../foci => item/focus}/ItemChargeFocus.java | 8 +- .../focus}/ItemChristmasFocus.java | 2 +- .../focus}/ItemExplosionFocus.java | 4 +- .../foci => item/focus}/ItemShieldFocus.java | 4 +- .../focus}/ItemWandChargingFocus.java | 8 +- .../tool}/ItemElectricHoeGrowth.java | 2 +- .../tool}/ItemElectricThorHammer.java | 14 +- .../tools => item/tool}/ItemThorHammer.java | 6 +- .../tool}/ItemThorHammerBroken.java | 12 +- .../tool/chainsaw}/ItemDiamondChainsaw.java | 8 +- .../tool/chainsaw}/ItemStreamChainsaw.java | 2 +- .../tool/chainsaw}/ItemThaumiumChainsaw.java | 2 +- .../tool/drill}/ItemRockbreakerDrill.java | 8 +- .../tool/drill}/ItemThaumiumDrill.java | 16 +- .../tool/omnitool}/ItemOmnitoolDiamond.java | 8 +- .../tool/omnitool}/ItemOmnitoolIron.java | 12 +- .../tool/omnitool}/ItemOmnitoolThaumium.java | 8 +- .../items/blocks/ItemBlockEMTSolars.java | 184 -------------- .../items/blocks/ItemBlockEMTSolars2.java | 91 ------- .../blocks/ItemBlockEssentiaGenerators.java | 74 ------ .../tile/TileEntityEtherealMacerator.java | 6 +- .../TileEntityIndustrialWandRecharge.java | 4 +- .../generator/TileEntityAerGenerator.java | 13 + .../generator/TileEntityArborGenerator.java | 13 + .../generator/TileEntityAuramGenerator.java | 13 + .../TileEntityBaseGenerator.java | 14 +- .../generator/TileEntityIgnisGenerator.java | 13 + .../TileEntityPotentiaGenerator.java | 14 ++ .../generators/TileEntityAerGenerator.java | 14 -- .../generators/TileEntityArborGenerator.java | 14 -- .../generators/TileEntityAuramGenerator.java | 14 -- .../generators/TileEntityIgnisGenerator.java | 14 -- .../TileEntityPotentiaGenerator.java | 15 -- .../TileEntitySolarBase.java | 2 +- .../air/TileEntityAirSolar.java | 8 +- .../air/TileEntityDoubleAirSolar.java | 6 +- .../air/TileEntityTripleAirSolar.java | 6 +- .../compressed/TileEntityCompressedSolar.java | 8 +- .../TileEntityDoubleCompressedSolar.java | 8 +- .../TileEntityTripleCompressedSolar.java | 8 +- .../dark/TileEntityDarkSolar.java | 8 +- .../dark/TileEntityDoubleDarkSolar.java | 6 +- .../dark/TileEntityTripleDarkSolar.java | 6 +- .../earth/TileEntityDoubleEarthSolar.java | 6 +- .../earth/TileEntityEarthSolar.java | 8 +- .../earth/TileEntityTripleEarthSolar.java | 6 +- .../fire/TileEntityDoubleFireSolar.java | 6 +- .../fire/TileEntityFireSolar.java | 8 +- .../fire/TileEntityTripleFireSolar.java | 6 +- .../order/TileEntityDoubleOrderSolar.java | 6 +- .../order/TileEntityOrderSolar.java | 8 +- .../order/TileEntityTripleOrderSolar.java | 6 +- .../water/TileEntityDoubleWaterSolar.java | 6 +- .../water/TileEntityTripleWaterSolar.java | 6 +- .../water/TileEntityWaterSolar.java | 8 +- ...nfigHandler.java => EMTConfigHandler.java} | 51 ++-- ...ngAspects.java => EMTCraftingAspects.java} | 2 +- .../{CreativeTab.java => EMTCreativeTab.java} | 4 +- ...tor.java => EMTDungeonChestGenerator.java} | 10 +- .../emt/common/util/EMTEssentiasOutputs.java | 41 +++ .../emt/common/util/EMTEventHandler.java | 4 +- ...RandomHelper.java => EMTRandomHelper.java} | 11 +- .../emt/common/util/EMTResearch.java | 238 +++++++++--------- ...chAspects.java => EMTResearchAspects.java} | 2 +- .../emt/common/util/EMTResearchItem.java | 4 +- .../{TextHelper.java => EMTTextHelper.java} | 2 +- .../emt/common/util/EssentiasOutputs.java | 42 ---- .../emt/{proxies => proxy}/ClientProxy.java | 8 +- .../emt/{proxies => proxy}/CommonProxy.java | 2 +- 119 files changed, 1037 insertions(+), 1077 deletions(-) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockBase.java (95%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockBaseContainer.java (98%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockEMT.java (98%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockEMTMachines.java (99%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockEMTSolars.java (86%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockEMTSolars2.java (88%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockEssentiaGenerators.java (78%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockPortableNode.java (98%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockShield.java (97%) rename src/main/java/tombenpotter/emt/common/{blocks => block}/BlockToolRefiller.java (91%) rename src/main/java/tombenpotter/emt/common/{commands => command}/CommandOutputs.java (86%) rename src/main/java/tombenpotter/emt/common/{entities => entity}/EntityArcher.java (98%) rename src/main/java/tombenpotter/emt/common/{entities => entity}/EntityLaser.java (99%) rename src/main/java/tombenpotter/emt/common/{entities => entity}/EntityShield.java (98%) rename src/main/java/tombenpotter/emt/common/{items => item}/ItemBase.java (76%) rename src/main/java/tombenpotter/emt/common/{items => item}/ItemElectricScribingTools.java (97%) rename src/main/java/tombenpotter/emt/common/{items => item}/ItemIC2Baubles.java (94%) rename src/main/java/tombenpotter/emt/common/{items => item}/ItemMaterials.java (99%) rename src/main/java/tombenpotter/emt/common/{items => item}/ItemOneRing.java (92%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/boots/ItemElectricBootsTraveller.java (94%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/boots/ItemNanoBootsTraveller.java (80%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/boots/ItemQuantumBootsTraveller.java (80%) rename src/main/java/tombenpotter/emt/common/{items/armor/chestplates => item/armor/chestplate}/ItemInfusedQuantumChestplate.java (97%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/goggles/ItemElectricGoggles.java (93%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/goggles/ItemNanoGoggles.java (92%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/goggles/ItemQuantumGoggles.java (95%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/goggles/ItemSolarHelmetRevealing.java (97%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/wings/ItemFeatherWing.java (96%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/wings/ItemNanoWing.java (94%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/wings/ItemQuantumWing.java (93%) rename src/main/java/tombenpotter/emt/common/{items => item}/armor/wings/ItemThaumiumReinforcedWing.java (87%) rename src/main/java/tombenpotter/emt/common/{items/blocks => item/block}/ItemBlockEMTMachines.java (93%) create mode 100644 src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars.java create mode 100644 src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars2.java rename src/main/java/tombenpotter/emt/common/{items/blocks => item/block}/ItemBlockEssentiaGenerator.java (87%) create mode 100644 src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerators.java rename src/main/java/tombenpotter/emt/common/{items/foci => item/focus}/ItemBaseFocus.java (98%) rename src/main/java/tombenpotter/emt/common/{items/foci => item/focus}/ItemChargeFocus.java (91%) rename src/main/java/tombenpotter/emt/common/{items/foci => item/focus}/ItemChristmasFocus.java (97%) rename src/main/java/tombenpotter/emt/common/{items/foci => item/focus}/ItemExplosionFocus.java (93%) rename src/main/java/tombenpotter/emt/common/{items/foci => item/focus}/ItemShieldFocus.java (95%) rename src/main/java/tombenpotter/emt/common/{items/foci => item/focus}/ItemWandChargingFocus.java (75%) rename src/main/java/tombenpotter/emt/common/{items/tools => item/tool}/ItemElectricHoeGrowth.java (98%) rename src/main/java/tombenpotter/emt/common/{items/tools => item/tool}/ItemElectricThorHammer.java (94%) rename src/main/java/tombenpotter/emt/common/{items/tools => item/tool}/ItemThorHammer.java (95%) rename src/main/java/tombenpotter/emt/common/{items/tools => item/tool}/ItemThorHammerBroken.java (85%) rename src/main/java/tombenpotter/emt/common/{items/tools/chainsaws => item/tool/chainsaw}/ItemDiamondChainsaw.java (97%) rename src/main/java/tombenpotter/emt/common/{items/tools/chainsaws => item/tool/chainsaw}/ItemStreamChainsaw.java (98%) rename src/main/java/tombenpotter/emt/common/{items/tools/chainsaws => item/tool/chainsaw}/ItemThaumiumChainsaw.java (98%) rename src/main/java/tombenpotter/emt/common/{items/tools/drills => item/tool/drill}/ItemRockbreakerDrill.java (97%) rename src/main/java/tombenpotter/emt/common/{items/tools/drills => item/tool/drill}/ItemThaumiumDrill.java (89%) rename src/main/java/tombenpotter/emt/common/{items/tools/omnitools => item/tool/omnitool}/ItemOmnitoolDiamond.java (90%) rename src/main/java/tombenpotter/emt/common/{items/tools/omnitools => item/tool/omnitool}/ItemOmnitoolIron.java (95%) rename src/main/java/tombenpotter/emt/common/{items/tools/omnitools => item/tool/omnitool}/ItemOmnitoolThaumium.java (90%) delete mode 100644 src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java delete mode 100644 src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java delete mode 100644 src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java create mode 100644 src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAerGenerator.java create mode 100644 src/main/java/tombenpotter/emt/common/tile/generator/TileEntityArborGenerator.java create mode 100644 src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAuramGenerator.java rename src/main/java/tombenpotter/emt/common/tile/{generators => generator}/TileEntityBaseGenerator.java (84%) create mode 100644 src/main/java/tombenpotter/emt/common/tile/generator/TileEntityIgnisGenerator.java create mode 100644 src/main/java/tombenpotter/emt/common/tile/generator/TileEntityPotentiaGenerator.java delete mode 100644 src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAerGenerator.java delete mode 100644 src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java delete mode 100644 src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java delete mode 100644 src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java delete mode 100644 src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/TileEntitySolarBase.java (98%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/air/TileEntityAirSolar.java (74%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/air/TileEntityDoubleAirSolar.java (72%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/air/TileEntityTripleAirSolar.java (72%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/compressed/TileEntityCompressedSolar.java (63%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/compressed/TileEntityDoubleCompressedSolar.java (63%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/compressed/TileEntityTripleCompressedSolar.java (63%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/dark/TileEntityDarkSolar.java (73%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/dark/TileEntityDoubleDarkSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/dark/TileEntityTripleDarkSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/earth/TileEntityDoubleEarthSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/earth/TileEntityEarthSolar.java (72%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/earth/TileEntityTripleEarthSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/fire/TileEntityDoubleFireSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/fire/TileEntityFireSolar.java (77%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/fire/TileEntityTripleFireSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/order/TileEntityDoubleOrderSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/order/TileEntityOrderSolar.java (69%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/order/TileEntityTripleOrderSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/water/TileEntityDoubleWaterSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/water/TileEntityTripleWaterSolar.java (70%) rename src/main/java/tombenpotter/emt/common/tile/{solars => solar}/water/TileEntityWaterSolar.java (74%) rename src/main/java/tombenpotter/emt/common/util/{ConfigHandler.java => EMTConfigHandler.java} (90%) rename src/main/java/tombenpotter/emt/common/util/{CraftingAspects.java => EMTCraftingAspects.java} (99%) rename src/main/java/tombenpotter/emt/common/util/{CreativeTab.java => EMTCreativeTab.java} (85%) rename src/main/java/tombenpotter/emt/common/util/{DungeonChestGenerator.java => EMTDungeonChestGenerator.java} (70%) create mode 100644 src/main/java/tombenpotter/emt/common/util/EMTEssentiasOutputs.java rename src/main/java/tombenpotter/emt/common/util/{RandomHelper.java => EMTRandomHelper.java} (87%) rename src/main/java/tombenpotter/emt/common/util/{ResearchAspects.java => EMTResearchAspects.java} (99%) rename src/main/java/tombenpotter/emt/common/util/{TextHelper.java => EMTTextHelper.java} (98%) delete mode 100644 src/main/java/tombenpotter/emt/common/util/EssentiasOutputs.java rename src/main/java/tombenpotter/emt/{proxies => proxy}/ClientProxy.java (81%) rename src/main/java/tombenpotter/emt/{proxies => proxy}/CommonProxy.java (98%) diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index 73d076b..7951216 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -20,12 +20,12 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import tombenpotter.emt.common.commands.CommandOutputs; +import tombenpotter.emt.common.command.CommandOutputs; import tombenpotter.emt.common.init.EntityRegistry; import tombenpotter.emt.common.init.Registry; import tombenpotter.emt.common.network.PacketEMTKeys; import tombenpotter.emt.common.util.*; -import tombenpotter.emt.proxies.CommonProxy; +import tombenpotter.emt.proxy.CommonProxy; @Mod(modid = ModInformation.modid, name = ModInformation.name, version = ModInformation.version, guiFactory = ModInformation.guiFactory, dependencies = ModInformation.depend) public class ElectroMagicTools { @@ -35,7 +35,7 @@ public class ElectroMagicTools { @SidedProxy(clientSide = ModInformation.clientProxy, serverSide = ModInformation.commonProxy) public static CommonProxy proxy; - public static CreativeTabs tabEMT = new CreativeTab(ModInformation.modid + ".creativeTab"); + public static CreativeTabs tabEMT = new EMTCreativeTab(ModInformation.modid + ".creativeTab"); public static Logger logger = LogManager.getLogger(ModInformation.name); @Instance(ModInformation.modid) @@ -45,11 +45,11 @@ public class ElectroMagicTools { public void preInit(FMLPreInitializationEvent event) { ElectroMagicTools.logger.info("Starting planning the world domination"); - ConfigHandler.init(event.getSuggestedConfigurationFile()); + EMTConfigHandler.init(event.getSuggestedConfigurationFile()); FMLCommonHandler.instance().bus().register(new EMTEventHandler()); Registry.register(); - EssentiasOutputs.addPrimalOutputs(); - EssentiasOutputs.addOutputs(); + EMTEssentiasOutputs.addPrimalOutputs(); + EMTEssentiasOutputs.addOutputs(); registerPackets(); ElectroMagicTools.logger.info("Planning complete"); @@ -64,7 +64,7 @@ public class ElectroMagicTools { ElectroMagicTools.logger.info("Making mobs drop additional items"); MinecraftForge.EVENT_BUS.register(new EMTEventHandler()); ElectroMagicTools.logger.info("Adding dungeon loot"); - DungeonChestGenerator.generateLoot(); + EMTDungeonChestGenerator.generateLoot(); ElectroMagicTools.logger.info("Registering entities"); EntityRegistry.registerEMTEntities(); diff --git a/src/main/java/tombenpotter/emt/ModInformation.java b/src/main/java/tombenpotter/emt/ModInformation.java index 26cac7e..66cdbfb 100644 --- a/src/main/java/tombenpotter/emt/ModInformation.java +++ b/src/main/java/tombenpotter/emt/ModInformation.java @@ -7,8 +7,8 @@ public class ModInformation { public static final String version = "1.2.4"; public static final String texturePath = "electromagictools"; public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory"; - public static final String clientProxy = "tombenpotter.emt.proxies.ClientProxy"; - public static final String commonProxy = "tombenpotter.emt.proxies.CommonProxy"; + public static final String clientProxy = "tombenpotter.emt.proxy.ClientProxy"; + public static final String commonProxy = "tombenpotter.emt.proxy.CommonProxy"; public static final String channel = "ElectroMagicTools"; public static final String depend = "required-after:Thaumcraft ; required-after:IC2"; } diff --git a/src/main/java/tombenpotter/emt/client/EMTKeys.java b/src/main/java/tombenpotter/emt/client/EMTKeys.java index 330cf20..5f639c3 100644 --- a/src/main/java/tombenpotter/emt/client/EMTKeys.java +++ b/src/main/java/tombenpotter/emt/client/EMTKeys.java @@ -8,7 +8,7 @@ import java.util.Set; import org.lwjgl.input.Keyboard; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTTextHelper; import cpw.mods.fml.client.registry.ClientRegistry; import net.minecraft.client.settings.KeyBinding; @@ -16,7 +16,7 @@ public class EMTKeys { public static KeyBinding keyUnequip; public static void registerKeys() { - keyUnequip = new KeyBinding(TextHelper.localize("gui.EMT.key.unequip"), Keyboard.KEY_Z, "EMT"); + keyUnequip = new KeyBinding(EMTTextHelper.localize("gui.EMT.key.unequip"), Keyboard.KEY_Z, "EMT"); ClientRegistry.registerKeyBinding(keyUnequip); } diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java index a9577ce..fd7359a 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator; import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTTextHelper; public class GuiEtherealMacerator extends GuiContainer { @@ -28,7 +28,7 @@ public class GuiEtherealMacerator extends GuiContainer { } protected void drawGuiContainerForegroundLayer(int par1, int par2) { - this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.etherealMacerator.title"), 6, 6, 4210752); - this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.etherealMacerator.title"), 6, 6, 4210752); + this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java index 0ddea33..97c8089 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge; import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTTextHelper; public class GuiIndustrialWandRecharger extends GuiContainer { @@ -28,7 +28,7 @@ public class GuiIndustrialWandRecharger extends GuiContainer { } protected void drawGuiContainerForegroundLayer(int par1, int par2) { - this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.wandRecharge.title"), 6, 6, 4210752); - this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.wandRecharge.title"), 6, 6, 4210752); + this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java index 937fe82..0461523 100644 --- a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java +++ b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static tombenpotter.emt.common.util.ConfigHandler.*; +import static tombenpotter.emt.common.util.EMTConfigHandler.*; public class EMTGuiConfig extends GuiConfig { diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java index 2b34017..0878fb4 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.entities.EntityLaser; +import tombenpotter.emt.common.entity.EntityLaser; public class RenderLaser extends Render { diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java index 1fc236a..77bc3b1 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java @@ -10,12 +10,12 @@ import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.entities.EntityLaser; +import tombenpotter.emt.common.entity.EntityLaser; public class RenderShield extends Render { private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/shield.png"); - private static float[] values = new float[6912]; + private static final float[] values = new float[6912]; static{ float sin1; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockBase.java b/src/main/java/tombenpotter/emt/common/block/BlockBase.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/blocks/BlockBase.java rename to src/main/java/tombenpotter/emt/common/block/BlockBase.java index 00b7a82..fc0c37c 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockBase.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockBase.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockBaseContainer.java b/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/blocks/BlockBaseContainer.java rename to src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java index fe64e2a..f97d4bf 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockBaseContainer.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMT.java b/src/main/java/tombenpotter/emt/common/block/BlockEMT.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/blocks/BlockEMT.java rename to src/main/java/tombenpotter/emt/common/block/BlockEMT.java index 741765a..8b4140d 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMT.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEMT.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/block/BlockEMTMachines.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java rename to src/main/java/tombenpotter/emt/common/block/BlockEMTMachines.java index 56b8f7d..7ac8c57 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEMTMachines.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java rename to src/main/java/tombenpotter/emt/common/block/BlockEMTSolars.java index 628ea44..732ccda 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,22 +11,22 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.solars.air.TileEntityAirSolar; -import tombenpotter.emt.common.tile.solars.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.tile.solars.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.tile.solars.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.tile.solars.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.tile.solars.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.tile.solars.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.tile.solars.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.tile.solars.fire.TileEntityFireSolar; -import tombenpotter.emt.common.tile.solars.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.tile.solars.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.tile.solars.order.TileEntityOrderSolar; -import tombenpotter.emt.common.tile.solars.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.tile.solars.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.tile.solars.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.tile.solars.water.TileEntityWaterSolar; +import tombenpotter.emt.common.tile.solar.air.TileEntityAirSolar; +import tombenpotter.emt.common.tile.solar.compressed.TileEntityCompressedSolar; +import tombenpotter.emt.common.tile.solar.compressed.TileEntityDoubleCompressedSolar; +import tombenpotter.emt.common.tile.solar.compressed.TileEntityTripleCompressedSolar; +import tombenpotter.emt.common.tile.solar.dark.TileEntityDarkSolar; +import tombenpotter.emt.common.tile.solar.dark.TileEntityDoubleDarkSolar; +import tombenpotter.emt.common.tile.solar.dark.TileEntityTripleDarkSolar; +import tombenpotter.emt.common.tile.solar.fire.TileEntityDoubleFireSolar; +import tombenpotter.emt.common.tile.solar.fire.TileEntityFireSolar; +import tombenpotter.emt.common.tile.solar.fire.TileEntityTripleFireSolar; +import tombenpotter.emt.common.tile.solar.order.TileEntityDoubleOrderSolar; +import tombenpotter.emt.common.tile.solar.order.TileEntityOrderSolar; +import tombenpotter.emt.common.tile.solar.order.TileEntityTripleOrderSolar; +import tombenpotter.emt.common.tile.solar.water.TileEntityDoubleWaterSolar; +import tombenpotter.emt.common.tile.solar.water.TileEntityTripleWaterSolar; +import tombenpotter.emt.common.tile.solar.water.TileEntityWaterSolar; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars2.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java rename to src/main/java/tombenpotter/emt/common/block/BlockEMTSolars2.java index fd7a4d4..b522f23 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars2.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,11 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.solars.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.tile.solars.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.tile.solars.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.tile.solars.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.tile.solars.earth.TileEntityTripleEarthSolar; +import tombenpotter.emt.common.tile.solar.air.TileEntityDoubleAirSolar; +import tombenpotter.emt.common.tile.solar.air.TileEntityTripleAirSolar; +import tombenpotter.emt.common.tile.solar.earth.TileEntityDoubleEarthSolar; +import tombenpotter.emt.common.tile.solar.earth.TileEntityEarthSolar; +import tombenpotter.emt.common.tile.solar.earth.TileEntityTripleEarthSolar; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java similarity index 78% rename from src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java rename to src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java index 461c2b0..f1bf852 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java @@ -1,8 +1,10 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -10,11 +12,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.generators.*; +import tombenpotter.emt.common.tile.generator.*; import java.util.List; import java.util.Random; +import org.lwjgl.opengl.GL11; + public class BlockEssentiaGenerators extends BlockBaseContainer { public BlockEssentiaGenerators() { @@ -73,6 +77,15 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random random) { - world.spawnParticle("largesmoke", x + 0.5f, y + 1.0f, z + 0.5f, 0.0D, 0.0D, 0.0D); + int color = ((TileEntityBaseGenerator)world.getTileEntity(x, y, z)).aspect.getColor(); + float r = (float)(color >> 16 & 0xff) / 255F; + float g = (float)(color >> 8 & 0xff) / 255F; + float b = (float)(color & 0xff) / 255F; + + for(int i = 0; i < 3; i++){ + EntitySmokeFX fx = new EntitySmokeFX(world, x + 0.5f, y + 1.1, z + 0.5f, 0, 0.1, 0, 3); + fx.setRBGColorF(r, g, b); + Minecraft.getMinecraft().effectRenderer.addEffect(fx); + } } } diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java rename to src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java index f23dcd6..7b49bbe 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java b/src/main/java/tombenpotter/emt/common/block/BlockShield.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/blocks/BlockShield.java rename to src/main/java/tombenpotter/emt/common/block/BlockShield.java index e852ebd..1b00cf4 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockShield.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockToolRefiller.java b/src/main/java/tombenpotter/emt/common/block/BlockToolRefiller.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/blocks/BlockToolRefiller.java rename to src/main/java/tombenpotter/emt/common/block/BlockToolRefiller.java index f9029de..5630042 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockToolRefiller.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockToolRefiller.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.block; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java b/src/main/java/tombenpotter/emt/common/command/CommandOutputs.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java rename to src/main/java/tombenpotter/emt/common/command/CommandOutputs.java index fd1e2ad..75c8bb2 100644 --- a/src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java +++ b/src/main/java/tombenpotter/emt/common/command/CommandOutputs.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.commands; +package tombenpotter.emt.common.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; @@ -9,8 +9,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.EssentiasOutputs; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTEssentiasOutputs; +import tombenpotter.emt.common.util.EMTTextHelper; import java.util.Collection; import java.util.List; @@ -50,13 +50,13 @@ public class CommandOutputs extends CommandBase { @Override public void processCommand(ICommandSender command, String[] astring) { - text = TextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": "; + text = EMTTextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": "; Collection aspectCollection = Aspect.aspects.values(); for (Aspect aspect : aspectCollection) { - String text2 = addStrings(text, (aspect.getTag() + ": " + String.valueOf(EssentiasOutputs.outputs.get(aspect.getTag())) + "\n")); + String text2 = addStrings(text, (aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())) + "\n")); text = text2; } - addOutputsBook(TextHelper.localize("gui.EMT.book.aspect.output.eu.title"), text, command, astring); + addOutputsBook(EMTTextHelper.localize("gui.EMT.book.aspect.output.eu.title"), text, command, astring); } public void addOutputsBook(String title, String text, ICommandSender command, String[] astring) { diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java b/src/main/java/tombenpotter/emt/common/entity/EntityArcher.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/entities/EntityArcher.java rename to src/main/java/tombenpotter/emt/common/entity/EntityArcher.java index 9356d40..33dcfc4 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java +++ b/src/main/java/tombenpotter/emt/common/entity/EntityArcher.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.entities; +package tombenpotter.emt.common.entity; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java b/src/main/java/tombenpotter/emt/common/entity/EntityLaser.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/entities/EntityLaser.java rename to src/main/java/tombenpotter/emt/common/entity/EntityLaser.java index 5b1d65f..dceeb3b 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java +++ b/src/main/java/tombenpotter/emt/common/entity/EntityLaser.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.entities; +package tombenpotter.emt.common.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityShield.java b/src/main/java/tombenpotter/emt/common/entity/EntityShield.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/entities/EntityShield.java rename to src/main/java/tombenpotter/emt/common/entity/EntityShield.java index 408d00e..305fe36 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityShield.java +++ b/src/main/java/tombenpotter/emt/common/entity/EntityShield.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.entities; +package tombenpotter.emt.common.entity; import java.util.ArrayList; import java.util.LinkedList; diff --git a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java index 732b35d..86bc989 100644 --- a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java @@ -8,17 +8,17 @@ import static thaumcraft.api.ThaumcraftApi.*; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.blocks.BlockEMTMachines; -import tombenpotter.emt.common.blocks.BlockEMTSolars; -import tombenpotter.emt.common.blocks.BlockEMTSolars2; -import tombenpotter.emt.common.blocks.BlockEssentiaGenerators; -import tombenpotter.emt.common.blocks.BlockPortableNode; -import tombenpotter.emt.common.blocks.BlockShield; -import tombenpotter.emt.common.items.blocks.ItemBlockEMTMachines; -import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars; -import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars2; -import tombenpotter.emt.common.items.blocks.ItemBlockEssentiaGenerator; -import tombenpotter.emt.common.items.blocks.ItemBlockEssentiaGenerators; +import tombenpotter.emt.common.block.BlockEMTMachines; +import tombenpotter.emt.common.block.BlockEMTSolars; +import tombenpotter.emt.common.block.BlockEMTSolars2; +import tombenpotter.emt.common.block.BlockEssentiaGenerators; +import tombenpotter.emt.common.block.BlockPortableNode; +import tombenpotter.emt.common.block.BlockShield; +import tombenpotter.emt.common.item.block.ItemBlockEMTMachines; +import tombenpotter.emt.common.item.block.ItemBlockEMTSolars; +import tombenpotter.emt.common.item.block.ItemBlockEMTSolars2; +import tombenpotter.emt.common.item.block.ItemBlockEssentiaGenerator; +import tombenpotter.emt.common.item.block.ItemBlockEssentiaGenerators; public class BlockRegistry { diff --git a/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java b/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java index a828bce..e1bb1d9 100644 --- a/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java @@ -5,9 +5,9 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.entity.EntityLiving; import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.entities.EntityArcher; -import tombenpotter.emt.common.entities.EntityLaser; -import tombenpotter.emt.common.entities.EntityShield; +import tombenpotter.emt.common.entity.EntityArcher; +import tombenpotter.emt.common.entity.EntityLaser; +import tombenpotter.emt.common.entity.EntityShield; public class EntityRegistry { diff --git a/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java b/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java index b4e2def..fe8e35c 100644 --- a/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java @@ -11,39 +11,39 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApi; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.items.ItemElectricScribingTools; -import tombenpotter.emt.common.items.ItemIC2Baubles; -import tombenpotter.emt.common.items.ItemMaterials; -import tombenpotter.emt.common.items.ItemOneRing; -import tombenpotter.emt.common.items.armor.wings.ItemFeatherWing; -import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing; -import tombenpotter.emt.common.items.armor.boots.ItemElectricBootsTraveller; -import tombenpotter.emt.common.items.armor.boots.ItemNanoBootsTraveller; -import tombenpotter.emt.common.items.armor.boots.ItemQuantumBootsTraveller; -import tombenpotter.emt.common.items.armor.chestplates.ItemInfusedQuantumChestplate; -import tombenpotter.emt.common.items.armor.goggles.ItemElectricGoggles; -import tombenpotter.emt.common.items.armor.goggles.ItemNanoGoggles; -import tombenpotter.emt.common.items.armor.goggles.ItemQuantumGoggles; -import tombenpotter.emt.common.items.armor.goggles.ItemSolarHelmetRevealing; -import tombenpotter.emt.common.items.armor.wings.ItemNanoWing; -import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing; -import tombenpotter.emt.common.items.foci.ItemChargeFocus; -import tombenpotter.emt.common.items.foci.ItemChristmasFocus; -import tombenpotter.emt.common.items.foci.ItemExplosionFocus; -import tombenpotter.emt.common.items.foci.ItemShieldFocus; -import tombenpotter.emt.common.items.foci.ItemWandChargingFocus; -import tombenpotter.emt.common.items.tools.ItemElectricHoeGrowth; -import tombenpotter.emt.common.items.tools.ItemElectricThorHammer; -import tombenpotter.emt.common.items.tools.ItemThorHammer; -import tombenpotter.emt.common.items.tools.ItemThorHammerBroken; -import tombenpotter.emt.common.items.tools.chainsaws.ItemDiamondChainsaw; -import tombenpotter.emt.common.items.tools.chainsaws.ItemStreamChainsaw; -import tombenpotter.emt.common.items.tools.chainsaws.ItemThaumiumChainsaw; -import tombenpotter.emt.common.items.tools.drills.ItemRockbreakerDrill; -import tombenpotter.emt.common.items.tools.drills.ItemThaumiumDrill; -import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolDiamond; -import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolIron; -import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolThaumium; +import tombenpotter.emt.common.item.ItemElectricScribingTools; +import tombenpotter.emt.common.item.ItemIC2Baubles; +import tombenpotter.emt.common.item.ItemMaterials; +import tombenpotter.emt.common.item.ItemOneRing; +import tombenpotter.emt.common.item.armor.boots.ItemElectricBootsTraveller; +import tombenpotter.emt.common.item.armor.boots.ItemNanoBootsTraveller; +import tombenpotter.emt.common.item.armor.boots.ItemQuantumBootsTraveller; +import tombenpotter.emt.common.item.armor.chestplate.ItemInfusedQuantumChestplate; +import tombenpotter.emt.common.item.armor.goggles.ItemElectricGoggles; +import tombenpotter.emt.common.item.armor.goggles.ItemNanoGoggles; +import tombenpotter.emt.common.item.armor.goggles.ItemQuantumGoggles; +import tombenpotter.emt.common.item.armor.goggles.ItemSolarHelmetRevealing; +import tombenpotter.emt.common.item.armor.wings.ItemFeatherWing; +import tombenpotter.emt.common.item.armor.wings.ItemNanoWing; +import tombenpotter.emt.common.item.armor.wings.ItemQuantumWing; +import tombenpotter.emt.common.item.armor.wings.ItemThaumiumReinforcedWing; +import tombenpotter.emt.common.item.focus.ItemChargeFocus; +import tombenpotter.emt.common.item.focus.ItemChristmasFocus; +import tombenpotter.emt.common.item.focus.ItemExplosionFocus; +import tombenpotter.emt.common.item.focus.ItemShieldFocus; +import tombenpotter.emt.common.item.focus.ItemWandChargingFocus; +import tombenpotter.emt.common.item.tool.ItemElectricHoeGrowth; +import tombenpotter.emt.common.item.tool.ItemElectricThorHammer; +import tombenpotter.emt.common.item.tool.ItemThorHammer; +import tombenpotter.emt.common.item.tool.ItemThorHammerBroken; +import tombenpotter.emt.common.item.tool.chainsaw.ItemDiamondChainsaw; +import tombenpotter.emt.common.item.tool.chainsaw.ItemStreamChainsaw; +import tombenpotter.emt.common.item.tool.chainsaw.ItemThaumiumChainsaw; +import tombenpotter.emt.common.item.tool.drill.ItemRockbreakerDrill; +import tombenpotter.emt.common.item.tool.drill.ItemThaumiumDrill; +import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolDiamond; +import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolIron; +import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolThaumium; public class ItemRegistry { diff --git a/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java index cd3a946..2008377 100644 --- a/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java @@ -31,9 +31,9 @@ import thaumcraft.common.blocks.ItemJarNode; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.CraftingAspects; -import tombenpotter.emt.common.util.RandomHelper; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTCraftingAspects; +import tombenpotter.emt.common.util.EMTRandomHelper; import java.util.Iterator; @@ -44,8 +44,8 @@ public class RecipeRegistry { private static void registerShapedRecipes() { /** Crafting Recipes **/ - ironOmnitool = GameRegistry.addShapedRecipe(RandomHelper.getChargedItem(ItemRegistry.ironOmnitool, 10), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); - diamondChainsaw = GameRegistry.addShapedRecipe(RandomHelper.getChargedItem(ItemRegistry.diamondChainsaw, 10), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + ironOmnitool = GameRegistry.addShapedRecipe(EMTRandomHelper.getChargedItem(ItemRegistry.ironOmnitool, 10), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); + diamondChainsaw = GameRegistry.addShapedRecipe(EMTRandomHelper.getChargedItem(ItemRegistry.diamondChainsaw, 10), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); ductTape = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper)); featherMesh = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 9)); featherWing = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 11)); @@ -90,23 +90,23 @@ public class RecipeRegistry { ItemStack iridium = IC2Items.getItem("iridiumOre").copy(); iridium.stackSize = 2; - uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell }); + uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, EMTCraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell }); ItemStack uranium = IC2Items.getItem("Uran238").copy(); uranium.stackSize = 2; - diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell }); + diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, EMTCraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell }); ItemStack diamond = new ItemStack(Items.diamond).copy(); diamond.stackSize = 1; - goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell }); + goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell }); ItemStack gold = new ItemStack(Items.gold_ingot).copy(); gold.stackSize = 2; - ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, EMTCraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell }); ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy(); ironOre.stackSize = 16; - stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[] { uuMCell, uuMCell }); + stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[] { uuMCell, uuMCell }); /** * ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN @@ -114,7 +114,7 @@ public class RecipeRegistry { **/ ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy(); copperOre.stackSize = 32; - arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[] { uuMCell, uuMCell }); + arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[] { uuMCell, uuMCell }); /** * ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF @@ -122,7 +122,7 @@ public class RecipeRegistry { **/ ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy(); tinOre.stackSize = 32; - arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[] { uuMCell, uuMCell }); + arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[] { uuMCell, uuMCell }); /** * ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF @@ -130,200 +130,200 @@ public class RecipeRegistry { **/ ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy(); leadOre.stackSize = 32; - amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[] { uuMCell, uuMCell }); + amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[] { uuMCell, uuMCell }); ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy(); uraniumOre.stackSize = 8; - amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, EMTCraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[] { uuMCell, uuMCell, uuMCell }); ItemStack coal = new ItemStack(Items.coal, 1, 0).copy(); coal.stackSize = 16; - charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[] { uuMCell, uuMCell }); + charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[] { uuMCell, uuMCell }); ItemStack stickyResin = IC2Items.getItem("resin").copy(); stickyResin.stackSize = 21; - shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); ItemStack redstone = new ItemStack(Items.redstone).copy(); redstone.stackSize = 24; - shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy(); lapisLazuli.stackSize = 8; - shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); ItemStack glowstone = new ItemStack(Blocks.glowstone).copy(); glowstone.stackSize = 1; - glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[] { uuMCell }); + glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, EMTCraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[] { uuMCell }); } public static void registerLateRecipes() { /** Infusion Recipes **/ - thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", RandomHelper.getChargedItem(ItemRegistry.thaumiumDrill, 10), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), + thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", EMTRandomHelper.getChargedItem(ItemRegistry.thaumiumDrill, 10), 5, EMTCraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") }); - thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", RandomHelper.getChargedItem(ItemRegistry.thaumiumChainsaw, 10), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), + thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", EMTRandomHelper.getChargedItem(ItemRegistry.thaumiumChainsaw, 10), 5, EMTCraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") }); - thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.quantumThaumicHelmet, 10), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), + thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", EMTRandomHelper.getChargedItem(ItemRegistry.quantumThaumicHelmet, 10), 6, EMTCraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit") }); - thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.nanoThaumicHelmet, 10), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), + thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", EMTRandomHelper.getChargedItem(ItemRegistry.nanoThaumicHelmet, 10), 5, EMTCraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit") }); - thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", RandomHelper.getChargedItem(ItemRegistry.thaumiumOmnitool, 10), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), + thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", EMTRandomHelper.getChargedItem(ItemRegistry.thaumiumOmnitool, 10), 6, EMTCraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian") }); - diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), + diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, EMTCraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit") }); - explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(ItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), + explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(ItemRegistry.explosionFocus), 6, EMTCraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), new ItemStack[] { new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.arrow), new ItemStack(Items.gunpowder), new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1) }); - shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(ItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), + shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(ItemRegistry.shieldFocus), 4, EMTCraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), new ItemStack[] { IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian) }); - potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), + potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 6, EMTCraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade), new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar), IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"), IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap") }); - streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", RandomHelper.getChargedItem(ItemRegistry.streamChainsaw, 10), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), + streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", EMTRandomHelper.getChargedItem(ItemRegistry.streamChainsaw, 10), 6, EMTCraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade") }); - rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", RandomHelper.getChargedItem(ItemRegistry.rockbreakerDrill, 10), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), + rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", EMTRandomHelper.getChargedItem(ItemRegistry.rockbreakerDrill, 10), 6, EMTCraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade") }); - thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), + thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, EMTCraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber") }); - superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", RandomHelper.getChargedItem(ItemRegistry.electricThorHammer, 10), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), + superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", EMTRandomHelper.getChargedItem(ItemRegistry.electricThorHammer, 10), 10, EMTCraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE) }); - wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), + wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 6, EMTCraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[] { IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"), new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar) }); - solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", RandomHelper.getChargedItem(ItemRegistry.solarHelmetRevealing, 10), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), + solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", EMTRandomHelper.getChargedItem(ItemRegistry.solarHelmetRevealing, 10), 5, EMTCraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4) }); - electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.electricBootsTraveller, 10), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), + electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", EMTRandomHelper.getChargedItem(ItemRegistry.electricBootsTraveller, 10), 2, EMTCraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), new ItemStack[] { new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), IC2Items.getItem("hazmatBoots"), new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE) }); - nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.nanoBootsTraveller, 10), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), + nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", EMTRandomHelper.getChargedItem(ItemRegistry.nanoBootsTraveller, 10), 2, EMTCraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE) }); - quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.quantumBootsTraveller, 10), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), + quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", EMTRandomHelper.getChargedItem(ItemRegistry.quantumBootsTraveller, 10), 2, EMTCraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate") }); - etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), + etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 3, EMTCraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[] { IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5) }); - tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), + tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, EMTCraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1) }); - electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", RandomHelper.getChargedItem(ItemRegistry.electricHoeGrowth, 10), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), + electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", EMTRandomHelper.getChargedItem(ItemRegistry.electricHoeGrowth, 10), 4, EMTCraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[] { new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE) }); - chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), + chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, EMTCraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE) }); - wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(ItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(BlockRegistry.emtMachines, 1, 0), + wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(ItemRegistry.wandChargeFocus), 5, EMTCraftingAspects.wandChargeFocus, new ItemStack(BlockRegistry.emtMachines, 1, 0), new ItemStack[] { new ItemStack(ItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate") }); - inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), + inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 1), 6, EMTCraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[] { new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("solarPanel"), ic2.core.Ic2Items.WindKineticGenerator, ic2.core.Ic2Items.WaterKineticGenerator, IC2Items.getItem("nuclearReactor") }); - armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), + armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, EMTCraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[] { new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("solarPanel"), ic2.core.Ic2Items.WindKineticGenerator, ic2.core.Ic2Items.WaterKineticGenerator, IC2Items.getItem("nuclearReactor") }); - nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", RandomHelper.getChargedItem(ItemRegistry.nanoWing, 10), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing), + nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", EMTRandomHelper.getChargedItem(ItemRegistry.nanoWing, 10), 4, EMTCraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing), new ItemStack[] { IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1) }); - quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", RandomHelper.getChargedItem(ItemRegistry.quantumWing, 10), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), + quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", EMTRandomHelper.getChargedItem(ItemRegistry.quantumWing, 10), 6, EMTCraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1) }); - infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("Infused Quantum Armor", RandomHelper.getChargedItem(ItemRegistry.quantumArmor, 10), 5, CraftingAspects.quantumWing, new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), + infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("Infused Quantum Armor", EMTRandomHelper.getChargedItem(ItemRegistry.quantumArmor, 10), 5, EMTCraftingAspects.quantumWing, new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(BlockRegistry.shield), new ItemStack(BlockRegistry.shield) }); /** Arcane Worktable Recipes **/ - diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", RandomHelper.getChargedItem(ItemRegistry.diamondOmnitool, 10), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", EMTRandomHelper.getChargedItem(ItemRegistry.diamondOmnitool, 10), EMTCraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); + ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), EMTCraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); - christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); + christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), EMTCraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); - electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", RandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', + electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", EMTRandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), EMTCraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("reBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); - electricGoggles2 = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", RandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', + electricGoggles2 = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", EMTRandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), EMTCraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); - shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Block", new ItemStack(BlockRegistry.shield, 6), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); + shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Block", new ItemStack(BlockRegistry.shield, 6), EMTCraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); - tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); + tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), EMTCraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); - compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); + compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); - doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0)); + doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0)); - electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", RandomHelper.getChargedItem(ItemRegistry.electricScribingTools, 10), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', + electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", EMTRandomHelper.getChargedItem(ItemRegistry.electricScribingTools, 10), EMTCraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.itemEMTItems, 1, 14), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 13), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', IC2Items.getItem("plateiron")); + thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.itemEMTItems, 1, 14), EMTCraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 13), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', IC2Items.getItem("plateiron")); - thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14)); + thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), EMTCraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14)); /** Crucible Recipes **/ - ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting); + ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.ignisGeneratorCrafting); - auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting); + auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.auramGeneratorCrafting); - arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting); + arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.arborGeneratorCrafting); - aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 4), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.aerGenerator); + aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 4), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.aerGenerator); - waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars); + waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.waterSolars); - doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars); + doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.waterSolars); - tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars); + tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.waterSolars); - darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars); + darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.darkSolars); - doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars); + doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.darkSolars); - tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars); + tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.darkSolars); - orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars); + orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.orderSolars); - doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars); + doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.orderSolars); - tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars); + tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.orderSolars); - fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars); + fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.fireSolars); - doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars); + doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.fireSolars); - tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars); + tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.fireSolars); - airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars); + airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.airSolars); - doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars); + doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.airSolars); - tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars); + tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.airSolars); - earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars); + earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.earthSolars); - doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars); + doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.earthSolars); - tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars); + tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.earthSolars); ItemStack itemStack = new ItemStack(ConfigItems.itemJarNode); ((ItemJarNode) itemStack.getItem()).setAspects(itemStack, new AspectList()); - portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BlockRegistry.portableNode), itemStack, CraftingAspects.portableNode); + portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BlockRegistry.portableNode), itemStack, EMTCraftingAspects.portableNode); - uuMCrystal = ThaumcraftApi.addCrucibleRecipe("UU-Matter Infusion", new ItemStack(ItemRegistry.itemEMTItems, 1, 15), Ic2Items.uuMatterCell.copy(), CraftingAspects.uuMatterCrystal); + uuMCrystal = ThaumcraftApi.addCrucibleRecipe("UU-Matter Infusion", new ItemStack(ItemRegistry.itemEMTItems, 1, 15), Ic2Items.uuMatterCell.copy(), EMTCraftingAspects.uuMatterCrystal); /** IC2 Stuff related recipes **/ @@ -357,7 +357,7 @@ public class RecipeRegistry { Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)); /* Ore Processing for Amber and Cinnabar */ - if (ConfigHandler.removeAmberAndCinnabarMacerating) { + if (EMTConfigHandler.removeAmberAndCinnabarMacerating) { for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext();) { IRecipeInput input = it.next(); if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { diff --git a/src/main/java/tombenpotter/emt/common/init/TileRegistry.java b/src/main/java/tombenpotter/emt/common/init/TileRegistry.java index 8b0e1ea..1b42df2 100644 --- a/src/main/java/tombenpotter/emt/common/init/TileRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/TileRegistry.java @@ -3,32 +3,32 @@ package tombenpotter.emt.common.init; import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; import tombenpotter.emt.common.tile.TileEntityPortableNode; -import tombenpotter.emt.common.tile.generators.TileEntityAerGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityArborGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityAuramGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityIgnisGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityPotentiaGenerator; -import tombenpotter.emt.common.tile.solars.air.TileEntityAirSolar; -import tombenpotter.emt.common.tile.solars.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.tile.solars.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.tile.solars.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.tile.solars.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.tile.solars.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.tile.solars.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.tile.solars.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.tile.solars.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.tile.solars.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.tile.solars.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.tile.solars.earth.TileEntityTripleEarthSolar; -import tombenpotter.emt.common.tile.solars.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.tile.solars.fire.TileEntityFireSolar; -import tombenpotter.emt.common.tile.solars.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.tile.solars.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.tile.solars.order.TileEntityOrderSolar; -import tombenpotter.emt.common.tile.solars.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.tile.solars.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.tile.solars.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.tile.solars.water.TileEntityWaterSolar; +import tombenpotter.emt.common.tile.generator.TileEntityAerGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityArborGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityAuramGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityIgnisGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityPotentiaGenerator; +import tombenpotter.emt.common.tile.solar.air.TileEntityAirSolar; +import tombenpotter.emt.common.tile.solar.air.TileEntityDoubleAirSolar; +import tombenpotter.emt.common.tile.solar.air.TileEntityTripleAirSolar; +import tombenpotter.emt.common.tile.solar.compressed.TileEntityCompressedSolar; +import tombenpotter.emt.common.tile.solar.compressed.TileEntityDoubleCompressedSolar; +import tombenpotter.emt.common.tile.solar.compressed.TileEntityTripleCompressedSolar; +import tombenpotter.emt.common.tile.solar.dark.TileEntityDarkSolar; +import tombenpotter.emt.common.tile.solar.dark.TileEntityDoubleDarkSolar; +import tombenpotter.emt.common.tile.solar.dark.TileEntityTripleDarkSolar; +import tombenpotter.emt.common.tile.solar.earth.TileEntityDoubleEarthSolar; +import tombenpotter.emt.common.tile.solar.earth.TileEntityEarthSolar; +import tombenpotter.emt.common.tile.solar.earth.TileEntityTripleEarthSolar; +import tombenpotter.emt.common.tile.solar.fire.TileEntityDoubleFireSolar; +import tombenpotter.emt.common.tile.solar.fire.TileEntityFireSolar; +import tombenpotter.emt.common.tile.solar.fire.TileEntityTripleFireSolar; +import tombenpotter.emt.common.tile.solar.order.TileEntityDoubleOrderSolar; +import tombenpotter.emt.common.tile.solar.order.TileEntityOrderSolar; +import tombenpotter.emt.common.tile.solar.order.TileEntityTripleOrderSolar; +import tombenpotter.emt.common.tile.solar.water.TileEntityDoubleWaterSolar; +import tombenpotter.emt.common.tile.solar.water.TileEntityTripleWaterSolar; +import tombenpotter.emt.common.tile.solar.water.TileEntityWaterSolar; import cpw.mods.fml.common.registry.GameRegistry; public class TileRegistry { diff --git a/src/main/java/tombenpotter/emt/common/items/ItemBase.java b/src/main/java/tombenpotter/emt/common/item/ItemBase.java similarity index 76% rename from src/main/java/tombenpotter/emt/common/items/ItemBase.java rename to src/main/java/tombenpotter/emt/common/item/ItemBase.java index 2903d0c..b7708d2 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemBase.java +++ b/src/main/java/tombenpotter/emt/common/item/ItemBase.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.items; +package tombenpotter.emt.common.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTTextHelper; public class ItemBase extends Item { @@ -24,6 +24,6 @@ public class ItemBase extends Item { public String getItemStackDisplayName(ItemStack stack) { - return (TextHelper.GREEN + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); + return (EMTTextHelper.GREEN + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); } } diff --git a/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java b/src/main/java/tombenpotter/emt/common/item/ItemElectricScribingTools.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java rename to src/main/java/tombenpotter/emt/common/item/ItemElectricScribingTools.java index 84bd6c5..4012e5e 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java +++ b/src/main/java/tombenpotter/emt/common/item/ItemElectricScribingTools.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items; +package tombenpotter.emt.common.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/items/ItemIC2Baubles.java b/src/main/java/tombenpotter/emt/common/item/ItemIC2Baubles.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/items/ItemIC2Baubles.java rename to src/main/java/tombenpotter/emt/common/item/ItemIC2Baubles.java index 0a7618e..4edd6db 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemIC2Baubles.java +++ b/src/main/java/tombenpotter/emt/common/item/ItemIC2Baubles.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items; +package tombenpotter.emt.common.item; import baubles.api.BaubleType; import baubles.api.IBauble; @@ -14,7 +14,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; import java.util.Random; @@ -86,7 +86,7 @@ public class ItemIC2Baubles extends ItemBase implements IBauble { if (stack != null) { if (stack.getItemDamage() == 0) { if (player instanceof EntityPlayer) { - int energyLeft = ConfigHandler.armorBaubleProduction; + int energyLeft = EMTConfigHandler.armorBaubleProduction; for (int i = 0; i < ((EntityPlayer) player).inventory.armorInventory.length; i++) { if (energyLeft > 0) { if ((((EntityPlayer) player).inventory.armorInventory[i] != null) && (((EntityPlayer) player).inventory.armorInventory[i].getItem() instanceof IElectricItem)) { @@ -101,7 +101,7 @@ public class ItemIC2Baubles extends ItemBase implements IBauble { if (stack != null) { if (stack.getItemDamage() == 1) { if (player instanceof EntityPlayer) { - int energyLeft = ConfigHandler.inventoryBaubleProdution; + int energyLeft = EMTConfigHandler.inventoryBaubleProdution; for (int i = 0; i < ((EntityPlayer) player).inventory.mainInventory.length; i++) { if (energyLeft > 0) { if ((((EntityPlayer) player).inventory.mainInventory[i] != null) && (((EntityPlayer) player).inventory.mainInventory[i].getItem() instanceof IElectricItem)) { diff --git a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java b/src/main/java/tombenpotter/emt/common/item/ItemMaterials.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/items/ItemMaterials.java rename to src/main/java/tombenpotter/emt/common/item/ItemMaterials.java index ba24d95..b84fb6c 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java +++ b/src/main/java/tombenpotter/emt/common/item/ItemMaterials.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items; +package tombenpotter.emt.common.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/items/ItemOneRing.java b/src/main/java/tombenpotter/emt/common/item/ItemOneRing.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/items/ItemOneRing.java rename to src/main/java/tombenpotter/emt/common/item/ItemOneRing.java index 13f34ca..1386d2a 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemOneRing.java +++ b/src/main/java/tombenpotter/emt/common/item/ItemOneRing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items; +package tombenpotter.emt.common.item; import baubles.api.BaubleType; import baubles.api.IBauble; @@ -17,7 +17,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; import java.util.Random; @@ -94,7 +94,7 @@ public class ItemOneRing extends ItemBase implements IBauble { if (!player.worldObj.isRemote) { if (corruption <= 0) { - ((EntityPlayer) player).addChatMessage(new ChatComponentText(TextHelper.PURPLE + "You have worn the Ring. Your soul has now been forever " + TextHelper.PURPLE + "tainted. " + TextHelper.RED + TextHelper.ITALIC + "Beware of wearing the ring. The tainting will only " + TextHelper.RED + TextHelper.ITALIC + "increase, and strange things will start happening.")); + ((EntityPlayer) player).addChatMessage(new ChatComponentText(EMTTextHelper.PURPLE + "You have worn the Ring. Your soul has now been forever " + EMTTextHelper.PURPLE + "tainted. " + EMTTextHelper.RED + EMTTextHelper.ITALIC + "Beware of wearing the ring. The tainting will only " + EMTTextHelper.RED + EMTTextHelper.ITALIC + "increase, and strange things will start happening.")); } else if (corruption > 6000 && corruption < 24000 && random.nextInt(2000) == 0) { player.addPotionEffect(new PotionEffect(Potion.blindness.id, 500, 2, false)); diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemElectricBootsTraveller.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/item/armor/boots/ItemElectricBootsTraveller.java index a44348f..a64f668 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemElectricBootsTraveller.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.boots; +package tombenpotter.emt.common.item.armor.boots; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; @@ -25,8 +25,8 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.common.Thaumcraft; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; @@ -104,7 +104,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add(TextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%"); + list.add(EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%"); } @Override @@ -168,7 +168,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return 0; } else { @@ -178,7 +178,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @Override public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return false; } else { diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemNanoBootsTraveller.java similarity index 80% rename from src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/item/armor/boots/ItemNanoBootsTraveller.java index a410f65..82bcc45 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemNanoBootsTraveller.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.boots; +package tombenpotter.emt.common.item.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -6,15 +6,15 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { public ItemNanoBootsTraveller(int par3, int par4) { super(par3, par4); maxCharge = 1000000; - speedBonus = (float) ConfigHandler.nanoBootsSpeed; - jumpBonus = (float) ConfigHandler.nanoBootsJump; + speedBonus = (float) EMTConfigHandler.nanoBootsSpeed; + jumpBonus = (float) EMTConfigHandler.nanoBootsJump; visDiscount = 4; transferLimit = 1000; energyPerDamage = 500; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemQuantumBootsTraveller.java similarity index 80% rename from src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/item/armor/boots/ItemQuantumBootsTraveller.java index 5c7a7e8..c269081 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemQuantumBootsTraveller.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.boots; +package tombenpotter.emt.common.item.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -6,15 +6,15 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { public ItemQuantumBootsTraveller(int par3, int par4) { super(par3, par4); maxCharge = 10000000; - speedBonus = (float) ConfigHandler.quantumBootsSpeed; - jumpBonus = (float) ConfigHandler.quantumBootsJump; + speedBonus = (float) EMTConfigHandler.quantumBootsSpeed; + jumpBonus = (float) EMTConfigHandler.quantumBootsJump; visDiscount = 5; transferLimit = 10000; energyPerDamage = 1000; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java b/src/main/java/tombenpotter/emt/common/item/armor/chestplate/ItemInfusedQuantumChestplate.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java rename to src/main/java/tombenpotter/emt/common/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 3b78226..7b1e03a 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.chestplates; +package tombenpotter.emt.common.item.armor.chestplate; import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -35,11 +35,11 @@ import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.model.ModelCpecialArmor; import tombenpotter.emt.client.model.ModelWings; import tombenpotter.emt.common.init.ItemRegistry; -import tombenpotter.emt.common.items.armor.wings.ItemNanoWing; -import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.RandomHelper; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.item.armor.wings.ItemNanoWing; +import tombenpotter.emt.common.item.armor.wings.ItemQuantumWing; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTRandomHelper; +import tombenpotter.emt.common.util.EMTTextHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; @@ -380,7 +380,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) + if (EMTConfigHandler.enchanting == false) return 0; else return 4; @@ -530,7 +530,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { player.motionY += -0.05; } - if (ConfigHandler.impactOfRain) { + if (EMTConfigHandler.impactOfRain) { if ((world.getBiomeGenForCoords((int) player.posX, (int) player.posZ)).canSpawnLightningBolt() && world.canBlockSeeTheSky((int) player.posX, (int) player.posY, (int) player.posZ) && world.isRaining() && !player.capabilities.isCreativeMode) { player.motionY += -0.05; } diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemElectricGoggles.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java rename to src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemElectricGoggles.java index 700d0e9..443e98d 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemElectricGoggles.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.goggles; +package tombenpotter.emt.common.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,8 +22,8 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; @@ -75,7 +75,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return 0; } else { @@ -85,7 +85,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi @Override public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return false; } else { @@ -139,7 +139,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add(TextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%"); + list.add(EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemNanoGoggles.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java rename to src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemNanoGoggles.java index 125a0c5..7349e78 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemNanoGoggles.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.goggles; +package tombenpotter.emt.common.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -13,7 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemNanoGoggles extends ItemElectricGoggles { @@ -42,7 +42,7 @@ public class ItemNanoGoggles extends ItemElectricGoggles { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { - if (ConfigHandler.nightVisionOff == false) { + if (EMTConfigHandler.nightVisionOff == false) { if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { int x = MathHelper.floor_double(player.posX); diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemQuantumGoggles.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java rename to src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemQuantumGoggles.java index ec43d53..f47f40e 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemQuantumGoggles.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.goggles; +package tombenpotter.emt.common.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -14,7 +14,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.HashMap; import java.util.Iterator; @@ -81,7 +81,7 @@ public class ItemQuantumGoggles extends ItemNanoGoggles { } while (true); - if (ConfigHandler.nightVisionOff == false) { + if (EMTConfigHandler.nightVisionOff == false) { if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { int x = MathHelper.floor_double(player.posX); int z = MathHelper.floor_double(player.posZ); diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemSolarHelmetRevealing.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java rename to src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemSolarHelmetRevealing.java index 19db09a..2b0de06 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.goggles; +package tombenpotter.emt.common.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,7 +15,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.HashMap; import java.util.Iterator; @@ -69,7 +69,7 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { @SuppressWarnings("unchecked") @Override public void onArmorTick(World worldObj, EntityPlayer player, ItemStack itemStack) { - if (ConfigHandler.nightVisionOff == false) { + if (EMTConfigHandler.nightVisionOff == false) { if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { int x = MathHelper.floor_double(player.posX); diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemFeatherWing.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java rename to src/main/java/tombenpotter/emt/common/item/armor/wings/ItemFeatherWing.java index 7edf9c3..fdf78f4 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemFeatherWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.wings; +package tombenpotter.emt.common.item.armor.wings; import java.util.Random; @@ -20,7 +20,7 @@ import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.model.ModelWings; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemFeatherWing extends ItemArmor { @@ -106,7 +106,7 @@ public class ItemFeatherWing extends ItemArmor { player.motionY += -0.03; } - if (ConfigHandler.impactOfRain) { + if (EMTConfigHandler.impactOfRain) { if ((world.getBiomeGenForCoords((int) player.posX, (int) player.posZ)).canSpawnLightningBolt() && world.canBlockSeeTheSky((int) player.posX, (int) player.posY, (int) player.posZ) && world.isRaining() && !player.capabilities.isCreativeMode) { player.motionY += -0.03; } diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemNanoWing.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java rename to src/main/java/tombenpotter/emt/common/item/armor/wings/ItemNanoWing.java index e4a834d..07c9fab 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemNanoWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.wings; +package tombenpotter.emt.common.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,8 +18,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.item.armor.wings.ItemThaumiumReinforcedWing; +import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; @@ -80,7 +80,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return 0; } else { @@ -90,7 +90,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return false; } else { diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemQuantumWing.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java rename to src/main/java/tombenpotter/emt/common/item/armor/wings/ItemQuantumWing.java index 5c7e19b..5e8ad85 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemQuantumWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.wings; +package tombenpotter.emt.common.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemQuantumWing extends ItemNanoWing { public static int maxCharge = 1000000; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemThaumiumReinforcedWing.java similarity index 87% rename from src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java rename to src/main/java/tombenpotter/emt/common/item/armor/wings/ItemThaumiumReinforcedWing.java index 18e3d43..24dcd87 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor.wings; +package tombenpotter.emt.common.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -14,8 +14,8 @@ import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTTextHelper; import ic2.core.IC2; import ic2.core.util.StackUtil; @@ -51,7 +51,7 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add(TextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%"); + list.add(EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTMachines.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java rename to src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTMachines.java index 7b4582a..56d4d73 100644 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTMachines.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.blocks; +package tombenpotter.emt.common.item.block; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars.java new file mode 100644 index 0000000..970ba85 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars.java @@ -0,0 +1,184 @@ +package tombenpotter.emt.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTTextHelper; + +import java.util.List; + +import static tombenpotter.emt.common.util.EMTTextHelper.localize; + +public class ItemBlockEMTSolars extends ItemBlock { + + public ItemBlockEMTSolars(Block id) { + super(id); + setHasSubtypes(true); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "compressed"; + break; + } + case 1: { + name = "doublecompressed"; + break; + } + case 2: { + name = "triplecompressed"; + break; + } + case 3: { + name = "water"; + break; + } + case 4: { + name = "doublewater"; + break; + } + case 5: { + name = "triplewater"; + break; + } + case 6: { + name = "dark"; + break; + } + case 7: { + name = "doubledark"; + break; + } + case 8: { + name = "tripledark"; + break; + } + case 9: { + name = "order"; + break; + } + case 10: { + name = "doubleorder"; + break; + } + case 11: { + name = "tripleorder"; + break; + } + case 12: { + name = "fire"; + break; + } + case 13: { + name = "doublefire"; + break; + } + case 14: { + name = "triplefire"; + break; + } + case 15: { + name = "air"; + break; + } + default: + name = "nothing"; + break; + } + return getUnlocalizedName() + "." + name; + } + + @Override + public int getMetadata(int par1) { + return par1; + } + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { + switch (itemstack.getItemDamage()) { + case 0: { + list.add(EMTConfigHandler.compressedSolarOutput + localize("tooltip.EMT.euPerTick")); + break; + } + case 1: { + list.add(EMTConfigHandler.doubleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); + break; + } + case 2: { + list.add(EMTConfigHandler.tripleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); + break; + } + case 3: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); + break; + } + case 4: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); + break; + } + case 5: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); + break; + } + case 6: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); + break; + } + case 7: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); + break; + } + case 8: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); + break; + } + case 9: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); + break; + } + case 10: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); + break; + } + + case 11: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); + break; + } + case 12: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); + break; + } + case 13: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); + break; + } + case 14: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.lava")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); + break; + } + case 15: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); + break; + } + default: { + list.add(localize("tooltip.EMT.forget")); + break; + } + } + } +} diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars2.java new file mode 100644 index 0000000..2513a4d --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEMTSolars2.java @@ -0,0 +1,91 @@ +package tombenpotter.emt.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTTextHelper; + +import java.util.List; + +import static tombenpotter.emt.common.util.EMTTextHelper.localize; + +public class ItemBlockEMTSolars2 extends ItemBlock { + + public ItemBlockEMTSolars2(Block id) { + super(id); + setHasSubtypes(true); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "doubleair"; + break; + } + case 1: { + name = "tripleair"; + break; + } + case 2: { + name = "earth"; + break; + } + case 3: { + name = "doubleearth"; + break; + } + case 4: { + name = "tripleearth"; + break; + } + default: + name = "nothing"; + break; + } + return getUnlocalizedName() + "." + name; + } + + @Override + public int getMetadata(int par1) { + return par1; + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { + switch (itemstack.getItemDamage()) { + case 0: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); + break; + } + case 1: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); + break; + } + case 2: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low")); + break; + } + case 3: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low")); + break; + } + case 4: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low")); + break; + } + default: { + list.add(localize("tooltip.EMT.forget")); + break; + } + } + } +} diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerator.java similarity index 87% rename from src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerator.java index f2da805..700f155 100644 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.blocks; +package tombenpotter.emt.common.item.block; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerators.java new file mode 100644 index 0000000..16a0709 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerators.java @@ -0,0 +1,53 @@ +package tombenpotter.emt.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +import java.util.List; + +import tombenpotter.emt.common.tile.generator.TileEntityAerGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityArborGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityAuramGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityIgnisGenerator; +import tombenpotter.emt.common.tile.generator.TileEntityPotentiaGenerator; +import tombenpotter.emt.common.util.EMTConfigHandler; + +public class ItemBlockEssentiaGenerators extends ItemBlock { + + public ItemBlockEssentiaGenerators(Block id) { + super(id); + setHasSubtypes(true); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: + name = "potentia"; + break; + case 1: + name = "ignis"; + break; + case 2: + name = "auram"; + break; + case 3: + name = "arbor"; + break; + case 4: + name = "aer"; + break; + default: + name = "nothing"; + } + return getUnlocalizedName() + "." + name; + } + + @Override + public int getMetadata(int meta) { + return meta; + } +} diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemBaseFocus.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java rename to src/main/java/tombenpotter/emt/common/item/focus/ItemBaseFocus.java index c7785c5..a080ab0 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemBaseFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.foci; +package tombenpotter.emt.common.item.focus; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemChargeFocus.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java rename to src/main/java/tombenpotter/emt/common/item/focus/ItemChargeFocus.java index 30da1c2..d365822 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemChargeFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.foci; +package tombenpotter.emt.common.item.focus; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -9,8 +9,8 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.items.foci.ItemBaseFocus; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.item.focus.ItemBaseFocus; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemChargeFocus extends ItemBaseFocus { @@ -41,7 +41,7 @@ public class ItemChargeFocus extends ItemBaseFocus { if (player.capabilities.isCreativeMode || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { if (!world.isRemote) { - int energyLeft = ConfigHandler.chargeFocusProduction; + int energyLeft = EMTConfigHandler.chargeFocusProduction; for (int i = 0; i < player.inventory.armorInventory.length; i++) { if (energyLeft > 0) { if ((player.inventory.armorInventory[i] != null) && (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) { diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemChristmasFocus.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java rename to src/main/java/tombenpotter/emt/common/item/focus/ItemChristmasFocus.java index 9f4e139..dc2db43 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemChristmasFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.foci; +package tombenpotter.emt.common.item.focus; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemExplosionFocus.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java rename to src/main/java/tombenpotter/emt/common/item/focus/ItemExplosionFocus.java index ed73891..eaa18cc 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemExplosionFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.foci; +package tombenpotter.emt.common.item.focus; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,7 +8,7 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.entities.EntityLaser; +import tombenpotter.emt.common.entity.EntityLaser; public class ItemExplosionFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java rename to src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java index a9371a1..a7f709f 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.foci; +package tombenpotter.emt.common.item.focus; import java.util.ArrayList; import java.util.LinkedList; @@ -16,7 +16,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.entities.EntityShield; +import tombenpotter.emt.common.entity.EntityShield; import tombenpotter.emt.common.init.BlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemWandChargingFocus.java similarity index 75% rename from src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java rename to src/main/java/tombenpotter/emt/common/item/focus/ItemWandChargingFocus.java index c790cbc..457d9af 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemWandChargingFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.foci; +package tombenpotter.emt.common.item.focus; import ic2.api.item.ElectricItem; import net.minecraft.entity.player.EntityPlayer; @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.items.foci.ItemBaseFocus; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.item.focus.ItemBaseFocus; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemWandChargingFocus extends ItemBaseFocus { @@ -45,7 +45,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus { ItemStack armor = player.inventory.armorInventory[1]; if (armor != null) { - if ((ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player) && (ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player)))) { + if ((ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)))) { wandItem.addVis(itemstack, Aspect.ORDER, 1, true); wandItem.addVis(itemstack, Aspect.FIRE, 1, true); wandItem.addVis(itemstack, Aspect.ENTROPY, 1, true); diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java b/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricHoeGrowth.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java rename to src/main/java/tombenpotter/emt/common/item/tool/ItemElectricHoeGrowth.java index 962d370..75e0dd6 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricHoeGrowth.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools; +package tombenpotter.emt.common.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java b/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricThorHammer.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java rename to src/main/java/tombenpotter/emt/common/item/tool/ItemElectricThorHammer.java index 945a36c..f389c9d 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricThorHammer.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools; +package tombenpotter.emt.common.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,9 +18,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.entities.EntityArcher; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.entity.EntityArcher; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; @@ -68,7 +68,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add(TextHelper.localize("tooltip.EMT.hammer.electric").replace("%player%", player.getCommandSenderName())); + list.add(EMTTextHelper.localize("tooltip.EMT.hammer.electric").replace("%player%", player.getCommandSenderName())); } @Override @@ -145,7 +145,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return 0; } else { return 4; @@ -154,7 +154,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { @Override public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return ConfigHandler.enchanting; + return EMTConfigHandler.enchanting; } /* IC2 API METHODS */ diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java b/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammer.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java rename to src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammer.java index bb29130..8cbd91f 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammer.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools; +package tombenpotter.emt.common.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +18,7 @@ import net.minecraft.world.World; import thaumcraft.api.IRepairable; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; @@ -90,6 +90,6 @@ public class ItemThorHammer extends ItemSword implements IRepairable { @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add(TextHelper.localize("tooltip.EMT.hammer.broken.The Hammer of Thor")); + list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.The Hammer of Thor")); } } diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java b/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammerBroken.java similarity index 85% rename from src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java rename to src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammerBroken.java index 619d4cb..fb655ad 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammerBroken.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools; +package tombenpotter.emt.common.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +17,7 @@ import thaumcraft.api.IRepairable; import thaumcraft.common.entities.projectile.EntityAlumentum; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.TextHelper; +import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; @@ -63,13 +63,13 @@ public class ItemThorHammerBroken extends ItemSword implements IRepairable { @Override public void addInformation(ItemStack stack, EntityPlayer entityPlayer, List list, boolean par4) { - list.add(TextHelper.localize("tooltip.EMT.hammer.broken.thor")); - list.add(TextHelper.localize("tooltip.EMT.hammer.broken.danger")); + list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.thor")); + list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.danger")); if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add(TextHelper.localize("tooltip.EMT.hammer.broken.plsNoRightClick")); + list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.plsNoRightClick")); } else { - list.add(TextHelper.localize("tooltip.EMT.hammer.broken.plsRightClick")); + list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.plsRightClick")); } } } diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemDiamondChainsaw.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java rename to src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemDiamondChainsaw.java index ef24572..6708043 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemDiamondChainsaw.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.chainsaws; +package tombenpotter.emt.common.item.tool.chainsaw; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; import java.util.Locale; @@ -169,7 +169,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return 0; } else { @@ -179,7 +179,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { @Override public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return ConfigHandler.enchanting; + return EMTConfigHandler.enchanting; } /* IC2 API METHODS */ diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java b/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemStreamChainsaw.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java rename to src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemStreamChainsaw.java index 2ff91f6..af604dc 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemStreamChainsaw.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.chainsaws; +package tombenpotter.emt.common.item.tool.chainsaw; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java b/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemThaumiumChainsaw.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java rename to src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemThaumiumChainsaw.java index 808d327..ad21021 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemThaumiumChainsaw.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.chainsaws; +package tombenpotter.emt.common.item.tool.chainsaw; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java b/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemRockbreakerDrill.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java rename to src/main/java/tombenpotter/emt/common/item/tool/drill/ItemRockbreakerDrill.java index 485b6df..4c2e409 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemRockbreakerDrill.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.drills; +package tombenpotter.emt.common.item.tool.drill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,7 +26,7 @@ import thaumcraft.common.entities.EntityFollowingItem; import thaumcraft.common.lib.utils.BlockUtils; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; import javax.swing.*; import java.util.ArrayList; @@ -47,7 +47,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { setCreativeTab(ElectroMagicTools.tabEMT); this.efficiencyOnProperMaterial = 25F; this.setMaxStackSize(1); - if (ConfigHandler.toolsInBore == false) { + if (EMTConfigHandler.toolsInBore == false) { this.setMaxDamage(27); } else { @@ -84,7 +84,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) { - if (ConfigHandler.toolsInBore == false) { + if (EMTConfigHandler.toolsInBore == false) { cost = 350; } else { diff --git a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java b/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemThaumiumDrill.java similarity index 89% rename from src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java rename to src/main/java/tombenpotter/emt/common/item/tool/drill/ItemThaumiumDrill.java index 1112b3b..ecc6f0a 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemThaumiumDrill.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.drills; +package tombenpotter.emt.common.item.tool.drill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.RandomHelper; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTRandomHelper; import java.util.List; @@ -33,7 +33,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { this.efficiencyOnProperMaterial = 20F; this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); - if (ConfigHandler.toolsInBore == false) { + if (EMTConfigHandler.toolsInBore == false) { this.setMaxDamage(27); } else { this.setMaxDamage(240); @@ -61,7 +61,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (ConfigHandler.toolsInBore == false) { + if (EMTConfigHandler.toolsInBore == false) { cost = 250; } else { cost = 1; @@ -95,7 +95,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + return EMTRandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); } @Override @@ -105,7 +105,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return 0; } else { return 4; @@ -114,7 +114,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { @Override public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return ConfigHandler.enchanting; + return EMTConfigHandler.enchanting; } /* IC2 API METHODS */ diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java b/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolDiamond.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java rename to src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolDiamond.java index c2bf526..a43e967 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolDiamond.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.omnitools; +package tombenpotter.emt.common.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -12,7 +12,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemOmnitoolDiamond extends ItemOmnitoolIron { @@ -21,7 +21,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron { this.efficiencyOnProperMaterial = 16F; this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); - if (!ConfigHandler.toolsInBore) { + if (!EMTConfigHandler.toolsInBore) { this.setMaxDamage(27); } else { @@ -39,7 +39,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron { @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (!ConfigHandler.toolsInBore) { + if (!EMTConfigHandler.toolsInBore) { cost = 200; } else { diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java b/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolIron.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java rename to src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolIron.java index d64c0c3..a204367 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolIron.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.omnitools; +package tombenpotter.emt.common.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,7 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; import java.util.Locale; @@ -35,7 +35,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { this.efficiencyOnProperMaterial = 13F; this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); - if (!ConfigHandler.toolsInBore) { + if (!EMTConfigHandler.toolsInBore) { this.setMaxDamage(27); } else { @@ -66,7 +66,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (!ConfigHandler.toolsInBore) { + if (!EMTConfigHandler.toolsInBore) { cost = 100; } else { @@ -140,7 +140,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { @Override public int getItemEnchantability() { - if (!ConfigHandler.enchanting) { + if (!EMTConfigHandler.enchanting) { return 0; } else { @@ -150,7 +150,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { @Override public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return ConfigHandler.enchanting; + return EMTConfigHandler.enchanting; } /* IC2 API METHODS */ diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java b/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolThaumium.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java rename to src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolThaumium.java index 28efdfc..2bff697 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java +++ b/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolThaumium.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.tools.omnitools; +package tombenpotter.emt.common.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -12,7 +12,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { @@ -21,7 +21,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { this.efficiencyOnProperMaterial = 21F; this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); - if (!ConfigHandler.toolsInBore) { + if (!EMTConfigHandler.toolsInBore) { this.setMaxDamage(27); } else { @@ -39,7 +39,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (!ConfigHandler.toolsInBore) { + if (!EMTConfigHandler.toolsInBore) { cost = 300; } else { diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java deleted file mode 100644 index e76301e..0000000 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java +++ /dev/null @@ -1,184 +0,0 @@ -package tombenpotter.emt.common.items.blocks; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.TextHelper; - -import java.util.List; - -import static tombenpotter.emt.common.util.TextHelper.localize; - -public class ItemBlockEMTSolars extends ItemBlock { - - public ItemBlockEMTSolars(Block id) { - super(id); - setHasSubtypes(true); - } - - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "compressed"; - break; - } - case 1: { - name = "doublecompressed"; - break; - } - case 2: { - name = "triplecompressed"; - break; - } - case 3: { - name = "water"; - break; - } - case 4: { - name = "doublewater"; - break; - } - case 5: { - name = "triplewater"; - break; - } - case 6: { - name = "dark"; - break; - } - case 7: { - name = "doubledark"; - break; - } - case 8: { - name = "tripledark"; - break; - } - case 9: { - name = "order"; - break; - } - case 10: { - name = "doubleorder"; - break; - } - case 11: { - name = "tripleorder"; - break; - } - case 12: { - name = "fire"; - break; - } - case 13: { - name = "doublefire"; - break; - } - case 14: { - name = "triplefire"; - break; - } - case 15: { - name = "air"; - break; - } - default: - name = "nothing"; - break; - } - return getUnlocalizedName() + "." + name; - } - - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { - switch (itemstack.getItemDamage()) { - case 0: { - list.add(ConfigHandler.compressedSolarOutput + localize("tooltip.EMT.euPerTick")); - break; - } - case 1: { - list.add(ConfigHandler.doubleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); - break; - } - case 2: { - list.add(ConfigHandler.tripleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); - break; - } - case 3: { - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); - break; - } - case 4: { - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); - break; - } - case 5: { - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); - break; - } - case 6: { - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); - break; - } - case 7: { - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); - break; - } - case 8: { - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); - break; - } - case 9: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); - break; - } - case 10: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); - break; - } - - case 11: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); - break; - } - case 12: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); - break; - } - case 13: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); - break; - } - case 14: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.lava")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); - break; - } - case 15: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); - break; - } - default: { - list.add(localize("tooltip.EMT.forget")); - break; - } - } - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java deleted file mode 100644 index e3ed2c9..0000000 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java +++ /dev/null @@ -1,91 +0,0 @@ -package tombenpotter.emt.common.items.blocks; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.TextHelper; - -import java.util.List; - -import static tombenpotter.emt.common.util.TextHelper.localize; - -public class ItemBlockEMTSolars2 extends ItemBlock { - - public ItemBlockEMTSolars2(Block id) { - super(id); - setHasSubtypes(true); - } - - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "doubleair"; - break; - } - case 1: { - name = "tripleair"; - break; - } - case 2: { - name = "earth"; - break; - } - case 3: { - name = "doubleearth"; - break; - } - case 4: { - name = "tripleearth"; - break; - } - default: - name = "nothing"; - break; - } - return getUnlocalizedName() + "." + name; - } - - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { - switch (itemstack.getItemDamage()) { - case 0: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); - break; - } - case 1: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); - break; - } - case 2: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low")); - break; - } - case 3: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low")); - break; - } - case 4: { - list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low")); - break; - } - default: { - list.add(localize("tooltip.EMT.forget")); - break; - } - } - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java deleted file mode 100644 index 3416d07..0000000 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java +++ /dev/null @@ -1,74 +0,0 @@ -package tombenpotter.emt.common.items.blocks; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; - -import java.util.List; - -import tombenpotter.emt.common.tile.generators.TileEntityAerGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityArborGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityAuramGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityIgnisGenerator; -import tombenpotter.emt.common.tile.generators.TileEntityPotentiaGenerator; -import tombenpotter.emt.common.util.ConfigHandler; - -public class ItemBlockEssentiaGenerators extends ItemBlock { - - public ItemBlockEssentiaGenerators(Block id) { - super(id); - setHasSubtypes(true); - } - - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: - name = "potentia"; - break; - case 1: - name = "ignis"; - break; - case 2: - name = "auram"; - break; - case 3: - name = "arbor"; - break; - case 4: - name = "aer"; - break; - default: - name = "nothing"; - } - return getUnlocalizedName() + "." + name; - } - - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - switch (stack.getItemDamage()) { - case 0: - list.add(ConfigHandler.potentiaGenerator + " EU/t"); - break; - case 1: - list.add(ConfigHandler.ignisGenerator + " EU/t"); - break; - case 2: - list.add(ConfigHandler.auramGenerator + " EU/t"); - break; - case 3: - list.add(ConfigHandler.arborGenerator + " EU/t"); - break; - case 4: - list.add(ConfigHandler.aerGenerator + " EU/t"); - break; - } - } - - @Override - public int getMetadata(int meta) { - return meta; - } -} diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java index 836a775..adb5fd5 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java @@ -15,7 +15,7 @@ import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.TileEntityEMT; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable { @@ -24,7 +24,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided private static final int[] slots_sides = new int[] { 1 }; private ItemStack[] slots = new ItemStack[3]; - public int maceratingSpeed = ConfigHandler.etherealProcessorBaseSpeed; + public int maceratingSpeed = EMTConfigHandler.etherealProcessorBaseSpeed; public int cookTime; public int getSizeInventory() { @@ -180,7 +180,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided public void addBonus() { if (this.canSmelt()) { - if (this.worldObj.rand.nextInt(ConfigHandler.etherealProcessorBonus) == 0) { + if (this.worldObj.rand.nextInt(EMTConfigHandler.etherealProcessorBonus) == 0) { if (this.slots[1] == null) { this.setInventorySlotContents(1, new ItemStack(ConfigItems.itemNugget, 1, 6)); } diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java index 7b2fb56..7d24a04 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagList; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.common.tile.TileEntityEMT; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory { @@ -76,7 +76,7 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I ItemStack wand = getStackInSlot(0); if (wand != null && wand.getItem() instanceof ItemWandCasting) { ItemWandCasting wandItem = (ItemWandCasting) wand.getItem(); - if (ic2EnergySink.useEnergy(ConfigHandler.wandChargerConsumption) && wandItem.getAspectsWithRoom(wand) != null) { + if (ic2EnergySink.useEnergy(EMTConfigHandler.wandChargerConsumption) && wandItem.getAspectsWithRoom(wand) != null) { wandItem.addVis(wand, Aspect.ORDER, 1, true); wandItem.addVis(wand, Aspect.FIRE, 1, true); wandItem.addVis(wand, Aspect.ENTROPY, 1, true); diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAerGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAerGenerator.java new file mode 100644 index 0000000..93c79a9 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAerGenerator.java @@ -0,0 +1,13 @@ +package tombenpotter.emt.common.tile.generator; + +import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTEssentiasOutputs; + +public class TileEntityAerGenerator extends TileEntityBaseGenerator { + + public TileEntityAerGenerator() { + aspect = Aspect.AIR; + output = EMTEssentiasOutputs.outputs.get(aspect.getTag()); + } +} \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityArborGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityArborGenerator.java new file mode 100644 index 0000000..e72cf4a --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityArborGenerator.java @@ -0,0 +1,13 @@ +package tombenpotter.emt.common.tile.generator; + +import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTEssentiasOutputs; + +public class TileEntityArborGenerator extends TileEntityBaseGenerator { + + public TileEntityArborGenerator() { + aspect = Aspect.TREE; + output = EMTEssentiasOutputs.outputs.get(aspect.getTag()); + } +} diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAuramGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAuramGenerator.java new file mode 100644 index 0000000..5f2e15f --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAuramGenerator.java @@ -0,0 +1,13 @@ +package tombenpotter.emt.common.tile.generator; + +import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTEssentiasOutputs; + +public class TileEntityAuramGenerator extends TileEntityBaseGenerator { + + public TileEntityAuramGenerator() { + aspect = Aspect.AURA; + output = EMTEssentiasOutputs.outputs.get(aspect.getTag()); + } +} diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityBaseGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityBaseGenerator.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/tile/generators/TileEntityBaseGenerator.java rename to src/main/java/tombenpotter/emt/common/tile/generator/TileEntityBaseGenerator.java index a60bf6e..cf05250 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityBaseGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityBaseGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.tile.generators; +package tombenpotter.emt.common.tile.generator; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; @@ -6,17 +6,17 @@ import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; import tombenpotter.emt.common.tile.TileEntityEMT; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public abstract class TileEntityBaseGenerator extends TileEntityEMT { public BasicSource energySource = new BasicSource(this, 1000000000, 3); public Aspect aspect; - public int output; + public double output; public int tick = 0; public TileEntityBaseGenerator() { - output = 20; + output = 2000; } @Override @@ -33,7 +33,7 @@ public abstract class TileEntityBaseGenerator extends TileEntityEMT { public void createEnergy() { if (!this.worldObj.isRemote && EssentiaHandler.drainEssentia(this, aspect, ForgeDirection.UNKNOWN, 8)) { - energySource.addEnergy(output * 20); + energySource.addEnergy(output / 20D); } } @@ -59,8 +59,4 @@ public abstract class TileEntityBaseGenerator extends TileEntityEMT { super.writeToNBT(tag); energySource.writeToNBT(tag); } - - public int getOutput() { - return output; - } } diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityIgnisGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityIgnisGenerator.java new file mode 100644 index 0000000..03fbda7 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityIgnisGenerator.java @@ -0,0 +1,13 @@ +package tombenpotter.emt.common.tile.generator; + +import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTEssentiasOutputs; + +public class TileEntityIgnisGenerator extends TileEntityBaseGenerator { + + public TileEntityIgnisGenerator() { + aspect = Aspect.FIRE; + output = EMTEssentiasOutputs.outputs.get(aspect.getTag()); + } +} diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityPotentiaGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityPotentiaGenerator.java new file mode 100644 index 0000000..9b1d474 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityPotentiaGenerator.java @@ -0,0 +1,14 @@ +package tombenpotter.emt.common.tile.generator; + +import ic2.api.energy.prefab.BasicSource; +import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EMTConfigHandler; +import tombenpotter.emt.common.util.EMTEssentiasOutputs; + +public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator { + + public TileEntityPotentiaGenerator() { + aspect = Aspect.ENERGY; + output = EMTEssentiasOutputs.outputs.get(aspect.getTag()); + } +} diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAerGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAerGenerator.java deleted file mode 100644 index 7b2f15f..0000000 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAerGenerator.java +++ /dev/null @@ -1,14 +0,0 @@ -package tombenpotter.emt.common.tile.generators; - -import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.EssentiasOutputs; - -public class TileEntityAerGenerator extends TileEntityBaseGenerator { - - public TileEntityAerGenerator() { - aspect = Aspect.AIR; - EssentiasOutputs.outputs.get(aspect.getTag()); - output = ConfigHandler.aerGenerator; - } -} diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java deleted file mode 100644 index 18c8794..0000000 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java +++ /dev/null @@ -1,14 +0,0 @@ -package tombenpotter.emt.common.tile.generators; - -import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.EssentiasOutputs; - -public class TileEntityArborGenerator extends TileEntityBaseGenerator { - - public TileEntityArborGenerator() { - aspect = Aspect.TREE; - EssentiasOutputs.outputs.get(aspect.getTag()); - output = ConfigHandler.arborGenerator; - } -} diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java deleted file mode 100644 index 63ae4b8..0000000 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java +++ /dev/null @@ -1,14 +0,0 @@ -package tombenpotter.emt.common.tile.generators; - -import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.EssentiasOutputs; - -public class TileEntityAuramGenerator extends TileEntityBaseGenerator { - - public TileEntityAuramGenerator() { - aspect = Aspect.AURA; - EssentiasOutputs.outputs.get(aspect.getTag()); - output = ConfigHandler.auramGenerator; - } -} diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java deleted file mode 100644 index 3963baf..0000000 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java +++ /dev/null @@ -1,14 +0,0 @@ -package tombenpotter.emt.common.tile.generators; - -import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.EssentiasOutputs; - -public class TileEntityIgnisGenerator extends TileEntityBaseGenerator { - - public TileEntityIgnisGenerator() { - aspect = Aspect.FIRE; - EssentiasOutputs.outputs.get(aspect.getTag()); - output = ConfigHandler.ignisGenerator; - } -} diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java deleted file mode 100644 index bb32c21..0000000 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java +++ /dev/null @@ -1,15 +0,0 @@ -package tombenpotter.emt.common.tile.generators; - -import ic2.api.energy.prefab.BasicSource; -import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.EssentiasOutputs; - -public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator { - - public TileEntityPotentiaGenerator() { - aspect = Aspect.ENERGY; - EssentiasOutputs.outputs.get(aspect.getTag()); - output = ConfigHandler.potentiaGenerator; - } -} diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java b/src/main/java/tombenpotter/emt/common/tile/solar/TileEntitySolarBase.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java rename to src/main/java/tombenpotter/emt/common/tile/solar/TileEntitySolarBase.java index 045987c..7e96937 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/TileEntitySolarBase.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.tile.solars; +package tombenpotter.emt.common.tile.solar; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityAirSolar.java similarity index 74% rename from src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityAirSolar.java index f97b7a4..0b0195b 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityAirSolar.java @@ -1,16 +1,16 @@ -package tombenpotter.emt.common.tile.solars.air; +package tombenpotter.emt.common.tile.solar.air; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityAirSolar extends TileEntitySolarBase { public TileEntityAirSolar() { - output = ConfigHandler.compressedSolarOutput; + output = EMTConfigHandler.compressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityDoubleAirSolar.java similarity index 72% rename from src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityDoubleAirSolar.java index 4fc175c..94d30e6 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityDoubleAirSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.air; +package tombenpotter.emt.common.tile.solar.air; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleAirSolar extends TileEntityAirSolar { public TileEntityDoubleAirSolar() { - output = ConfigHandler.doubleCompressedSolarOutput; + output = EMTConfigHandler.doubleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityTripleAirSolar.java similarity index 72% rename from src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityTripleAirSolar.java index 59379aa..a4f8c22 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityTripleAirSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.air; +package tombenpotter.emt.common.tile.solar.air; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleAirSolar extends TileEntityAirSolar { public TileEntityTripleAirSolar() { - output = ConfigHandler.tripleCompressedSolarOutput; + output = EMTConfigHandler.tripleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityCompressedSolar.java similarity index 63% rename from src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityCompressedSolar.java index f66403a..9889f41 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityCompressedSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.compressed; +package tombenpotter.emt.common.tile.solar.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityCompressedSolar extends TileEntitySolarBase { public TileEntityCompressedSolar() { - output = ConfigHandler.compressedSolarOutput; + output = EMTConfigHandler.compressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityDoubleCompressedSolar.java similarity index 63% rename from src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityDoubleCompressedSolar.java index e76bdc2..514ce5c 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityDoubleCompressedSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.compressed; +package tombenpotter.emt.common.tile.solar.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase { public TileEntityDoubleCompressedSolar() { - output = ConfigHandler.doubleCompressedSolarOutput; + output = EMTConfigHandler.doubleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityTripleCompressedSolar.java similarity index 63% rename from src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityTripleCompressedSolar.java index bbeba00..64c95be 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityTripleCompressedSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.compressed; +package tombenpotter.emt.common.tile.solar.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleCompressedSolar extends TileEntitySolarBase { public TileEntityTripleCompressedSolar() { - output = ConfigHandler.tripleCompressedSolarOutput; + output = EMTConfigHandler.tripleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDarkSolar.java similarity index 73% rename from src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDarkSolar.java index 4b17e30..a6475b8 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDarkSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.dark; +package tombenpotter.emt.common.tile.solar.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDarkSolar extends TileEntitySolarBase { public TileEntityDarkSolar() { - output = ConfigHandler.compressedSolarOutput; + output = EMTConfigHandler.compressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDoubleDarkSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDoubleDarkSolar.java index 429b455..b8ad565 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDoubleDarkSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.dark; +package tombenpotter.emt.common.tile.solar.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { public TileEntityDoubleDarkSolar() { - output = ConfigHandler.doubleCompressedSolarOutput; + output = EMTConfigHandler.doubleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityTripleDarkSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityTripleDarkSolar.java index a7d6593..24253e7 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityTripleDarkSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.dark; +package tombenpotter.emt.common.tile.solar.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { public TileEntityTripleDarkSolar() { - output = ConfigHandler.tripleCompressedSolarOutput; + output = EMTConfigHandler.tripleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityDoubleEarthSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityDoubleEarthSolar.java index 10760be..b754360 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityDoubleEarthSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.earth; +package tombenpotter.emt.common.tile.solar.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { public TileEntityDoubleEarthSolar() { - output = ConfigHandler.doubleCompressedSolarOutput; + output = EMTConfigHandler.doubleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityEarthSolar.java similarity index 72% rename from src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityEarthSolar.java index 0a719c5..efcd518 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityEarthSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.earth; +package tombenpotter.emt.common.tile.solar.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityEarthSolar extends TileEntitySolarBase { public TileEntityEarthSolar() { - output = ConfigHandler.compressedSolarOutput; + output = EMTConfigHandler.compressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityTripleEarthSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityTripleEarthSolar.java index a9fc780..32e90d9 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityTripleEarthSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.earth; +package tombenpotter.emt.common.tile.solar.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { public TileEntityTripleEarthSolar() { - output = ConfigHandler.tripleCompressedSolarOutput; + output = EMTConfigHandler.tripleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityDoubleFireSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityDoubleFireSolar.java index 138a28a..3762246 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityDoubleFireSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.fire; +package tombenpotter.emt.common.tile.solar.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleFireSolar extends TileEntityFireSolar { public TileEntityDoubleFireSolar() { - output = ConfigHandler.doubleCompressedSolarOutput; + output = EMTConfigHandler.doubleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityFireSolar.java similarity index 77% rename from src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityFireSolar.java index b2fbe19..2596c1e 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityFireSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.fire; +package tombenpotter.emt.common.tile.solar.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityFireSolar extends TileEntitySolarBase { public TileEntityFireSolar() { - output = ConfigHandler.compressedSolarOutput; + output = EMTConfigHandler.compressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityTripleFireSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityTripleFireSolar.java index a69dd82..77b1d84 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityTripleFireSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.fire; +package tombenpotter.emt.common.tile.solar.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleFireSolar extends TileEntityFireSolar { public TileEntityTripleFireSolar() { - output = ConfigHandler.tripleCompressedSolarOutput; + output = EMTConfigHandler.tripleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityDoubleOrderSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityDoubleOrderSolar.java index 6c46eb8..5c3baf8 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityDoubleOrderSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.order; +package tombenpotter.emt.common.tile.solar.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { public TileEntityDoubleOrderSolar() { - output = ConfigHandler.doubleCompressedSolarOutput; + output = EMTConfigHandler.doubleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityOrderSolar.java similarity index 69% rename from src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityOrderSolar.java index 78c5c98..1d3dc26 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityOrderSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.order; +package tombenpotter.emt.common.tile.solar.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityOrderSolar extends TileEntitySolarBase { public TileEntityOrderSolar() { - output = ConfigHandler.compressedSolarOutput; + output = EMTConfigHandler.compressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityTripleOrderSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityTripleOrderSolar.java index 6e57a37..1f09750 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityTripleOrderSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.order; +package tombenpotter.emt.common.tile.solar.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { public TileEntityTripleOrderSolar() { - output = ConfigHandler.tripleCompressedSolarOutput; + output = EMTConfigHandler.tripleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityDoubleWaterSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityDoubleWaterSolar.java index 9f542f0..3b23f63 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityDoubleWaterSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.water; +package tombenpotter.emt.common.tile.solar.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { public TileEntityDoubleWaterSolar() { - output = ConfigHandler.doubleCompressedSolarOutput; + output = EMTConfigHandler.doubleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityTripleWaterSolar.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityTripleWaterSolar.java index d79c76f..583cb88 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityTripleWaterSolar.java @@ -1,14 +1,14 @@ -package tombenpotter.emt.common.tile.solars.water; +package tombenpotter.emt.common.tile.solar.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { public TileEntityTripleWaterSolar() { - output = ConfigHandler.tripleCompressedSolarOutput; + output = EMTConfigHandler.tripleCompressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityWaterSolar.java similarity index 74% rename from src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java rename to src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityWaterSolar.java index cce3329..68e44d3 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityWaterSolar.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.common.tile.solars.water; +package tombenpotter.emt.common.tile.solar.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityWaterSolar extends TileEntitySolarBase { public TileEntityWaterSolar() { - output = ConfigHandler.compressedSolarOutput; + output = EMTConfigHandler.compressedSolarOutput; } @Override diff --git a/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java b/src/main/java/tombenpotter/emt/common/util/EMTConfigHandler.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/util/ConfigHandler.java rename to src/main/java/tombenpotter/emt/common/util/EMTConfigHandler.java index 59da976..ed92227 100644 --- a/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTConfigHandler.java @@ -4,7 +4,7 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; -public class ConfigHandler { +public class EMTConfigHandler { public static Configuration config; @@ -21,12 +21,6 @@ public class ConfigHandler { public static int inventoryBaubleProdution; public static int wandChargeFocusCost; - public static int aerGenerator; - public static int arborGenerator; - public static int auramGenerator; - public static int ignisGenerator; - public static int potentiaGenerator; - // values public static double wandChargerConsumption; public static double compressedSolarOutput; @@ -36,15 +30,15 @@ public class ConfigHandler { public static double nanoBootsJump; public static double quantumBootsJump; public static double tripleCompressedSolarOutput; - - // essentias - public static double fireOutput; - public static double waterOutput; - public static double airOutput; - public static double earthOutput; - public static double orderOutput; - public static double entropyOutput; - public static double outputCap; + + // essentias + public static double fireOutput; + public static double waterOutput; + public static double airOutput; + public static double earthOutput; + public static double orderOutput; + public static double entropyOutput; + public static double outputCap; // random stuff public static boolean impactOfRain; @@ -132,16 +126,15 @@ public class ConfigHandler { chanceOneRing = config.get(RANDOM, "One Ring spawning chance", 15, "If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt(); removeAmberAndCinnabarMacerating = config.get(RANDOM, "Clear Amber/Cinnabar Macerating", true, "This is here because of conflicts between mods that add the same input and different outputs").getBoolean(removeAmberAndCinnabarMacerating); impactOfRain = config.get(RANDOM, "Impact of rain", true, "The impact of rain on all wings").getBoolean(impactOfRain); - - // DEFAULTS - Aer - 15,000 Aqua - 5,000 Ignis - 20,000 Ordo - 16,000 - // Perditio - 10,000 Terra - 2,000 - airOutput = config.get(OUTPUTS, "Aer Output", 15000).getDouble(airOutput); - waterOutput = config.get(OUTPUTS, "Aqua Output", 5000).getDouble(waterOutput); - fireOutput = config.get(OUTPUTS, "Ignis Output", 20000).getDouble(fireOutput); - orderOutput = config.get(OUTPUTS, "Ordo Output", 16000).getDouble(orderOutput); - entropyOutput = config.get(OUTPUTS, "Perditio Output", 10000).getDouble(entropyOutput); - earthOutput = config.get(OUTPUTS, "Terra Output", 2000).getDouble(earthOutput); - outputCap = config.get(OUTPUTS, "Output Cap", -1).getDouble(outputCap); + + // DEFAULTS - Aer - 15,000 Aqua - 5,000 Ignis - 20,000 Ordo - 16,000 Perditio - 10,000 Terra - 2,000 + airOutput = config.get(OUTPUTS, "Aer Output", 15000).getDouble(airOutput); + waterOutput = config.get(OUTPUTS, "Aqua Output", 5000).getDouble(waterOutput); + fireOutput = config.get(OUTPUTS, "Ignis Output", 20000).getDouble(fireOutput); + orderOutput = config.get(OUTPUTS, "Ordo Output", 16000).getDouble(orderOutput); + entropyOutput = config.get(OUTPUTS, "Perditio Output", 10000).getDouble(entropyOutput); + earthOutput = config.get(OUTPUTS, "Terra Output", 2000).getDouble(earthOutput); + outputCap = config.get(OUTPUTS, "Output Cap", -1).getDouble(outputCap); wandChargerConsumption = config.get(VALUES, "Wand Charging Station Consumption", 50000, "This is the number you have to modify if you want to make the Industrial Wand Charging " + "Station use more or less EU to charge 1 unit of Vis on your wand.").getDouble(wandChargerConsumption); compressedSolarOutput = config.get(VALUES, "Compressed Solar Panel Output", 10, "This is the number you have to modify if you want to make the Compressed Solar Panel yield " + "more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(compressedSolarOutput); @@ -158,12 +151,6 @@ public class ConfigHandler { inventoryBaubleProdution = config.get(VALUES, "Inventory Charging Ring production", 32, "Default is 32").getInt(); wandChargeFocusCost = config.get(VALUES, "Wand Focus: Wand Charging Cost", 40000, "Default is 40000").getInt(); - aerGenerator = config.get(VALUES, "Aer generator", 300, "EU/t").getInt(); - auramGenerator = config.get(VALUES, "Auram generator", 400, "EU/t").getInt(); - arborGenerator = config.get(VALUES, "Arbor generator", 450, "EU/t").getInt(); - ignisGenerator = config.get(VALUES, "Ignis generator", 400, "EU/t").getInt(); - potentiaGenerator = config.get(VALUES, "Potentia generator", 200, "EU/t").getInt(); - thaumiumDrillResearch = config.get(RESEARCH, "Thaumium Drill", false).getBoolean(thaumiumDrillResearch); thaumiumChainsawResearch = config.get(RESEARCH, "Thaumium Chainsaw", false).getBoolean(thaumiumChainsawResearch); thaumiumDrillResearch = config.get(RESEARCH, "Thaumium Omnitool", false).getBoolean(thaumiumOmnitoolResearch); diff --git a/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java b/src/main/java/tombenpotter/emt/common/util/EMTCraftingAspects.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/util/CraftingAspects.java rename to src/main/java/tombenpotter/emt/common/util/EMTCraftingAspects.java index 64c9842..d3b7645 100644 --- a/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTCraftingAspects.java @@ -3,7 +3,7 @@ package tombenpotter.emt.common.util; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -public class CraftingAspects { +public class EMTCraftingAspects { public static AspectList thaumiumDrillCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.MINE, 16).add(Aspect.ENERGY, 16); public static AspectList thaumiumChainsawCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.WEAPON, 16).add(Aspect.ENERGY, 16); diff --git a/src/main/java/tombenpotter/emt/common/util/CreativeTab.java b/src/main/java/tombenpotter/emt/common/util/EMTCreativeTab.java similarity index 85% rename from src/main/java/tombenpotter/emt/common/util/CreativeTab.java rename to src/main/java/tombenpotter/emt/common/util/EMTCreativeTab.java index 329387e..3d962c5 100644 --- a/src/main/java/tombenpotter/emt/common/util/CreativeTab.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTCreativeTab.java @@ -5,9 +5,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class CreativeTab extends CreativeTabs { +public class EMTCreativeTab extends CreativeTabs { - public CreativeTab(String tabLabel) { + public EMTCreativeTab(String tabLabel) { super(tabLabel); setBackgroundImageName("emt.png"); } diff --git a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java b/src/main/java/tombenpotter/emt/common/util/EMTDungeonChestGenerator.java similarity index 70% rename from src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java rename to src/main/java/tombenpotter/emt/common/util/EMTDungeonChestGenerator.java index 220f131..c9e15b8 100644 --- a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTDungeonChestGenerator.java @@ -5,14 +5,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; -public class DungeonChestGenerator { +public class EMTDungeonChestGenerator { public static void generateLoot() { - if (!ConfigHandler.thorHammerResearch) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.taintedThorHammer), 0, 1, ConfigHandler.chanceTaintedMjolnir)); + if (!EMTConfigHandler.thorHammerResearch) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.taintedThorHammer), 0, 1, EMTConfigHandler.chanceTaintedMjolnir)); } - if (!ConfigHandler.oneRingSpawn) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.onering), 0, 1, ConfigHandler.chanceOneRing)); + if (!EMTConfigHandler.oneRingSpawn) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.onering), 0, 1, EMTConfigHandler.chanceOneRing)); } } } diff --git a/src/main/java/tombenpotter/emt/common/util/EMTEssentiasOutputs.java b/src/main/java/tombenpotter/emt/common/util/EMTEssentiasOutputs.java new file mode 100644 index 0000000..eefa51f --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/util/EMTEssentiasOutputs.java @@ -0,0 +1,41 @@ +package tombenpotter.emt.common.util; + +import thaumcraft.api.aspects.Aspect; + +import java.util.Collection; +import java.util.HashMap; + +public class EMTEssentiasOutputs { + + public static HashMap outputs = new HashMap(); + + public static void addOutput(Aspect aspect) { + if (!aspect.isPrimal()) { + Aspect[] parents = aspect.getComponents(); + if (EMTConfigHandler.outputCap == (-1)) { + outputs.put(aspect.getTag(), (outputs.get(parents[0].getTag()) + outputs.get(parents[1].getTag()))); + } else { + double originalOutput = (outputs.get(parents[0].getTag()) + outputs.get(parents[1].getTag())); + if (originalOutput > EMTConfigHandler.outputCap) + outputs.put(aspect.getTag(), EMTConfigHandler.outputCap); + } + } + } + + public static void addOutputs() { + Collection aspectCollection = Aspect.aspects.values(); + for (Aspect aspect : aspectCollection) { + if (!aspect.isPrimal()) + addOutput(aspect); + } + } + + public static void addPrimalOutputs() { + outputs.put(Aspect.FIRE.getTag(), EMTConfigHandler.fireOutput); + outputs.put(Aspect.WATER.getTag(), EMTConfigHandler.waterOutput); + outputs.put(Aspect.ORDER.getTag(), EMTConfigHandler.orderOutput); + outputs.put(Aspect.ENTROPY.getTag(), EMTConfigHandler.entropyOutput); + outputs.put(Aspect.EARTH.getTag(), EMTConfigHandler.earthOutput); + outputs.put(Aspect.AIR.getTag(), EMTConfigHandler.airOutput); + } +} diff --git a/src/main/java/tombenpotter/emt/common/util/EMTEventHandler.java b/src/main/java/tombenpotter/emt/common/util/EMTEventHandler.java index fdcb436..8fa6f38 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTEventHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTEventHandler.java @@ -18,7 +18,7 @@ import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.common.init.ItemRegistry; import tombenpotter.emt.common.network.PacketEMTKeys; -import tombenpotter.emt.proxies.ClientProxy; +import tombenpotter.emt.proxy.ClientProxy; public class EMTEventHandler { Random rnd = new Random(); @@ -39,7 +39,7 @@ public class EMTEventHandler { @SubscribeEvent public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { if (event.modID.equals(ModInformation.modid)) { - ConfigHandler.syncConfig(); + EMTConfigHandler.syncConfig(); ElectroMagicTools.logger.info("Refreshing configuration file."); } } diff --git a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java b/src/main/java/tombenpotter/emt/common/util/EMTRandomHelper.java similarity index 87% rename from src/main/java/tombenpotter/emt/common/util/RandomHelper.java rename to src/main/java/tombenpotter/emt/common/util/EMTRandomHelper.java index 22d5f1a..ed1e0ab 100644 --- a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTRandomHelper.java @@ -14,16 +14,7 @@ import net.minecraftforge.event.ForgeEventFactory; import java.util.Locale; -public class RandomHelper { - - public static boolean isRKMPressed(World world) { - if (FMLCommonHandler.instance().getSide().isClient()) { - return Minecraft.getMinecraft().gameSettings.keyBindUseItem.getIsKeyPressed(); - } - - else - return true; - } +public class EMTRandomHelper { public static boolean placeTorch(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { for (int i = 0; i < player.inventory.mainInventory.length; i++) { diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java index bcf05c3..e15af8b 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java @@ -12,9 +12,9 @@ import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.init.ItemRegistry; import tombenpotter.emt.common.init.RecipeRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; import tombenpotter.emt.common.util.EMTResearchItem; -import tombenpotter.emt.common.util.ResearchAspects; +import tombenpotter.emt.common.util.EMTResearchAspects; public class EMTResearch { public static void register() { @@ -46,250 +46,250 @@ public class EMTResearch { new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(ItemRegistry.featherWing)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(RecipeRegistry.cardboard), new ResearchPage(RecipeRegistry.featherWing), new ResearchPage(RecipeRegistry.featherWings)); /** Research that can be disabled **/ - if (!ConfigHandler.thaumiumDrillResearch) { - new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumDrill)); + if (!EMTConfigHandler.thaumiumDrillResearch) { + new EMTResearchItem("Thaumium Drill", "EMT", EMTResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumDrill)); } - if (!ConfigHandler.thaumiumChainsawResearch) { - new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); + if (!EMTConfigHandler.thaumiumChainsawResearch) { + new EMTResearchItem("Thaumium Chainsaw", "EMT", EMTResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); } - if (!ConfigHandler.electricGooglesResearch) { - new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricGoggles)); + if (!EMTConfigHandler.electricGooglesResearch) { + new EMTResearchItem("Electric Goggles", "EMT", EMTResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricGoggles)); } - if (!ConfigHandler.electricGooglesResearch) { - if (!ConfigHandler.nanoGooglesResearch) { + if (!EMTConfigHandler.electricGooglesResearch) { + if (!EMTConfigHandler.nanoGooglesResearch) { ; - new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); + new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", EMTResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); } } - if (!ConfigHandler.electricGooglesResearch) { - if (!ConfigHandler.nanoGooglesResearch) { - if (!ConfigHandler.quantumGooglesResearch) { - new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); + if (!EMTConfigHandler.electricGooglesResearch) { + if (!EMTConfigHandler.nanoGooglesResearch) { + if (!EMTConfigHandler.quantumGooglesResearch) { + new EMTResearchItem("Quantum Goggles of Revealing", "EMT", EMTResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); } } } - if (!ConfigHandler.ironOmnitoolResearch) { + if (!EMTConfigHandler.ironOmnitoolResearch) { new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.ironOmnitool)); } - if (!ConfigHandler.ironOmnitoolResearch) { - if (!ConfigHandler.diamondOmnitoolResearch) { - new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Iron Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); + if (!EMTConfigHandler.ironOmnitoolResearch) { + if (!EMTConfigHandler.diamondOmnitoolResearch) { + new EMTResearchItem("Diamond Omnitool", "EMT", EMTResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Iron Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); } } - if (!ConfigHandler.thaumiumDrillResearch && !ConfigHandler.thaumiumChainsawResearch) { - if (!ConfigHandler.thaumiumOmnitoolResearch) { - new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumOmnitool), + if (!EMTConfigHandler.thaumiumDrillResearch && !EMTConfigHandler.thaumiumChainsawResearch) { + if (!EMTConfigHandler.thaumiumOmnitoolResearch) { + new EMTResearchItem("Thaumium Omnitool", "EMT", EMTResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumOmnitool), new ResearchPage(RecipeRegistry.diamondOmnitoolToThaumium)); } } - if (!ConfigHandler.explosionFocusResearch) { - new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.explosionFocus)); + if (!EMTConfigHandler.explosionFocusResearch) { + new EMTResearchItem("Explosion Focus", "EMT", EMTResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.explosionFocus)); } - if (!ConfigHandler.christmasFocusResearch) { - new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.christmasFocus)); + if (!EMTConfigHandler.christmasFocusResearch) { + new EMTResearchItem("Kris-tmas Focus", "EMT", EMTResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.christmasFocus)); } - if (!ConfigHandler.shieldFocusResearch) { - new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldFocus)); + if (!EMTConfigHandler.shieldFocusResearch) { + new EMTResearchItem("Shield Focus", "EMT", EMTResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldFocus)); } - if (!ConfigHandler.shieldFocusResearch) { - if (!ConfigHandler.shieldBlockResearch) { - new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldBlock)); + if (!EMTConfigHandler.shieldFocusResearch) { + if (!EMTConfigHandler.shieldBlockResearch) { + new EMTResearchItem("Shield Block", "EMT", EMTResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldBlock)); } } - if (!ConfigHandler.potentiaGeneratorResearch) { - new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.potentiaGenerator)); + if (!EMTConfigHandler.potentiaGeneratorResearch) { + new EMTResearchItem("Potentia Generator", "EMT", EMTResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.potentiaGenerator)); } - if (!ConfigHandler.potentiaGeneratorResearch) { - if (!ConfigHandler.ignisGeneratorResearch) { - new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.ignisGenerator)); + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.ignisGeneratorResearch) { + new EMTResearchItem("Ignis Generator", "EMT", EMTResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.ignisGenerator)); } } - if (!ConfigHandler.potentiaGeneratorResearch) { - if (!ConfigHandler.auramGeneratorResearch) { - new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.auramGenerator)); + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.auramGeneratorResearch) { + new EMTResearchItem("Auram Generator", "EMT", EMTResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.auramGenerator)); } } - if (!ConfigHandler.potentiaGeneratorResearch) { - if (!ConfigHandler.arborGeneratorResearch) { - new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.arborGenerator)); + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.arborGeneratorResearch) { + new EMTResearchItem("Arbor Generator", "EMT", EMTResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.arborGenerator)); } } - if (!ConfigHandler.potentiaGeneratorResearch) { - if (!ConfigHandler.aerGeneratorResearch) { - new EMTResearchItem("Aer Generator", "EMT", ResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.aerGenerator)); + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.aerGeneratorResearch) { + new EMTResearchItem("Aer Generator", "EMT", EMTResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.aerGenerator)); } } - if (!ConfigHandler.potentiaGeneratorResearch) { - if (!ConfigHandler.wandChargingSationResearch) { - new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandRecharger)); + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.wandChargingSationResearch) { + new EMTResearchItem("Industrial Wand Charging Station", "EMT", EMTResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandRecharger)); } } - if (!ConfigHandler.thaumiumChainsawResearch) { - if (!ConfigHandler.streamChainsawResearch) { - new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.streamChainsaw)); + if (!EMTConfigHandler.thaumiumChainsawResearch) { + if (!EMTConfigHandler.streamChainsawResearch) { + new EMTResearchItem("Chainsaw of the Stream", "EMT", EMTResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.streamChainsaw)); } } - if (!ConfigHandler.thaumiumDrillResearch) { - if (!ConfigHandler.rockbreakerDrillResearch) { - new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.rockbreakerDrill)); + if (!EMTConfigHandler.thaumiumDrillResearch) { + if (!EMTConfigHandler.rockbreakerDrillResearch) { + new EMTResearchItem("Drill of the Rockbreaker", "EMT", EMTResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.rockbreakerDrill)); } } - if (!ConfigHandler.tinyUraniumResearch) { - new EMTResearchItem("Tiny Uranium", "EMT", ResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.tinyUranium)); + if (!EMTConfigHandler.tinyUraniumResearch) { + new EMTResearchItem("Tiny Uranium", "EMT", EMTResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.tinyUranium)); } - if (!ConfigHandler.thorHammerResearch) { - new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thorHammer)); + if (!EMTConfigHandler.thorHammerResearch) { + new EMTResearchItem("Mjolnir", "EMT", EMTResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thorHammer)); } - if (!ConfigHandler.thorHammerResearch) { - if (!ConfigHandler.superchargedThorHammerResearch) { - new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.superchargedThorHammer)); + if (!EMTConfigHandler.thorHammerResearch) { + if (!EMTConfigHandler.superchargedThorHammerResearch) { + new EMTResearchItem("Supercharged Mjolnir", "EMT", EMTResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.superchargedThorHammer)); } } - if (!ConfigHandler.compressedSolarsResearch) { - new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), + if (!EMTConfigHandler.compressedSolarsResearch) { + new EMTResearchItem("Compressed Solars", "EMT", EMTResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), new ResearchPage(RecipeRegistry.tripleCompressedSolar)); } - if (!ConfigHandler.compressedSolarsResearch) { - if (!ConfigHandler.solarHelmetResearch) { - new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.solarHelmetResearch) { + new EMTResearchItem("Solar Helmet of Revealing", "EMT", EMTResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); } } - if (!ConfigHandler.electricBootsResearch) { - new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricBootsTravel)); + if (!EMTConfigHandler.electricBootsResearch) { + new EMTResearchItem("Electric Boots of the Traveller", "EMT", EMTResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricBootsTravel)); } - if (!ConfigHandler.electricBootsResearch) { - if (!ConfigHandler.nanoBootsResearch) { - new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoBootsTravel)); + if (!EMTConfigHandler.electricBootsResearch) { + if (!EMTConfigHandler.nanoBootsResearch) { + new EMTResearchItem("Nano Boots of the Traveller", "EMT", EMTResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoBootsTravel)); } } - if (!ConfigHandler.electricBootsResearch) { - if (!ConfigHandler.nanoBootsResearch) { - if (!ConfigHandler.quantumBootsResearch) { - new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumBootsTravel)); + if (!EMTConfigHandler.electricBootsResearch) { + if (!EMTConfigHandler.nanoBootsResearch) { + if (!EMTConfigHandler.quantumBootsResearch) { + new EMTResearchItem("Quantum Boots of the Traveller", "EMT", EMTResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumBootsTravel)); } } } - if (!ConfigHandler.electricScribingToolsResearch) { - new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricScribingTools)); + if (!EMTConfigHandler.electricScribingToolsResearch) { + new EMTResearchItem("Electric Scribing Tools", "EMT", EMTResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricScribingTools)); } - if (!ConfigHandler.etherealProcessorResearch) { - new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.etheralProcessor)); + if (!EMTConfigHandler.etherealProcessorResearch) { + new EMTResearchItem("Etheral Processor", "EMT", EMTResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.etheralProcessor)); } - if (!ConfigHandler.compressedSolarsResearch) { - if (!ConfigHandler.waterSolarsResearch) { - new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.waterSolarsResearch) { + new EMTResearchItem("Water Infused Solar Panels", "EMT", EMTResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), new ResearchPage(RecipeRegistry.tripleWaterSolar)); } } - if (!ConfigHandler.compressedSolarsResearch) { - if (!ConfigHandler.darkSolarsResearch) { - new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.darkSolarsResearch) { + new EMTResearchItem("Entropy Infused Solar Panels", "EMT", EMTResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), new ResearchPage(RecipeRegistry.tripleDarkSolar)); } } - if (!ConfigHandler.compressedSolarsResearch) { - if (!ConfigHandler.orderSolarsResearch) { - new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.orderSolarsResearch) { + new EMTResearchItem("Order Infused Solar Panels", "EMT", EMTResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), new ResearchPage(RecipeRegistry.tripleOrderSolar)); } } - if (!ConfigHandler.compressedSolarsResearch) { - if (!ConfigHandler.fireSolarsResearch) { - new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.fireSolarsResearch) { + new EMTResearchItem("Fire Infused Solar Panels", "EMT", EMTResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), new ResearchPage(RecipeRegistry.tripleFireSolar)); } } - if (!ConfigHandler.compressedSolarsResearch) { - if (!ConfigHandler.airSolarsResearch) { - new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.airSolarsResearch) { + new EMTResearchItem("Air Infused Solar Panels", "EMT", EMTResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); } } - if (!ConfigHandler.compressedSolarsResearch) { - if (!ConfigHandler.earthSolarsResearch) { - new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.earthSolarsResearch) { + new EMTResearchItem("Earth Infused Solar Panels", "EMT", EMTResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), new ResearchPage(RecipeRegistry.tripleEarthSolar)); } } - if (!ConfigHandler.uuMInfusionResearch) { - new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.uuMCrystal), new ResearchPage(RecipeRegistry.charcoalToCoal), + if (!EMTConfigHandler.uuMInfusionResearch) { + new EMTResearchItem("UU-Matter Infusion", "EMT", EMTResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.uuMCrystal), new ResearchPage(RecipeRegistry.charcoalToCoal), new ResearchPage(RecipeRegistry.glowstoneDustToBlock), new ResearchPage(RecipeRegistry.stoneBricksToIronOre), new ResearchPage(RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(RecipeRegistry.amberBlockToLeadOre), new ResearchPage(RecipeRegistry.amberBricksToUraniumOre), new ResearchPage(RecipeRegistry.shardToResin), new ResearchPage(RecipeRegistry.shardToRedstone), new ResearchPage(RecipeRegistry.shardToLapis), new ResearchPage(RecipeRegistry.ironToGold), new ResearchPage(RecipeRegistry.goldToDiamond), new ResearchPage(RecipeRegistry.diamondToUranium), new ResearchPage(RecipeRegistry.uraniumToIridium)); } - if (!ConfigHandler.portableNodeResarch) { - new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.portableNode)); + if (!EMTConfigHandler.portableNodeResarch) { + new EMTResearchItem("Portable Node", "EMT", EMTResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.portableNode)); } - if (!ConfigHandler.electricHoeGrowthResearch) { - new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricHoeGrowth)); + if (!EMTConfigHandler.electricHoeGrowthResearch) { + new EMTResearchItem("Electric Hoe of Growth", "EMT", EMTResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricHoeGrowth)); } - if (!ConfigHandler.chargeFocusResearch) { - new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.chargeFocus)); + if (!EMTConfigHandler.chargeFocusResearch) { + new EMTResearchItem("Wand Focus: Charging", "EMT", EMTResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.chargeFocus)); } - if (!ConfigHandler.wandChargeFocusResearch) { - new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandChargeFocus)); + if (!EMTConfigHandler.wandChargeFocusResearch) { + new EMTResearchItem("Wand Focus: Wand Charging", "EMT", EMTResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandChargeFocus)); } - if (!ConfigHandler.inventoryChargingRing) { - new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.inventoryChargingRing)); + if (!EMTConfigHandler.inventoryChargingRing) { + new EMTResearchItem("Inventory Charging Ring", "EMT", EMTResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.inventoryChargingRing)); } - if (!ConfigHandler.armorChargingRing) { - new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.armorChargingRing)); + if (!EMTConfigHandler.armorChargingRing) { + new EMTResearchItem("Armor Charging Ring", "EMT", EMTResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.armorChargingRing)); } - if (!ConfigHandler.thaumiumWingResearch) { - new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); + if (!EMTConfigHandler.thaumiumWingResearch) { + new EMTResearchItem("Thaumium Reinforced Wings", "EMT", EMTResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); } - if (!ConfigHandler.nanoWingResearch && !ConfigHandler.thaumiumWingResearch) { - new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoWings)); + if (!EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.thaumiumWingResearch) { + new EMTResearchItem("Nanosuit Wings", "EMT", EMTResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoWings)); } - if (!ConfigHandler.quantumWingsResearch && !ConfigHandler.thaumiumWingResearch && !ConfigHandler.nanoWingResearch) { - new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumWings)); + if (!EMTConfigHandler.quantumWingsResearch && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch) { + new EMTResearchItem("Quantum Wings", "EMT", EMTResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumWings)); } - if (!ConfigHandler.infusedQuantumChestplate && !ConfigHandler.thaumiumWingResearch && !ConfigHandler.nanoWingResearch && !ConfigHandler.quantumWingsResearch) { - new EMTResearchItem("Infused Quantum Armor", "EMT", ResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); + if (!EMTConfigHandler.infusedQuantumChestplate && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.quantumWingsResearch) { + new EMTResearchItem("Infused Quantum Armor", "EMT", EMTResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); } } } diff --git a/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java b/src/main/java/tombenpotter/emt/common/util/EMTResearchAspects.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/util/ResearchAspects.java rename to src/main/java/tombenpotter/emt/common/util/EMTResearchAspects.java index 2f95ec8..bc3a890 100644 --- a/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearchAspects.java @@ -3,7 +3,7 @@ package tombenpotter.emt.common.util; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -public class ResearchAspects { +public class EMTResearchAspects { public static AspectList thaumiumDrillResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6).add(Aspect.MINE, 4); public static AspectList thaumiumChainsawResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.WEAPON, 6).add(Aspect.TOOL, 4); diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java index 3cd78a6..3152a06 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java @@ -26,13 +26,13 @@ public class EMTResearchItem extends ResearchItem { @Override @SideOnly(Side.CLIENT) public String getName() { - return TextHelper.localize("emt.rsname." + key); + return EMTTextHelper.localize("emt.rsname." + key); } @Override @SideOnly(Side.CLIENT) public String getText() { - return "[EMT] " + TextHelper.localize("emt.tag." + key); + return "[EMT] " + EMTTextHelper.localize("emt.tag." + key); } @Override diff --git a/src/main/java/tombenpotter/emt/common/util/TextHelper.java b/src/main/java/tombenpotter/emt/common/util/EMTTextHelper.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/util/TextHelper.java rename to src/main/java/tombenpotter/emt/common/util/EMTTextHelper.java index c0a3c7e..f36fce1 100644 --- a/src/main/java/tombenpotter/emt/common/util/TextHelper.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTTextHelper.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.util; import net.minecraft.util.StatCollector; -public class TextHelper { +public class EMTTextHelper { /** * Color Coding * diff --git a/src/main/java/tombenpotter/emt/common/util/EssentiasOutputs.java b/src/main/java/tombenpotter/emt/common/util/EssentiasOutputs.java deleted file mode 100644 index f916dd1..0000000 --- a/src/main/java/tombenpotter/emt/common/util/EssentiasOutputs.java +++ /dev/null @@ -1,42 +0,0 @@ -package tombenpotter.emt.common.util; - -import thaumcraft.api.aspects.Aspect; - -import java.util.Collection; -import java.util.HashMap; - -public class EssentiasOutputs { - - public static HashMap outputs = new HashMap(); - - public static void addOutput(Aspect aspect) { - if (!aspect.isPrimal()) { - Aspect[] parents = aspect.getComponents(); - if (ConfigHandler.outputCap == (-1)) { - outputs.put(aspect.getTag(), (outputs.get(parents[0].getTag()) + outputs.get(parents[1].getTag()))); - } - else { - double originalOutput = (outputs.get(parents[0].getTag()) + outputs.get(parents[1].getTag())); - if (originalOutput > ConfigHandler.outputCap) - outputs.put(aspect.getTag(), ConfigHandler.outputCap); - } - } - } - - public static void addOutputs() { - Collection aspectCollection = Aspect.aspects.values(); - for (Aspect aspect : aspectCollection) { - if (!aspect.isPrimal()) - addOutput(aspect); - } - } - - public static void addPrimalOutputs() { - outputs.put(Aspect.FIRE.getTag(), ConfigHandler.fireOutput); - outputs.put(Aspect.WATER.getTag(), ConfigHandler.waterOutput); - outputs.put(Aspect.ORDER.getTag(), ConfigHandler.orderOutput); - outputs.put(Aspect.ENTROPY.getTag(), ConfigHandler.entropyOutput); - outputs.put(Aspect.EARTH.getTag(), ConfigHandler.earthOutput); - outputs.put(Aspect.AIR.getTag(), ConfigHandler.airOutput); - } -} diff --git a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java b/src/main/java/tombenpotter/emt/proxy/ClientProxy.java similarity index 81% rename from src/main/java/tombenpotter/emt/proxies/ClientProxy.java rename to src/main/java/tombenpotter/emt/proxy/ClientProxy.java index 5b89636..20c6aa6 100644 --- a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java +++ b/src/main/java/tombenpotter/emt/proxy/ClientProxy.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.proxies; +package tombenpotter.emt.proxy; import org.lwjgl.input.Keyboard; @@ -9,9 +9,9 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.client.renderer.RenderLaser; import tombenpotter.emt.client.renderer.RenderShield; -import tombenpotter.emt.common.entities.EntityArcher; -import tombenpotter.emt.common.entities.EntityLaser; -import tombenpotter.emt.common.entities.EntityShield; +import tombenpotter.emt.common.entity.EntityArcher; +import tombenpotter.emt.common.entity.EntityLaser; +import tombenpotter.emt.common.entity.EntityShield; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java b/src/main/java/tombenpotter/emt/proxy/CommonProxy.java similarity index 98% rename from src/main/java/tombenpotter/emt/proxies/CommonProxy.java rename to src/main/java/tombenpotter/emt/proxy/CommonProxy.java index 1babf6d..f289e39 100644 --- a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java +++ b/src/main/java/tombenpotter/emt/proxy/CommonProxy.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.proxies; +package tombenpotter.emt.proxy; import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer;