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/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..0878fb4 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java @@ -7,60 +7,51 @@ 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 { 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..77bc3b1 --- /dev/null +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java @@ -0,0 +1,102 @@ +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.entity.EntityLaser; + +public class RenderShield extends Render { + private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/shield.png"); + + private static final float[] values = new float[6912]; + + static{ + float sin1; + float cos1; + + float sin2; + float cos2; + + float hsin1 = 0; + float hcos1 = 1; + + float hsin2; + float hcos2; + + int i = 0; + + 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) { + sin2 = MathHelper.sin((float) Math.toRadians(angle + 15)); + cos2 = MathHelper.cos((float) Math.toRadians(angle + 15)); + + 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; + } + + 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); + GL11.glPopMatrix(); + } + + @Override + protected ResourceLocation getEntityTexture(Entity texture) { + return shieldTexture; + } + +} 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 1036473..1b5ceff 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 ic2.api.item.IC2Items; 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 c27c159..fc22391 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/entity/EntityShield.java b/src/main/java/tombenpotter/emt/common/entity/EntityShield.java new file mode 100644 index 0000000..305fe36 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/entity/EntityShield.java @@ -0,0 +1,127 @@ +package tombenpotter.emt.common.entity; + +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(); + } + } + } + + @SideOnly(Side.CLIENT) + public int getBrightnessForRender(float p_70070_1_){ + return 240; + } + + 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/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java index 2204094..e169f8a 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 9be62d9..e1bb1d9 100644 --- a/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java @@ -5,8 +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.entity.EntityArcher; +import tombenpotter.emt.common.entity.EntityLaser; +import tombenpotter.emt.common.entity.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/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 756b469..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; @@ -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/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 95% 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 6959411..f4da14d 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; @@ -26,8 +26,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; @@ -106,7 +106,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 @@ -175,7 +175,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (EMTConfigHandler.enchanting == false) { return 0; } else { @@ -185,7 +185,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 92% 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 a94d1c8..490c3e8 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemChargeFocus.java @@ -1,9 +1,8 @@ -package tombenpotter.emt.common.items.foci; +package tombenpotter.emt.common.item.focus; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; -import java.util.LinkedHashMap; import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +13,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemChargeFocus extends ItemBaseFocus { @@ -62,7 +61,7 @@ public class ItemChargeFocus extends ItemBaseFocus { if (player.capabilities.isCreativeMode || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { if (!world.isRemote) { - int energyLeft = (int)(ConfigHandler.chargeFocusProduction * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); + int energyLeft = (int)(EMTConfigHandler.chargeFocusProduction * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); 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 95% 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 4cab707..d5aa1a7 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; @@ -10,7 +10,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; 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/item/focus/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java new file mode 100644 index 0000000..a7f709f --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java @@ -0,0 +1,72 @@ +package tombenpotter.emt.common.item.focus; + +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; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.items.wands.ItemWandCasting; +import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.common.entity.EntityShield; +import tombenpotter.emt.common.init.BlockRegistry; + +public class ItemShieldFocus extends ItemBaseFocus { + 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"); + } + + @Override + public int getFocusColor(ItemStack stack) { + return 0x1E90FF; + } + + @Override + public AspectList getVisCost(ItemStack stack) { + return visCost; + } + + @Override + public String getSortingHelper(ItemStack itemstack) { + return "SHIELD"; + } + + @Override + public boolean isUseItem(ItemStack stack) { + return true; + } + + @Override + public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) { + ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); + 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 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/common/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/item/focus/ItemWandChargingFocus.java similarity index 83% 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 f9a7e57..080c795 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 java.util.Map.Entry; @@ -9,8 +9,8 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; 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 { @@ -65,7 +65,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)))) { int amount = (int)(100 * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); wandItem.addRealVis(itemstack, Aspect.ORDER, amount, true); wandItem.addRealVis(itemstack, Aspect.FIRE, amount, 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/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java deleted file mode 100644 index dd0b5e3..0000000 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java +++ /dev/null @@ -1,125 +0,0 @@ -package tombenpotter.emt.common.items.foci; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ElectroMagicTools; -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); - - public ItemShieldFocus() { - super(".focus.shield", "focus_shield"); - } - - @Override - public int getFocusColor(ItemStack stack) { - return 0x1E90FF; - } - - @Override - public AspectList getVisCost(ItemStack stack) { - return visCost; - } - - @Override - public String getSortingHelper(ItemStack itemstack) { - return "SHIELD"; - } - - @Override - public boolean isUseItem(ItemStack stack) { - return true; - } - - @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; - } - } - - @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); - } - } -} 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 f8c0894..953332f 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java @@ -10,7 +10,7 @@ import net.minecraft.nbt.NBTTagList; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory, IWrenchable { @@ -77,7 +77,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 67% rename from src/main/java/tombenpotter/emt/proxies/ClientProxy.java rename to src/main/java/tombenpotter/emt/proxy/ClientProxy.java index e2b299d..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; @@ -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.common.entities.EntityArcher; -import tombenpotter.emt.common.entities.EntityLaser; +import tombenpotter.emt.client.renderer.RenderShield; +import tombenpotter.emt.common.entity.EntityArcher; +import tombenpotter.emt.common.entity.EntityLaser; +import tombenpotter.emt.common.entity.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/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; diff --git a/src/main/resources/assets/electromagictools/textures/blocks/shield.png b/src/main/resources/assets/electromagictools/textures/blocks/shield.png index eee7131..54056a2 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/shield.png and b/src/main/resources/assets/electromagictools/textures/blocks/shield.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png index 15a9035..02a5d25 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png differ 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 0000000..68c7fe5 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png index bd4b554..587eff5 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png differ 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 0000000..5f56441 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png index e860147..551d78a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png index 06ce193..73b28fd 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png index ec7191a..dcd24e1 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png differ 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 1ded25e..d3527e3 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png differ 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 0000000..f9515c6 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png differ 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 0000000..39b5f9b Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png differ 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 0000000..192696c Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png index e30fe95..200165f 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png differ 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 0000000..2002bd2 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/models/shield.png differ