diff --git a/src/main/java/emt/ElectroMagicTools.java b/src/main/java/emt/ElectroMagicTools.java index 84b686e..5f79f58 100644 --- a/src/main/java/emt/ElectroMagicTools.java +++ b/src/main/java/emt/ElectroMagicTools.java @@ -14,9 +14,9 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; import emt.command.CommandOutputs; -import emt.init.EntityRegistry; +import emt.init.EMTEntities; import emt.init.Registry; -import emt.init.Researches; +import emt.init.EMTResearches; import emt.network.PacketEMTKeys; import emt.proxy.CommonProxy; import emt.util.*; @@ -48,38 +48,38 @@ public class ElectroMagicTools { @EventHandler public void preInit(FMLPreInitializationEvent event) { - ElectroMagicTools.logger.info("Starting planning the world domination"); + logger.info("Starting planning the world domination"); EMTConfigHandler.init(event.getSuggestedConfigurationFile()); FMLCommonHandler.instance().bus().register(new EMTEventHandler()); Registry.register(); EMTEssentiasOutputs.addPrimalOutputs(); EMTEssentiasOutputs.addOutputs(); registerPackets(); - ElectroMagicTools.logger.info("Planning complete"); + logger.info("Planning complete"); } @EventHandler public void load(FMLInitializationEvent event) { - ElectroMagicTools.logger.info("Gathering allies"); - ElectroMagicTools.logger.info("Loading the proxies"); + logger.info("Gathering allies"); + logger.info("Loading the proxies"); proxy.load(); - ElectroMagicTools.logger.info("Making mobs drop additional items"); + logger.info("Making mobs drop additional items"); MinecraftForge.EVENT_BUS.register(new EMTEventHandler()); - ElectroMagicTools.logger.info("Adding dungeon loot"); + logger.info("Adding dungeon loot"); EMTDungeonChestGenerator.generateLoot(); - ElectroMagicTools.logger.info("Registering entities"); - EntityRegistry.registerEMTEntities(); - ElectroMagicTools.logger.info("Registering the GUI Handler"); + logger.info("Registering entities"); + EMTEntities.registerEMTEntities(); + logger.info("Registering the GUI Handler"); NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy); - ElectroMagicTools.logger.info("Allies gathered."); + logger.info("Allies gathered."); } @EventHandler public void postInit(FMLPostInitializationEvent event) { - ElectroMagicTools.logger.info("Starting the world takeover"); + logger.info("Starting the world takeover"); Registry.registerLate(); - Researches.register(); - ElectroMagicTools.logger.info("World takeover complete. Enjoy!"); + EMTResearches.register(); + logger.info("World takeover complete. Enjoy!"); } @EventHandler diff --git a/src/main/java/emt/ModInformation.java b/src/main/java/emt/ModInformation.java index 2d64472..3f6e198 100644 --- a/src/main/java/emt/ModInformation.java +++ b/src/main/java/emt/ModInformation.java @@ -4,7 +4,7 @@ public class ModInformation { public static final String name = "Electro-Magic Tools"; public static final String modid = "EMT"; public static final String version = "1.2.6"; - public static final String texturePath = "electromagictools"; + public static final String texturePath = "emt"; public static final String guiFactory = "emt.client.gui.config.EMTGuiFactory"; public static final String clientProxy = "emt.proxy.ClientProxy"; public static final String commonProxy = "emt.proxy.CommonProxy"; diff --git a/src/main/java/emt/client/renderer/RenderShield.java b/src/main/java/emt/client/renderer/RenderShield.java index c138c2a..b921a42 100644 --- a/src/main/java/emt/client/renderer/RenderShield.java +++ b/src/main/java/emt/client/renderer/RenderShield.java @@ -16,57 +16,56 @@ import net.minecraft.util.ResourceLocation; 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{ + + 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 * 2; - values[i + 1] = hsin1 * 2; - values[i + 2] = cos1 * hcos1 * 2; - - values[i + 3] = sin1 * hcos2 * 2; - values[i + 4] = hsin2 * 2; - values[i + 5] = cos1 * hcos2 * 2; - - values[i + 6] = sin2 * hcos2 * 2; - values[i + 7] = hsin2 * 2; - values[i + 8] = cos2 * hcos2 * 2; - - values[i + 9] = sin2 * hcos1 * 2; + + values[i] = sin1 * hcos1 * 2; + values[i + 1] = hsin1 * 2; + values[i + 2] = cos1 * hcos1 * 2; + + values[i + 3] = sin1 * hcos2 * 2; + values[i + 4] = hsin2 * 2; + values[i + 5] = cos1 * hcos2 * 2; + + values[i + 6] = sin2 * hcos2 * 2; + values[i + 7] = hsin2 * 2; + values[i + 8] = cos2 * hcos2 * 2; + + values[i + 9] = sin2 * hcos1 * 2; values[i + 10] = hsin1 * 2; values[i + 11] = cos2 * hcos1 * 2; - + i += 12; - + sin1 = sin2; cos1 = cos2; } - + hsin1 = hsin2; hcos1 = hcos2; } @@ -75,7 +74,7 @@ public class RenderShield extends Render { public void doRender(Entity entityShield, double x, double y, double z, float par8, float par9) { this.bindEntityTexture(entityShield); Tessellator tessellator = Tessellator.instance; - + glEnable(GL_ALPHA_TEST); glAlphaFunc(GL_GREATER, 0); glEnable(GL_BLEND); @@ -84,20 +83,20 @@ public class RenderShield extends Render { glDisable(GL_LIGHTING); glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); - + glPushMatrix(); - if(((EntityShield)entityShield).owner != null && !Minecraft.getMinecraft().thePlayer.getDisplayName().equals(((EntityShield)entityShield).owner.getDisplayName() )) + if (((EntityShield) entityShield).owner != null && !Minecraft.getMinecraft().thePlayer.getDisplayName().equals(((EntityShield) entityShield).owner.getDisplayName())) glTranslated(x, y, z); tessellator.startDrawingQuads(); for (int v = 0; v < values.length; v += 12) { - 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.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(); - + glPopMatrix(); glPopAttrib(); glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/emt/init/BlockRegistry.java b/src/main/java/emt/init/EMTBlocks.java similarity index 99% rename from src/main/java/emt/init/BlockRegistry.java rename to src/main/java/emt/init/EMTBlocks.java index 2294399..b6cc481 100644 --- a/src/main/java/emt/init/BlockRegistry.java +++ b/src/main/java/emt/init/EMTBlocks.java @@ -25,7 +25,7 @@ import static thaumcraft.api.ThaumcraftApi.*; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -public class BlockRegistry { +public class EMTBlocks { public static Block portableNode, essentiaGens, shield, emtSolars, emtMachines, emtSolars2, electricCloud; diff --git a/src/main/java/emt/init/EntityRegistry.java b/src/main/java/emt/init/EMTEntities.java similarity index 97% rename from src/main/java/emt/init/EntityRegistry.java rename to src/main/java/emt/init/EMTEntities.java index 4054c46..4cd606a 100644 --- a/src/main/java/emt/init/EntityRegistry.java +++ b/src/main/java/emt/init/EMTEntities.java @@ -9,7 +9,7 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.entity.EntityLiving; -public class EntityRegistry { +public class EMTEntities { private static int startEID = 300; private static int entityIDs = 0; diff --git a/src/main/java/emt/init/ItemRegistry.java b/src/main/java/emt/init/EMTItems.java similarity index 99% rename from src/main/java/emt/init/ItemRegistry.java rename to src/main/java/emt/init/EMTItems.java index 3d81c70..6cbd683 100644 --- a/src/main/java/emt/init/ItemRegistry.java +++ b/src/main/java/emt/init/EMTItems.java @@ -45,7 +45,7 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApi; -public class ItemRegistry { +public class EMTItems { public static Item onering; public static Item materials; diff --git a/src/main/java/emt/init/RecipeRegistry.java b/src/main/java/emt/init/EMTRecipes.java similarity index 57% rename from src/main/java/emt/init/RecipeRegistry.java rename to src/main/java/emt/init/EMTRecipes.java index c485339..9fbedc7 100644 --- a/src/main/java/emt/init/RecipeRegistry.java +++ b/src/main/java/emt/init/EMTRecipes.java @@ -37,20 +37,20 @@ import thaumcraft.common.config.ConfigItems; import java.util.Iterator; -public class RecipeRegistry { +public class EMTRecipes { - public static ItemStack uuMCell = new ItemStack(ItemRegistry.itemEMTItems, 1, 15); + public static ItemStack uuMCell = new ItemStack(EMTItems.itemEMTItems, 1, 15); private static void registerShapedRecipes() { /** Crafting Recipes **/ - 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)); - featherWings = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.featherWing), "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 12)); - taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 13), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather)); + ironOmnitool = GameRegistry.addShapedRecipe(EMTRandomHelper.getChargedItem(EMTItems.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(EMTItems.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(EMTItems.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(EMTItems.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper)); + featherMesh = GameRegistry.addShapedRecipe(new ItemStack(EMTItems.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(EMTItems.itemEMTItems, 1, 9)); + featherWing = GameRegistry.addShapedRecipe(new ItemStack(EMTItems.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(EMTItems.itemEMTItems, 1, 7), 'Y', new ItemStack(EMTItems.itemEMTItems, 1, 8), 'Z', new ItemStack(EMTItems.itemEMTItems, 1, 11)); + featherWings = GameRegistry.addShapedRecipe(new ItemStack(EMTItems.featherWing), "XX", 'X', new ItemStack(EMTItems.itemEMTItems, 1, 12)); + taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(EMTItems.itemEMTItems, 1, 13), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather)); GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); @@ -58,18 +58,18 @@ public class RecipeRegistry { /** OreDict Crafting Recipes **/ for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { - cardboard = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 11), "XXX", "YYY", "XXX", 'X', new ItemStack(Items.paper), 'Y', OreDictionary.getOres("logWood").get(i)); + cardboard = GameRegistry.addShapedRecipe(new ItemStack(EMTItems.itemEMTItems, 1, 11), "XXX", "YYY", "XXX", 'X', new ItemStack(Items.paper), 'Y', OreDictionary.getOres("logWood").get(i)); } for (int i = 0; i < OreDictionary.getOres("itemRubber").size(); i++) { - rubberBall = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 10), "XX", "XX", 'X', OreDictionary.getOres("itemRubber").get(i)); + rubberBall = GameRegistry.addShapedRecipe(new ItemStack(EMTItems.itemEMTItems, 1, 10), "XX", "XX", 'X', OreDictionary.getOres("itemRubber").get(i)); } /** Smelting Recipes **/ - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 10), new ItemStack(ItemRegistry.itemEMTItems, 2, 8), 0.0F); + GameRegistry.addSmelting(new ItemStack(EMTItems.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(EMTItems.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(EMTItems.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(EMTItems.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(EMTItems.itemEMTItems, 1, 10), new ItemStack(EMTItems.itemEMTItems, 2, 8), 0.0F); } private static void registerShaplessRecipes() { @@ -159,171 +159,171 @@ public class RecipeRegistry { public static void registerLateRecipes() { /** Infusion Recipes **/ - 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") }); + thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", EMTRandomHelper.getChargedItem(EMTItems.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(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") }); - 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") }); + thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", EMTRandomHelper.getChargedItem(EMTItems.thaumiumChainsaw, 10), 5, EMTCraftingAspects.thaumiumChainsawCrafting, new ItemStack(EMTItems.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") }); - 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") }); + thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", EMTRandomHelper.getChargedItem(EMTItems.quantumThaumicHelmet, 10), 6, EMTCraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(EMTItems.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(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit") }); - 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") }); + thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", EMTRandomHelper.getChargedItem(EMTItems.nanoThaumicHelmet, 10), 5, EMTCraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(EMTItems.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(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit") }); - 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") }); + thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", EMTRandomHelper.getChargedItem(EMTItems.thaumiumOmnitool, 10), 6, EMTCraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(EMTItems.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { new ItemStack(EMTItems.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian") }); - diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, EMTCraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), + diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(EMTItems.thaumiumOmnitool), 6, EMTCraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(EMTItems.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, EMTCraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), + explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(EMTItems.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, EMTCraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), + shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(EMTItems.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, EMTCraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), + potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(EMTBlocks.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", EMTRandomHelper.getChargedItem(ItemRegistry.streamChainsaw, 10), 6, EMTCraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), + streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", EMTRandomHelper.getChargedItem(EMTItems.streamChainsaw, 10), 6, EMTCraftingAspects.streamChaisnawCrafting, new ItemStack(EMTItems.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", 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), + rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", EMTRandomHelper.getChargedItem(EMTItems.rockbreakerDrill, 10), 6, EMTCraftingAspects.rockbreakerDrillCrafting, new ItemStack(EMTItems.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, 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") }); + thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(EMTItems.thorHammer), 7, EMTCraftingAspects.thorHammerCrafting, new ItemStack(EMTItems.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { new ItemStack(EMTItems.itemEMTItems, 1, 6), new ItemStack(EMTItems.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", 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"), + superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", EMTRandomHelper.getChargedItem(EMTItems.electricThorHammer, 10), 10, EMTCraftingAspects.superchargedThorHammerCrafting, new ItemStack(EMTItems.thorHammer, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { new ItemStack(EMTItems.itemEMTItems, 1, 6), new ItemStack(EMTItems.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, EMTCraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), + wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(EMTBlocks.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", 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) }); + solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", EMTRandomHelper.getChargedItem(EMTItems.solarHelmetRevealing, 10), 5, EMTCraftingAspects.solarHelmetRevealing, new ItemStack(EMTItems.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { new ItemStack(EMTBlocks.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", EMTRandomHelper.getChargedItem(ItemRegistry.electricBootsTraveller, 10), 2, EMTCraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), + electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", EMTRandomHelper.getChargedItem(EMTItems.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", EMTRandomHelper.getChargedItem(ItemRegistry.nanoBootsTraveller, 10), 2, EMTCraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), + nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", EMTRandomHelper.getChargedItem(EMTItems.nanoBootsTraveller, 10), 2, EMTCraftingAspects.nanoBootsTravel, new ItemStack(EMTItems.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", EMTRandomHelper.getChargedItem(ItemRegistry.quantumBootsTraveller, 10), 2, EMTCraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), + quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", EMTRandomHelper.getChargedItem(EMTItems.quantumBootsTraveller, 10), 2, EMTCraftingAspects.quantumBootsTravel, new ItemStack(EMTItems.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, 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) }); + etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(EMTBlocks.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(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5) }); - 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) }); + tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(EMTBlocks.emtSolars, 1, 2), 2, EMTCraftingAspects.compressedSolars, new ItemStack(EMTBlocks.emtSolars, 1, 1), new ItemStack[] { new ItemStack(EMTBlocks.emtSolars, 1, 1), new ItemStack(EMTBlocks.emtSolars, 1, 1), new ItemStack(EMTBlocks.emtSolars, 1, 1), + new ItemStack(EMTBlocks.emtSolars, 1, 1), new ItemStack(EMTBlocks.emtSolars, 1, 1), new ItemStack(EMTBlocks.emtSolars, 1, 1), new ItemStack(EMTBlocks.emtSolars, 1, 1), new ItemStack(EMTBlocks.emtSolars, 1, 1) }); - electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", EMTRandomHelper.getChargedItem(ItemRegistry.electricHoeGrowth, 10), 4, EMTCraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), + electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", EMTRandomHelper.getChargedItem(EMTItems.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, 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) }); + chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(EMTItems.chargeFocus), 4, EMTCraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.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, 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") }); + wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(EMTItems.wandChargeFocus), 5, EMTCraftingAspects.wandChargeFocus, new ItemStack(EMTBlocks.emtMachines, 1, 0), + new ItemStack[] { new ItemStack(EMTItems.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, 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") }); + inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(EMTItems.emtBauble, 1, 1), 6, EMTCraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), + new ItemStack[] { new ItemStack(EMTItems.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, 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") }); + armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(EMTItems.emtBauble, 1, 0), 6, EMTCraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), + new ItemStack[] { new ItemStack(EMTItems.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", EMTRandomHelper.getChargedItem(ItemRegistry.nanoWing, 10), 4, EMTCraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing), + nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", EMTRandomHelper.getChargedItem(EMTItems.nanoWing, 10), 4, EMTCraftingAspects.nanoWing, new ItemStack(EMTItems.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", EMTRandomHelper.getChargedItem(ItemRegistry.quantumWing, 10), 6, EMTCraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), + quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", EMTRandomHelper.getChargedItem(EMTItems.quantumWing, 10), 6, EMTCraftingAspects.quantumWing, new ItemStack(EMTItems.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", 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) }); + infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("Infused Quantum Armor", EMTRandomHelper.getChargedItem(EMTItems.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(EMTBlocks.shield), new ItemStack(EMTBlocks.shield) }); /** Arcane Worktable Recipes **/ - 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)); + diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", EMTRandomHelper.getChargedItem(EMTItems.diamondOmnitool, 10), EMTCraftingAspects.diamondOmnitoolCrafting, new ItemStack(EMTItems.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 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)); + ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(EMTItems.diamondOmnitool), EMTCraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(EMTItems.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); - 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)); + christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(EMTItems.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", 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', + electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", EMTRandomHelper.getChargedItem(EMTItems.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", 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', + electricGoggles2 = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", EMTRandomHelper.getChargedItem(EMTItems.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), EMTCraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); + shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Block", new ItemStack(EMTBlocks.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), EMTCraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); - compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); + compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(EMTBlocks.emtSolars, 1, 0), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); - doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0)); + doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(EMTBlocks.emtSolars, 1, 1), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(EMTBlocks.emtSolars, 1, 0)); - 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', + electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", EMTRandomHelper.getChargedItem(EMTItems.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), EMTCraftingAspects.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(EMTItems.itemEMTItems, 1, 14), EMTCraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(EMTItems.itemEMTItems, 1, 13), 'Y', new ItemStack(EMTItems.itemEMTItems, 1, 5), 'Z', IC2Items.getItem("plateiron")); - thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), EMTCraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14)); + thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(EMTItems.thaumiumWing), EMTCraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(EMTItems.itemEMTItems, 1, 14)); /** Crucible Recipes **/ - ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.ignisGeneratorCrafting); + ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(EMTBlocks.essentiaGens, 1, 1), new ItemStack(EMTBlocks.essentiaGens, 1, 0), EMTCraftingAspects.ignisGeneratorCrafting); - auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.auramGeneratorCrafting); + auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(EMTBlocks.essentiaGens, 1, 2), new ItemStack(EMTBlocks.essentiaGens, 1, 0), EMTCraftingAspects.auramGeneratorCrafting); - arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.arborGeneratorCrafting); + arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(EMTBlocks.essentiaGens, 1, 3), new ItemStack(EMTBlocks.essentiaGens, 1, 0), EMTCraftingAspects.arborGeneratorCrafting); - aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 4), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.aerGenerator); + aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(EMTBlocks.essentiaGens, 1, 4), new ItemStack(EMTBlocks.essentiaGens, 1, 0), EMTCraftingAspects.aerGenerator); - waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.waterSolars); + waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 3), new ItemStack(EMTBlocks.emtSolars, 1, 0), EMTCraftingAspects.waterSolars); - doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.waterSolars); + doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 4), new ItemStack(EMTBlocks.emtSolars, 1, 1), EMTCraftingAspects.waterSolars); - tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.waterSolars); + tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 5), new ItemStack(EMTBlocks.emtSolars, 1, 2), EMTCraftingAspects.waterSolars); - darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.darkSolars); + darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 6), new ItemStack(EMTBlocks.emtSolars, 1, 0), EMTCraftingAspects.darkSolars); - doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.darkSolars); + doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 7), new ItemStack(EMTBlocks.emtSolars, 1, 1), EMTCraftingAspects.darkSolars); - tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.darkSolars); + tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 8), new ItemStack(EMTBlocks.emtSolars, 1, 2), EMTCraftingAspects.darkSolars); - orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.orderSolars); + orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 9), new ItemStack(EMTBlocks.emtSolars, 1, 0), EMTCraftingAspects.orderSolars); - doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.orderSolars); + doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 10), new ItemStack(EMTBlocks.emtSolars, 1, 1), EMTCraftingAspects.orderSolars); - tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.orderSolars); + tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 11), new ItemStack(EMTBlocks.emtSolars, 1, 2), EMTCraftingAspects.orderSolars); - fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.fireSolars); + fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 12), new ItemStack(EMTBlocks.emtSolars, 1, 0), EMTCraftingAspects.fireSolars); - doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.fireSolars); + doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 13), new ItemStack(EMTBlocks.emtSolars, 1, 1), EMTCraftingAspects.fireSolars); - tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.fireSolars); + tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 14), new ItemStack(EMTBlocks.emtSolars, 1, 2), EMTCraftingAspects.fireSolars); - airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.airSolars); + airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars, 1, 15), new ItemStack(EMTBlocks.emtSolars, 1, 0), EMTCraftingAspects.airSolars); - doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.airSolars); + doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars2, 1, 0), new ItemStack(EMTBlocks.emtSolars, 1, 1), EMTCraftingAspects.airSolars); - tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.airSolars); + tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars2, 1, 1), new ItemStack(EMTBlocks.emtSolars, 1, 2), EMTCraftingAspects.airSolars); - earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.earthSolars); + earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars2, 1, 2), new ItemStack(EMTBlocks.emtSolars, 1, 0), EMTCraftingAspects.earthSolars); - doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.earthSolars); + doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars2, 1, 3), new ItemStack(EMTBlocks.emtSolars, 1, 1), EMTCraftingAspects.earthSolars); - tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.earthSolars); + tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(EMTBlocks.emtSolars2, 1, 4), new ItemStack(EMTBlocks.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, EMTCraftingAspects.portableNode); + portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(EMTBlocks.portableNode), itemStack, EMTCraftingAspects.portableNode); - uuMCrystal = ThaumcraftApi.addCrucibleRecipe("UU-Matter Infusion", new ItemStack(ItemRegistry.itemEMTItems, 1, 15), Ic2Items.uuMatterCell.copy(), EMTCraftingAspects.uuMatterCrystal); + uuMCrystal = ThaumcraftApi.addCrucibleRecipe("UU-Matter Infusion", new ItemStack(EMTItems.itemEMTItems, 1, 15), Ic2Items.uuMatterCell.copy(), EMTCraftingAspects.uuMatterCrystal); /** IC2 Stuff related recipes **/ @@ -353,8 +353,8 @@ public class RecipeRegistry { Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)), null, leadClusterRecipe); /* Thaumium Plates Recipes */ - thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); - Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)); + thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(EMTItems.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); + Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(EMTItems.itemEMTItems, 1, 5)); /* Ore Processing for Amber and Cinnabar */ if (EMTConfigHandler.removeAmberAndCinnabarMacerating) { @@ -374,11 +374,11 @@ public class RecipeRegistry { } } } - ItemStack crushedAmberRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 1); + ItemStack crushedAmberRecipe = new ItemStack(EMTItems.itemEMTItems, 1, 1); crushedAmberRecipe.stackSize = 2; Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe); - ItemStack crushedCinnabarRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 3); + ItemStack crushedCinnabarRecipe = new ItemStack(EMTItems.itemEMTItems, 1, 3); crushedCinnabarRecipe.stackSize = 2; Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0)), null, crushedCinnabarRecipe); @@ -390,14 +390,14 @@ public class RecipeRegistry { ItemStack smallTinDust = IC2Items.getItem("smallTinDust"); smallCopperDust.stackSize = 2; - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 1)), waterAmount, new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 2), smallCopperDust, IC2Items.getItem("stoneDust") }); - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 3)), waterAmount, new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 4), smallTinDust, IC2Items.getItem("stoneDust") }); + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(EMTItems.itemEMTItems, 1, 1)), waterAmount, new ItemStack[] { new ItemStack(EMTItems.itemEMTItems, 1, 2), smallCopperDust, IC2Items.getItem("stoneDust") }); + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(EMTItems.itemEMTItems, 1, 3)), waterAmount, new ItemStack[] { new ItemStack(EMTItems.itemEMTItems, 1, 4), smallTinDust, IC2Items.getItem("stoneDust") }); NBTTagCompound heatAmount = new NBTTagCompound(); heatAmount.setInteger("minHeat", 1000); - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 2)), heatAmount, new ItemStack[] { IC2Items.getItem("smallCopperDust"), new ItemStack(ConfigItems.itemResource, 1, 6) }); - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 4)), heatAmount, new ItemStack[] { IC2Items.getItem("smallTinDust"), new ItemStack(ConfigItems.itemResource, 1, 3) }); + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(EMTItems.itemEMTItems, 1, 2)), heatAmount, new ItemStack[] { IC2Items.getItem("smallCopperDust"), new ItemStack(ConfigItems.itemResource, 1, 6) }); + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(EMTItems.itemEMTItems, 1, 4)), heatAmount, new ItemStack[] { IC2Items.getItem("smallTinDust"), new ItemStack(ConfigItems.itemResource, 1, 3) }); } diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java new file mode 100644 index 0000000..b21eff9 --- /dev/null +++ b/src/main/java/emt/init/EMTResearches.java @@ -0,0 +1,286 @@ +package emt.init; + +import emt.ModInformation; +import emt.client.EMTKeys; +import emt.util.EMTConfigHandler; +import emt.util.EMTResearchAspects; +import emt.util.EMTResearchItem; +import ic2.api.item.IC2Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; + +public class EMTResearches { + public static void register() { + addResearchTab(); + addResearch(); + } + + public static void addResearchTab() { + ResourceLocation background = new ResourceLocation(ModInformation.texturePath, "textures/misc/background.png"); + ResearchCategories.registerCategory("EMT", new ResourceLocation(ModInformation.texturePath, "textures/blocks/electricCloud.png"), background); + } + + public static void addResearch() { + /** Research that can't be disabled **/ + new EMTResearchItem("Electric Magic Tools", 0, 0, 0, new ResourceLocation(ModInformation.texturePath, "textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Diamond Chainsaw", 5, -6, 0, new ItemStack(EMTItems.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.diamondChainsaw)); + new EMTResearchItem("Thaumium Plate", 6, -6, 0, new ItemStack(EMTItems.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumPlate)); + new EMTResearchItem("Macerating Native Ore Clusters", 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("The Legend", 5, -5, 0, new ItemStack(EMTItems.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Lightning Summoner", 6, -5, 0, new ItemStack(EMTItems.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("The One Ring", 6, -7, 0, new ItemStack(EMTItems.onering)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Electric Cloud", 4, -7, 0, new ItemStack(EMTBlocks.electricCloud)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage("2")); + new EMTResearchItem("Feather Wings", 0, 2, 0, new ItemStack(EMTItems.featherWing)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(EMTRecipes.cardboard), new ResearchPage(EMTRecipes.featherWing), new ResearchPage(EMTRecipes.featherWings)); + + /** Research that can be disabled **/ + if (!EMTConfigHandler.thaumiumDrillResearch) { + new EMTResearchItem("Thaumium Drill", EMTResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(EMTItems.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumDrill)); + } + + if (!EMTConfigHandler.thaumiumChainsawResearch) { + new EMTResearchItem("Thaumium Chainsaw", EMTResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(EMTItems.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumChainsaw)); + } + + if (!EMTConfigHandler.electricGooglesResearch) { + new EMTResearchItem("Electric Goggles", EMTResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(EMTItems.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.electricGoggles)); + } + + if (!EMTConfigHandler.electricGooglesResearch) { + if (!EMTConfigHandler.nanoGooglesResearch) { + ; + new EMTResearchItem("Nanosuit Goggles of Revealing", EMTResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(EMTItems.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumicNanoHelmet)); + } + } + + if (!EMTConfigHandler.electricGooglesResearch) { + if (!EMTConfigHandler.nanoGooglesResearch) { + if (!EMTConfigHandler.quantumGooglesResearch) { + new EMTResearchItem("Quantum Goggles of Revealing", EMTResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(EMTItems.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumicQuantumHelmet)); + } + } + } + + if (!EMTConfigHandler.ironOmnitoolResearch) { + new EMTResearchItem("Iron Omnitool", -2, 0, 0, new ItemStack(EMTItems.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.ironOmnitool)); + } + + if (!EMTConfigHandler.ironOmnitoolResearch) { + if (!EMTConfigHandler.diamondOmnitoolResearch) { + new EMTResearchItem("Diamond Omnitool", EMTResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(EMTItems.diamondOmnitool)).setSecondary().setParents("Iron Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.diamondOmnitool), new ResearchPage(EMTRecipes.ironOmnitoolToDiamond)); + } + } + + if (!EMTConfigHandler.thaumiumDrillResearch && !EMTConfigHandler.thaumiumChainsawResearch) { + if (!EMTConfigHandler.thaumiumOmnitoolResearch) { + new EMTResearchItem("Thaumium Omnitool", EMTResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(EMTItems.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumOmnitool), + new ResearchPage(EMTRecipes.diamondOmnitoolToThaumium)); + } + } + + if (!EMTConfigHandler.explosionFocusResearch) { + new EMTResearchItem("Explosion Focus", EMTResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(EMTItems.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.explosionFocus)); + } + + if (!EMTConfigHandler.christmasFocusResearch) { + new EMTResearchItem("Kris-tmas Focus", EMTResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(EMTItems.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.christmasFocus)); + } + + if (!EMTConfigHandler.shieldFocusResearch) { + new EMTResearchItem("Shield Focus", EMTResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(EMTItems.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.shieldFocus)); + } + + if (!EMTConfigHandler.shieldFocusResearch) { + if (!EMTConfigHandler.shieldBlockResearch) { + new EMTResearchItem("Shield Block", EMTResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(EMTBlocks.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.shieldBlock)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + new EMTResearchItem("Potentia Generator", EMTResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(EMTBlocks.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.potentiaGenerator)); + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.ignisGeneratorResearch) { + new EMTResearchItem("Ignis Generator", EMTResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(EMTBlocks.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.ignisGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.auramGeneratorResearch) { + new EMTResearchItem("Auram Generator", EMTResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(EMTBlocks.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.auramGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.arborGeneratorResearch) { + new EMTResearchItem("Arbor Generator", EMTResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(EMTBlocks.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.arborGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.aerGeneratorResearch) { + new EMTResearchItem("Aer Generator", EMTResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(EMTBlocks.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.aerGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.wandChargingSationResearch) { + new EMTResearchItem("Industrial Wand Charging Station", EMTResearchAspects.wandCharger, -4, 2, 3, new ItemStack(EMTBlocks.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.wandRecharger)); + } + } + + if (!EMTConfigHandler.thaumiumChainsawResearch) { + if (!EMTConfigHandler.streamChainsawResearch) { + new EMTResearchItem("Chainsaw of the Stream", EMTResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(EMTItems.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.streamChainsaw)); + } + } + + if (!EMTConfigHandler.thaumiumDrillResearch) { + if (!EMTConfigHandler.rockbreakerDrillResearch) { + new EMTResearchItem("Drill of the Rockbreaker", EMTResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(EMTItems.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.rockbreakerDrill)); + } + } + + if (!EMTConfigHandler.tinyUraniumResearch) { + new EMTResearchItem("Tiny Uranium", EMTResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.tinyUranium)); + } + + if (!EMTConfigHandler.thorHammerResearch) { + new EMTResearchItem("Mjolnir", EMTResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(EMTItems.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thorHammer)); + } + + if (!EMTConfigHandler.thorHammerResearch) { + if (!EMTConfigHandler.superchargedThorHammerResearch) { + new EMTResearchItem("Supercharged Mjolnir", EMTResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(EMTItems.electricThorHammer)).setParents("Mjolnir").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.superchargedThorHammer)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + new EMTResearchItem("Compressed Solars", EMTResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(EMTBlocks.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.compressedSolar), new ResearchPage(EMTRecipes.doubleCompressedSolar), + new ResearchPage(EMTRecipes.tripleCompressedSolar)); + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.solarHelmetResearch) { + new EMTResearchItem("Solar Helmet of Revealing", EMTResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(EMTItems.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.solarHelmetRevealing)); + } + } + + if (!EMTConfigHandler.electricBootsResearch) { + new EMTResearchItem("Electric Boots of the Traveller", EMTResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(EMTItems.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.electricBootsTravel)); + } + + if (!EMTConfigHandler.electricBootsResearch) { + if (!EMTConfigHandler.nanoBootsResearch) { + new EMTResearchItem("Nano Boots of the Traveller", EMTResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(EMTItems.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.nanoBootsTravel)); + } + } + + if (!EMTConfigHandler.electricBootsResearch) { + if (!EMTConfigHandler.nanoBootsResearch) { + if (!EMTConfigHandler.quantumBootsResearch) { + new EMTResearchItem("Quantum Boots of the Traveller", EMTResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(EMTItems.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.quantumBootsTravel)); + } + } + } + + if (!EMTConfigHandler.electricScribingToolsResearch) { + new EMTResearchItem("Electric Scribing Tools", EMTResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(EMTItems.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.electricScribingTools)); + } + + if (!EMTConfigHandler.etherealProcessorResearch) { + new EMTResearchItem("Etheral Processor", EMTResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(EMTBlocks.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.etheralProcessor)); + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.waterSolarsResearch) { + new EMTResearchItem("Water Infused Solar Panels", EMTResearchAspects.waterSolars, -7, -7, 1, new ItemStack(EMTBlocks.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.waterSolar), new ResearchPage(EMTRecipes.doubleWaterSolar), + new ResearchPage(EMTRecipes.tripleWaterSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.darkSolarsResearch) { + new EMTResearchItem("Entropy Infused Solar Panels", EMTResearchAspects.darkSolars, -8, -6, 1, new ItemStack(EMTBlocks.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.darkSolar), new ResearchPage(EMTRecipes.doubleDarkSolar), + new ResearchPage(EMTRecipes.tripleDarkSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.orderSolarsResearch) { + new EMTResearchItem("Order Infused Solar Panels", EMTResearchAspects.orderSolars, -6, -8, 1, new ItemStack(EMTBlocks.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.orderSolar), new ResearchPage(EMTRecipes.doubleOrderSolar), + new ResearchPage(EMTRecipes.tripleOrderSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.fireSolarsResearch) { + new EMTResearchItem("Fire Infused Solar Panels", EMTResearchAspects.fireSolars, -5, -7, 1, new ItemStack(EMTBlocks.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.fireSolar), new ResearchPage(EMTRecipes.doubleFireSolar), + new ResearchPage(EMTRecipes.tripleFireSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.airSolarsResearch) { + new EMTResearchItem("Air Infused Solar Panels", EMTResearchAspects.airSolars, -4, -6, 1, new ItemStack(EMTBlocks.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.airSolar), new ResearchPage(EMTRecipes.doubleAirSolar), new ResearchPage(EMTRecipes.tripleAirSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.earthSolarsResearch) { + new EMTResearchItem("Earth Infused Solar Panels", EMTResearchAspects.earthSolars, -6, -7, 1, new ItemStack(EMTBlocks.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.earthSolar), new ResearchPage(EMTRecipes.doubleEarthSolar), + new ResearchPage(EMTRecipes.tripleEarthSolar)); + } + } + + if (!EMTConfigHandler.uuMInfusionResearch) { + new EMTResearchItem("UU-Matter Infusion", EMTResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(EMTItems.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.uuMCrystal), new ResearchPage(EMTRecipes.charcoalToCoal), + new ResearchPage(EMTRecipes.glowstoneDustToBlock), new ResearchPage(EMTRecipes.stoneBricksToIronOre), new ResearchPage(EMTRecipes.arcaneStoneToCopperOre), new ResearchPage(EMTRecipes.arcaneStoneBricksToTinOre), new ResearchPage(EMTRecipes.amberBlockToLeadOre), new ResearchPage(EMTRecipes.amberBricksToUraniumOre), + new ResearchPage(EMTRecipes.shardToResin), new ResearchPage(EMTRecipes.shardToRedstone), new ResearchPage(EMTRecipes.shardToLapis), new ResearchPage(EMTRecipes.ironToGold), new ResearchPage(EMTRecipes.goldToDiamond), new ResearchPage(EMTRecipes.diamondToUranium), new ResearchPage(EMTRecipes.uraniumToIridium)); + } + + if (!EMTConfigHandler.portableNodeResarch) { + new EMTResearchItem("Portable Node", EMTResearchAspects.portableNode, 2, 5, 3, new ItemStack(EMTBlocks.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.portableNode)); + } + + if (!EMTConfigHandler.electricHoeGrowthResearch) { + new EMTResearchItem("Electric Hoe of Growth", EMTResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(EMTItems.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.electricHoeGrowth)); + } + + if (!EMTConfigHandler.chargeFocusResearch) { + new EMTResearchItem("Wand Focus: Charging", EMTResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(EMTItems.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.chargeFocus)); + } + + if (!EMTConfigHandler.wandChargeFocusResearch) { + new EMTResearchItem("Wand Focus: Wand Charging", EMTResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(EMTItems.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.wandChargeFocus)); + } + + if (!EMTConfigHandler.inventoryChargingRing) { + new EMTResearchItem("Inventory Charging Ring", EMTResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(EMTItems.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.inventoryChargingRing)); + } + + if (!EMTConfigHandler.armorChargingRing) { + new EMTResearchItem("Armor Charging Ring", EMTResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(EMTItems.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.armorChargingRing)); + } + + if (!EMTConfigHandler.thaumiumWingResearch) { + new EMTResearchItem("Thaumium Reinforced Wings", EMTResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(EMTItems.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumWing), new ResearchPage(EMTRecipes.thaumiumWings)); + } + + if (!EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.thaumiumWingResearch) { + new EMTResearchItem("Nanosuit Wings", EMTResearchAspects.nanoWing, 0, 6, 2, new ItemStack(EMTItems.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.nanoWings)); + } + + if (!EMTConfigHandler.quantumWingsResearch && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch) { + new EMTResearchItem("Quantum Wings", EMTResearchAspects.quantumWing, 0, 8, 3, new ItemStack(EMTItems.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.quantumWings)); + } + + if (!EMTConfigHandler.infusedQuantumChestplate && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.quantumWingsResearch) { + new EMTResearchItem("Infused Quantum Armor", EMTResearchAspects.quantumWing, 0, 10, 4, new ItemStack(EMTItems.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.infusedQuantumArmor)); + } + } +} diff --git a/src/main/java/emt/init/TileRegistry.java b/src/main/java/emt/init/EMTTiles.java similarity index 99% rename from src/main/java/emt/init/TileRegistry.java rename to src/main/java/emt/init/EMTTiles.java index ca49fc3..425e5e9 100644 --- a/src/main/java/emt/init/TileRegistry.java +++ b/src/main/java/emt/init/EMTTiles.java @@ -32,7 +32,7 @@ import emt.tile.solar.water.TileEntityDoubleWaterSolar; import emt.tile.solar.water.TileEntityTripleWaterSolar; import emt.tile.solar.water.TileEntityWaterSolar; -public class TileRegistry { +public class EMTTiles { public static void registerTiles() { GameRegistry.registerTileEntity(TileEntityPortableNode.class, "tileentityportablenode"); diff --git a/src/main/java/emt/init/Registry.java b/src/main/java/emt/init/Registry.java index 308db43..b4e7d6e 100644 --- a/src/main/java/emt/init/Registry.java +++ b/src/main/java/emt/init/Registry.java @@ -2,15 +2,15 @@ package emt.init; public class Registry { public static void register() { - BlockRegistry.registerBlocks(); - ItemRegistry.registerItems(); - TileRegistry.registerTiles(); - RecipeRegistry.registerEarlyRecipes(); + EMTBlocks.registerBlocks(); + EMTItems.registerItems(); + EMTTiles.registerTiles(); + EMTRecipes.registerEarlyRecipes(); } public static void registerLate() { - BlockRegistry.addAspects(); - RecipeRegistry.registerLateRecipes(); - RecipeRegistry.registerUUMInfusionRecipes(); + EMTBlocks.addAspects(); + EMTRecipes.registerLateRecipes(); + EMTRecipes.registerUUMInfusionRecipes(); } } diff --git a/src/main/java/emt/init/Researches.java b/src/main/java/emt/init/Researches.java deleted file mode 100644 index ceede49..0000000 --- a/src/main/java/emt/init/Researches.java +++ /dev/null @@ -1,286 +0,0 @@ -package emt.init; - -import emt.ModInformation; -import emt.client.EMTKeys; -import emt.util.EMTConfigHandler; -import emt.util.EMTResearchAspects; -import emt.util.EMTResearchItem; -import ic2.api.item.IC2Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.api.research.ResearchPage; - -public class Researches { - public static void register() { - addResearchTab(); - addResearch(); - } - - public static void addResearchTab() { - ResourceLocation background = new ResourceLocation(ModInformation.texturePath, "textures/misc/background.png"); - ResearchCategories.registerCategory("EMT", new ResourceLocation("electromagictools:textures/misc/emt.png"), background); - } - - public static void addResearch() { - /** Research that can't be disabled **/ - new EMTResearchItem("Electric Magic Tools", 0, 0, 0, new ResourceLocation("electromagictools:textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); - new EMTResearchItem("Diamond Chainsaw", 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.diamondChainsaw)); - new EMTResearchItem("Thaumium Plate", 6, -6, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumPlate)); - new EMTResearchItem("Macerating Native Ore Clusters", 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); - new EMTResearchItem("The Legend", 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); - new EMTResearchItem("Lightning Summoner", 6, -5, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); - new EMTResearchItem("The One Ring", 6, -7, 0, new ItemStack(ItemRegistry.onering)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); - new EMTResearchItem("Electric Cloud", 4, -7, 0, new ItemStack(BlockRegistry.electricCloud)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage("2")); - new EMTResearchItem("Feather Wings", 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 (!EMTConfigHandler.thaumiumDrillResearch) { - new EMTResearchItem("Thaumium Drill", EMTResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumDrill)); - } - - if (!EMTConfigHandler.thaumiumChainsawResearch) { - new EMTResearchItem("Thaumium Chainsaw", EMTResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); - } - - if (!EMTConfigHandler.electricGooglesResearch) { - new EMTResearchItem("Electric Goggles", EMTResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricGoggles)); - } - - if (!EMTConfigHandler.electricGooglesResearch) { - if (!EMTConfigHandler.nanoGooglesResearch) { - ; - new EMTResearchItem("Nanosuit Goggles of Revealing", EMTResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); - } - } - - if (!EMTConfigHandler.electricGooglesResearch) { - if (!EMTConfigHandler.nanoGooglesResearch) { - if (!EMTConfigHandler.quantumGooglesResearch) { - new EMTResearchItem("Quantum Goggles of Revealing", EMTResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); - } - } - } - - if (!EMTConfigHandler.ironOmnitoolResearch) { - new EMTResearchItem("Iron Omnitool", -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.ironOmnitool)); - } - - if (!EMTConfigHandler.ironOmnitoolResearch) { - if (!EMTConfigHandler.diamondOmnitoolResearch) { - new EMTResearchItem("Diamond Omnitool", EMTResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Iron Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); - } - } - - if (!EMTConfigHandler.thaumiumDrillResearch && !EMTConfigHandler.thaumiumChainsawResearch) { - if (!EMTConfigHandler.thaumiumOmnitoolResearch) { - new EMTResearchItem("Thaumium Omnitool", EMTResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumOmnitool), - new ResearchPage(RecipeRegistry.diamondOmnitoolToThaumium)); - } - } - - if (!EMTConfigHandler.explosionFocusResearch) { - new EMTResearchItem("Explosion Focus", EMTResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.explosionFocus)); - } - - if (!EMTConfigHandler.christmasFocusResearch) { - new EMTResearchItem("Kris-tmas Focus", EMTResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.christmasFocus)); - } - - if (!EMTConfigHandler.shieldFocusResearch) { - new EMTResearchItem("Shield Focus", EMTResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.shieldFocus)); - } - - if (!EMTConfigHandler.shieldFocusResearch) { - if (!EMTConfigHandler.shieldBlockResearch) { - new EMTResearchItem("Shield Block", EMTResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.shieldBlock)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - new EMTResearchItem("Potentia Generator", EMTResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.potentiaGenerator)); - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.ignisGeneratorResearch) { - new EMTResearchItem("Ignis Generator", EMTResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.ignisGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.auramGeneratorResearch) { - new EMTResearchItem("Auram Generator", EMTResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.auramGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.arborGeneratorResearch) { - new EMTResearchItem("Arbor Generator", EMTResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.arborGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.aerGeneratorResearch) { - new EMTResearchItem("Aer Generator", EMTResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.aerGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.wandChargingSationResearch) { - new EMTResearchItem("Industrial Wand Charging Station", EMTResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.wandRecharger)); - } - } - - if (!EMTConfigHandler.thaumiumChainsawResearch) { - if (!EMTConfigHandler.streamChainsawResearch) { - new EMTResearchItem("Chainsaw of the Stream", EMTResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.streamChainsaw)); - } - } - - if (!EMTConfigHandler.thaumiumDrillResearch) { - if (!EMTConfigHandler.rockbreakerDrillResearch) { - new EMTResearchItem("Drill of the Rockbreaker", EMTResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.rockbreakerDrill)); - } - } - - if (!EMTConfigHandler.tinyUraniumResearch) { - new EMTResearchItem("Tiny Uranium", EMTResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.tinyUranium)); - } - - if (!EMTConfigHandler.thorHammerResearch) { - new EMTResearchItem("Mjolnir", EMTResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thorHammer)); - } - - if (!EMTConfigHandler.thorHammerResearch) { - if (!EMTConfigHandler.superchargedThorHammerResearch) { - new EMTResearchItem("Supercharged Mjolnir", EMTResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.superchargedThorHammer)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - new EMTResearchItem("Compressed Solars", EMTResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), - new ResearchPage(RecipeRegistry.tripleCompressedSolar)); - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.solarHelmetResearch) { - new EMTResearchItem("Solar Helmet of Revealing", EMTResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); - } - } - - if (!EMTConfigHandler.electricBootsResearch) { - new EMTResearchItem("Electric Boots of the Traveller", EMTResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricBootsTravel)); - } - - if (!EMTConfigHandler.electricBootsResearch) { - if (!EMTConfigHandler.nanoBootsResearch) { - new EMTResearchItem("Nano Boots of the Traveller", EMTResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.nanoBootsTravel)); - } - } - - if (!EMTConfigHandler.electricBootsResearch) { - if (!EMTConfigHandler.nanoBootsResearch) { - if (!EMTConfigHandler.quantumBootsResearch) { - new EMTResearchItem("Quantum Boots of the Traveller", EMTResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.quantumBootsTravel)); - } - } - } - - if (!EMTConfigHandler.electricScribingToolsResearch) { - new EMTResearchItem("Electric Scribing Tools", EMTResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricScribingTools)); - } - - if (!EMTConfigHandler.etherealProcessorResearch) { - new EMTResearchItem("Etheral Processor", EMTResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.etheralProcessor)); - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.waterSolarsResearch) { - new EMTResearchItem("Water Infused Solar Panels", EMTResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), - new ResearchPage(RecipeRegistry.tripleWaterSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.darkSolarsResearch) { - new EMTResearchItem("Entropy Infused Solar Panels", EMTResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), - new ResearchPage(RecipeRegistry.tripleDarkSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.orderSolarsResearch) { - new EMTResearchItem("Order Infused Solar Panels", EMTResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), - new ResearchPage(RecipeRegistry.tripleOrderSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.fireSolarsResearch) { - new EMTResearchItem("Fire Infused Solar Panels", EMTResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), - new ResearchPage(RecipeRegistry.tripleFireSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.airSolarsResearch) { - new EMTResearchItem("Air Infused Solar Panels", EMTResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.earthSolarsResearch) { - new EMTResearchItem("Earth Infused Solar Panels", EMTResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), - new ResearchPage(RecipeRegistry.tripleEarthSolar)); - } - } - - if (!EMTConfigHandler.uuMInfusionResearch) { - new EMTResearchItem("UU-Matter Infusion", EMTResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), 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 (!EMTConfigHandler.portableNodeResarch) { - new EMTResearchItem("Portable Node", EMTResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.portableNode)); - } - - if (!EMTConfigHandler.electricHoeGrowthResearch) { - new EMTResearchItem("Electric Hoe of Growth", EMTResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricHoeGrowth)); - } - - if (!EMTConfigHandler.chargeFocusResearch) { - new EMTResearchItem("Wand Focus: Charging", EMTResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.chargeFocus)); - } - - if (!EMTConfigHandler.wandChargeFocusResearch) { - new EMTResearchItem("Wand Focus: Wand Charging", EMTResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.wandChargeFocus)); - } - - if (!EMTConfigHandler.inventoryChargingRing) { - new EMTResearchItem("Inventory Charging Ring", EMTResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.inventoryChargingRing)); - } - - if (!EMTConfigHandler.armorChargingRing) { - new EMTResearchItem("Armor Charging Ring", EMTResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.armorChargingRing)); - } - - if (!EMTConfigHandler.thaumiumWingResearch) { - new EMTResearchItem("Thaumium Reinforced Wings", EMTResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); - } - - if (!EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.thaumiumWingResearch) { - new EMTResearchItem("Nanosuit Wings", EMTResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.nanoWings)); - } - - if (!EMTConfigHandler.quantumWingsResearch && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch) { - new EMTResearchItem("Quantum Wings", EMTResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.quantumWings)); - } - - if (!EMTConfigHandler.infusedQuantumChestplate && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.quantumWingsResearch) { - new EMTResearchItem("Infused Quantum Armor", EMTResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); - } - } -} diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 7cea71b..cd20f79 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -8,7 +8,7 @@ import emt.ElectroMagicTools; import emt.ModInformation; import emt.client.model.ModelSpecialArmor; import emt.client.model.ModelWings; -import emt.init.ItemRegistry; +import emt.init.EMTItems; import emt.item.armor.wings.ItemNanoWing; import emt.item.armor.wings.ItemQuantumWing; import emt.util.EMTConfigHandler; @@ -88,9 +88,6 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { super(internalName, InternalName.quantum, armorType, 2000000, 12000.0D, 4); MinecraftForge.EVENT_BUS.register(this); this.setCreativeTab(ElectroMagicTools.tabEMT); - potionRemovalCost.add(Potion.poison.id); - potionRemovalCost.add(IC2Potion.radiation.id); - potionRemovalCost.add(Potion.wither.id); rnd = new Random(); } @@ -111,7 +108,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { public String getItemStackDisplayName(ItemStack stack) { - return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); + return (StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); } @SubscribeEvent @@ -158,12 +155,15 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { if (!world.isRemote) { - for (PotionEffect effect : new LinkedList(player.getActivePotionEffects())) { - if(potionRemovalCost.contains(new Integer(effect.getPotionID()))){ - IC2.platform.removePotion(player, effect.getPotionID()); + for (Object effect : player.getActivePotionEffects()) { + if(potionRemovalCost.contains(new Integer(((PotionEffect)effect).getPotionID()))){ + IC2.platform.removePotion(player, ((PotionEffect)effect).getPotionID()); } } + ItemStack currentStack = player.inventory.getCurrentItem(); + Item currentItem = currentStack == null? null : player.inventory.getCurrentItem().getItem(); + if (nbt.hasKey("useother")) { String useother = nbt.getString("useother"); if (useother.equals("Jetpack")) { @@ -200,49 +200,48 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { } } - if (player.inventory.getCurrentItem() != null && player.isSneaking() && toggleTimer == 0 && wing == NONE) { - if (player.inventory.getCurrentItem().getItem() == IC2Items.getItem("electricJetpack").getItem()) { + if (currentStack != null && player.isSneaking() && toggleTimer == 0 && wing == NONE) { + if (currentItem == IC2Items.getItem("electricJetpack").getItem()) { IC2.platform.messagePlayer(player, "Jetpack enabled.", new Object[0]); nbt.setByte("wing", JETPACK); int charge = (int) ElectricItem.manager.getCharge(itemStack); if (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < 30000) { - ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); + ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(currentStack), player); } - nbt.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int) ElectricItem.manager.getCharge(itemStack))); + nbt.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(currentStack) + charge - (int) ElectricItem.manager.getCharge(itemStack))); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - } - else if (player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing) { + else if (currentItem == EMTItems.thaumiumWing) { IC2.platform.messagePlayer(player, "Thaumium wings enabled.", new Object[0]); nbt.setByte("wing", THAUMIUM); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } - else if (player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing) { + else if (currentItem == EMTItems.nanoWing) { IC2.platform.messagePlayer(player, "Nano wings enabled.", new Object[0]); nbt.setByte("wing", NANO); int charge = (int) ElectricItem.manager.getCharge(itemStack); - if (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemNanoWing.maxCharge) { - ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); + if (ElectricItem.manager.getCharge(currentStack) < ItemNanoWing.maxCharge) { + ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge - ElectricItem.manager.getCharge(currentStack), player); } nbt.setInteger("NWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int) ElectricItem.manager.getCharge(itemStack))); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } - else if (player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing) { + else if (currentItem == EMTItems.quantumWing) { IC2.platform.messagePlayer(player, "Quantum wings enabled.", new Object[0]); nbt.setByte("wing", QUANTUM); int charge = (int) ElectricItem.manager.getCharge(itemStack); - if (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemQuantumWing.maxCharge) { - ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); + if (ElectricItem.manager.getCharge(currentStack) < ItemQuantumWing.maxCharge) { + ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge - ElectricItem.manager.getCharge(currentStack), player); } - nbt.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int) ElectricItem.manager.getCharge(itemStack))); + nbt.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(currentStack) + charge - (int) ElectricItem.manager.getCharge(itemStack))); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } } - if (player.inventory.getCurrentItem() == null && nbt.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()) { + if (currentStack == null && nbt.getBoolean("unequip") && player.isSneaking()) { toggleTimer = 30; if (wing == JETPACK) { @@ -259,13 +258,13 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { if (wing == THAUMIUM) { IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]); nbt.setByte("wing", NONE); - player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.thaumiumWing)); + player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(EMTItems.thaumiumWing)); } if (wing == NANO) { IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]); nbt.setByte("wing", NONE); - ItemStack charged = new ItemStack(ItemRegistry.nanoWing); + ItemStack charged = new ItemStack(EMTItems.nanoWing); if (nbt.getInteger("NWCharge") > 0) ElectricItem.manager.charge(charged, nbt.getInteger("NWCharge"), 3, true, false); else @@ -276,17 +275,18 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { if (wing == QUANTUM) { IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]); nbt.setByte("wing", NONE); - ItemStack charged = new ItemStack(ItemRegistry.quantumWing); + ItemStack charged = new ItemStack(EMTItems.quantumWing); if (nbt.getInteger("QWCharge") > 0) ElectricItem.manager.charge(charged, nbt.getInteger("QWCharge"), 3, true, false); else ElectricItem.manager.charge(charged, 0, 3, true, false); player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); } - - nbt.setBoolean("unequip", false); } + + nbt.setBoolean("unequip", false); } + if ((IC2.keyboard.isJumpKeyDown(player) && wing == JETPACK) || (hoverMode && player.motionY < -0.029999999329447746D)) { jetpackUsed = useJetpack(player, hoverMode, itemStack); diff --git a/src/main/java/emt/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java index 7131e5f..4b0f3c4 100644 --- a/src/main/java/emt/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -7,7 +7,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import emt.ElectroMagicTools; import emt.entity.EntityShield; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import ic2.core.IC2; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/emt/network/PacketEMTKeys.java b/src/main/java/emt/network/PacketEMTKeys.java index 7a263c9..be3b05a 100644 --- a/src/main/java/emt/network/PacketEMTKeys.java +++ b/src/main/java/emt/network/PacketEMTKeys.java @@ -6,13 +6,13 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import emt.init.ItemRegistry; +import emt.init.EMTItems; public class PacketEMTKeys implements IMessage, IMessageHandler { @Override public IMessage onMessage(PacketEMTKeys message, MessageContext ctx) { - if (ctx.getServerHandler().playerEntity.inventory.armorInventory[2] != null && ctx.getServerHandler().playerEntity.inventory.armorInventory[2].getItem() == ItemRegistry.quantumArmor) { + if (ctx.getServerHandler().playerEntity.inventory.armorInventory[2] != null && ctx.getServerHandler().playerEntity.inventory.armorInventory[2].getItem() == EMTItems.quantumArmor) { ctx.getServerHandler().playerEntity.inventory.armorInventory[2].stackTagCompound.setBoolean("unequip", true); } return null; diff --git a/src/main/java/emt/tile/TileEntityEtherealMacerator.java b/src/main/java/emt/tile/TileEntityEtherealMacerator.java index af20cb4..f7f3fb3 100644 --- a/src/main/java/emt/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/emt/tile/TileEntityEtherealMacerator.java @@ -1,6 +1,6 @@ package emt.tile; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.TileEntityEMT; import emt.util.EMTConfigHandler; import ic2.api.item.IC2Items; @@ -278,7 +278,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtMachines, 1, 1); + return new ItemStack(EMTBlocks.emtMachines, 1, 1); } @Override diff --git a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java index 67582e3..cf5ecda 100644 --- a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java @@ -1,6 +1,6 @@ package emt.tile; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSink; import ic2.api.tile.IWrenchable; @@ -206,6 +206,6 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtMachines, 1, 0); + return new ItemStack(EMTBlocks.emtMachines, 1, 0); } } diff --git a/src/main/java/emt/tile/solar/air/TileEntityAirSolar.java b/src/main/java/emt/tile/solar/air/TileEntityAirSolar.java index 1387847..6ffaa4e 100644 --- a/src/main/java/emt/tile/solar/air/TileEntityAirSolar.java +++ b/src/main/java/emt/tile/solar/air/TileEntityAirSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.air; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; @@ -25,6 +25,6 @@ public class TileEntityAirSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 15); + return new ItemStack(EMTBlocks.emtSolars, 1, 15); } } diff --git a/src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java b/src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java index dac3b1d..929132d 100644 --- a/src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.air; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +14,6 @@ public class TileEntityDoubleAirSolar extends TileEntityAirSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 0); + return new ItemStack(EMTBlocks.emtSolars2, 1, 0); } } diff --git a/src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java b/src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java index 23710c4..2be9b7c 100644 --- a/src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java +++ b/src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.air; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +14,6 @@ public class TileEntityTripleAirSolar extends TileEntityAirSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 1); + return new ItemStack(EMTBlocks.emtSolars2, 1, 1); } } diff --git a/src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java b/src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java index 95608cf..15c9703 100644 --- a/src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.compressed; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +14,6 @@ public class TileEntityCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 0); + return new ItemStack(EMTBlocks.emtSolars, 1, 0); } } diff --git a/src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java index 9d8a220..3231b79 100644 --- a/src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.compressed; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +14,6 @@ public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 1); + return new ItemStack(EMTBlocks.emtSolars, 1, 1); } } diff --git a/src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java index e32653f..1979c4e 100644 --- a/src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.compressed; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +14,6 @@ public class TileEntityTripleCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 2); + return new ItemStack(EMTBlocks.emtSolars, 1, 2); } } diff --git a/src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java b/src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java index cac88b1..7e41315 100644 --- a/src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java +++ b/src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.dark; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +21,6 @@ public class TileEntityDarkSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 6); + return new ItemStack(EMTBlocks.emtSolars, 1, 6); } } diff --git a/src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java b/src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java index 896a624..1eaac97 100644 --- a/src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.dark; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 7); + return new ItemStack(EMTBlocks.emtSolars, 1, 7); } } diff --git a/src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java b/src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java index 590c214..69b6c52 100644 --- a/src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.dark; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 8); + return new ItemStack(EMTBlocks.emtSolars, 1, 8); } } diff --git a/src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java b/src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java index 4554ea4..366668a 100644 --- a/src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.earth; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 3); + return new ItemStack(EMTBlocks.emtSolars2, 1, 3); } } diff --git a/src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java b/src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java index 0c90661..59a27e6 100644 --- a/src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java +++ b/src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.earth; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +24,6 @@ public class TileEntityEarthSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 2); + return new ItemStack(EMTBlocks.emtSolars2, 1, 2); } } diff --git a/src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java b/src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java index 3f23743..c6e2cd8 100644 --- a/src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.earth; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 4); + return new ItemStack(EMTBlocks.emtSolars2, 1, 4); } } diff --git a/src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java b/src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java index cace617..8b8d324 100644 --- a/src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.fire; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityDoubleFireSolar extends TileEntityFireSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 13); + return new ItemStack(EMTBlocks.emtSolars, 1, 13); } } diff --git a/src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java b/src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java index ab85703..809d145 100644 --- a/src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java +++ b/src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.fire; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -32,6 +32,6 @@ public class TileEntityFireSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 12); + return new ItemStack(EMTBlocks.emtSolars, 1, 12); } } diff --git a/src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java b/src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java index 1a2fad3..36d33f9 100644 --- a/src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.fire; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityTripleFireSolar extends TileEntityFireSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 14); + return new ItemStack(EMTBlocks.emtSolars, 1, 14); } } diff --git a/src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java b/src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java index 71f9ff8..062424f 100644 --- a/src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.order; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 10); + return new ItemStack(EMTBlocks.emtSolars, 1, 10); } } diff --git a/src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java b/src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java index 4e054d5..ccfbc16 100644 --- a/src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java +++ b/src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.order; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +21,6 @@ public class TileEntityOrderSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 9); + return new ItemStack(EMTBlocks.emtSolars, 1, 9); } } diff --git a/src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java b/src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java index 64a6c9e..f3208c9 100644 --- a/src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.order; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 11); + return new ItemStack(EMTBlocks.emtSolars, 1, 11); } } diff --git a/src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java b/src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java index 679f24b..570b1ad 100644 --- a/src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.water; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 4); + return new ItemStack(EMTBlocks.emtSolars, 1, 4); } } diff --git a/src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java b/src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java index 23ba6de..039fd82 100644 --- a/src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.water; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +13,6 @@ public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 5); + return new ItemStack(EMTBlocks.emtSolars, 1, 5); } } diff --git a/src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java b/src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java index 4f23fbc..f2f13a3 100644 --- a/src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java +++ b/src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java @@ -1,6 +1,6 @@ package emt.tile.solar.water; -import emt.init.BlockRegistry; +import emt.init.EMTBlocks; import emt.tile.solar.TileEntitySolarBase; import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +21,6 @@ public class TileEntityWaterSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 3); + return new ItemStack(EMTBlocks.emtSolars, 1, 3); } } diff --git a/src/main/java/emt/util/EMTCreativeTab.java b/src/main/java/emt/util/EMTCreativeTab.java index 58e6a53..6fa8e14 100644 --- a/src/main/java/emt/util/EMTCreativeTab.java +++ b/src/main/java/emt/util/EMTCreativeTab.java @@ -1,6 +1,7 @@ package emt.util; -import emt.init.ItemRegistry; +import emt.init.EMTBlocks; +import emt.init.EMTItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,7 +15,7 @@ public class EMTCreativeTab extends CreativeTabs { @Override public ItemStack getIconItemStack() { - return new ItemStack(ItemRegistry.rockbreakerDrill); + return new ItemStack(EMTBlocks.electricCloud); } @Override diff --git a/src/main/java/emt/util/EMTDungeonChestGenerator.java b/src/main/java/emt/util/EMTDungeonChestGenerator.java index 95a1dfb..fd6279f 100644 --- a/src/main/java/emt/util/EMTDungeonChestGenerator.java +++ b/src/main/java/emt/util/EMTDungeonChestGenerator.java @@ -1,6 +1,6 @@ package emt.util; -import emt.init.ItemRegistry; +import emt.init.EMTItems; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; @@ -9,10 +9,10 @@ public class EMTDungeonChestGenerator { public static void generateLoot() { if (!EMTConfigHandler.thorHammerResearch) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.taintedThorHammer), 0, 1, EMTConfigHandler.chanceTaintedMjolnir)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EMTItems.taintedThorHammer), 0, 1, EMTConfigHandler.chanceTaintedMjolnir)); } if (!EMTConfigHandler.oneRingSpawn) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.onering), 0, 1, EMTConfigHandler.chanceOneRing)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EMTItems.onering), 0, 1, EMTConfigHandler.chanceOneRing)); } } } diff --git a/src/main/java/emt/util/EMTEventHandler.java b/src/main/java/emt/util/EMTEventHandler.java index 669f87c..30233f4 100644 --- a/src/main/java/emt/util/EMTEventHandler.java +++ b/src/main/java/emt/util/EMTEventHandler.java @@ -10,7 +10,7 @@ import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import emt.ElectroMagicTools; import emt.ModInformation; import emt.client.EMTKeys; -import emt.init.ItemRegistry; +import emt.init.EMTItems; import emt.network.PacketEMTKeys; import emt.proxy.ClientProxy; import net.minecraft.entity.item.EntityItem; @@ -28,11 +28,11 @@ public class EMTEventHandler { if (event.entityLiving instanceof EntityCreeper) { EntityCreeper creeper = (EntityCreeper) event.entityLiving; if (creeper.getPowered()) { - event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, 1, 6), 1); + event.entityLiving.entityDropItem(new ItemStack(EMTItems.itemEMTItems, 1, 6), 1); } } if (event.entityLiving instanceof EntityTaintChicken) { - event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, rnd.nextInt(3), 13), 1); + event.entityLiving.entityDropItem(new ItemStack(EMTItems.itemEMTItems, rnd.nextInt(3), 13), 1); } } diff --git a/src/main/java/emt/util/EMTResearchItem.java b/src/main/java/emt/util/EMTResearchItem.java index 250324b..ff0940b 100644 --- a/src/main/java/emt/util/EMTResearchItem.java +++ b/src/main/java/emt/util/EMTResearchItem.java @@ -48,7 +48,7 @@ public class EMTResearchItem extends ResearchItem { for (ResearchPage page : pages) { if (page.type == PageType.TEXT) - page.text = "emt.text." + key + "." + page.text; + page.text = "emt.text." + key + (page.text.equals("") ? "" : "." + page.text); if (page.type == PageType.INFUSION_CRAFTING) { if (parentsHidden == null || parentsHidden.length == 0) diff --git a/src/main/resources/assets/electromagictools/textures/blocks/electricCloud.png b/src/main/resources/assets/electromagictools/textures/blocks/electricCloud.png deleted file mode 100644 index c1f19dd..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/electricCloud.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond.png deleted file mode 100644 index a15bd94..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png deleted file mode 100644 index 2395d88..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png.mcmeta b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png.mcmeta deleted file mode 100644 index d3db93d..0000000 --- a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 30 - } -} diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium.png deleted file mode 100644 index 57725ee..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_alt.png deleted file mode 100644 index f77346b..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker.png deleted file mode 100644 index 9084741..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium.png deleted file mode 100644 index d7d6524..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt.png deleted file mode 100644 index 3eb59ab..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt2.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt2.png deleted file mode 100644 index 745059a..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt2.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth2.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth2.png deleted file mode 100644 index 31ee29d..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth2.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond.png deleted file mode 100644 index 8525f06..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_alt.png deleted file mode 100644 index 4b65cf6..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron.png deleted file mode 100644 index b70389e..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium.png deleted file mode 100644 index e520abe..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt.png deleted file mode 100644 index 1cb95c2..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt2.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt2.png deleted file mode 100644 index 39cce3d..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt2.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/misc/emt.png b/src/main/resources/assets/electromagictools/textures/misc/emt.png deleted file mode 100644 index 661f59d..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/misc/emt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/models/shield.png b/src/main/resources/assets/electromagictools/textures/models/shield.png deleted file mode 100644 index 2002bd2..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/models/shield.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/emt/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/electromagictools/lang/en_US.lang rename to src/main/resources/assets/emt/lang/en_US.lang diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/emt/lang/ru_RU.lang similarity index 99% rename from src/main/resources/assets/electromagictools/lang/ru_RU.lang rename to src/main/resources/assets/emt/lang/ru_RU.lang index 4d955b0..04dda4d 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/emt/lang/ru_RU.lang @@ -129,8 +129,8 @@ tile.EMT.solar2.tripleearth.name=Наполненная землёй, трижд #=============Thaumonomicon============= emt.rsname.Electric Cloud=Наэлектризованное облако emt.tag.Electric Cloud=Всё тот же Нитор -emt.text.Electric Cloud.1=Наверное, каждому Тауматургу нравится пламя, которое ещё называют Нитором. Вы, решив сделать его более "живым", сумели наэлектролизвать его.

Теперь, это всё тот же Нитор, но от него ещё и исходят электрические искровые разряды. -emt.text.Electric Cloud.2=Just nothing ATM +emt.text.Electric Cloud.1=Наверное, каждому Тауматургу нравится пламя, которое ещё называют Нитором. Вы, решив сделать его более "живым", сумели наэлектризовать его.

Теперь, это всё тот же Нитор, но от него ещё и исходят электрические искровые разряды. +emt.text.Electric Cloud.2=emt:textures/researches/electricCloud.png:0:0:255:255:0.6 emt.rsname.Electric Magic Tools=Electric Magic Tools emt.tag.Electric Magic Tools=Кто сказал что магия и технология не дружат вместе? diff --git a/src/main/resources/assets/electromagictools/lang/zh_CN.lang b/src/main/resources/assets/emt/lang/zh_CN.lang similarity index 100% rename from src/main/resources/assets/electromagictools/lang/zh_CN.lang rename to src/main/resources/assets/emt/lang/zh_CN.lang diff --git a/src/main/resources/assets/emt/textures/blocks/electricCloud.png b/src/main/resources/assets/emt/textures/blocks/electricCloud.png new file mode 100644 index 0000000..1c7c189 Binary files /dev/null and b/src/main/resources/assets/emt/textures/blocks/electricCloud.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/empty.png b/src/main/resources/assets/emt/textures/blocks/empty.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/empty.png rename to src/main/resources/assets/emt/textures/blocks/empty.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/aerfront.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/aerfront.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/aerfront.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/aerfront.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/arborfront.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/arborfront.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/arborfront.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/arborfront.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/arborfront_alt.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/arborfront_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/arborfront_alt.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/arborfront_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/auramfront.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/auramfront.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/auramfront.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/auramfront.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/auramfront_alt.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/auramfront_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/auramfront_alt.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/auramfront_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/front_alt.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/front_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/front_alt.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/front_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/ignisfront.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/ignisfront.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/ignisfront.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/ignisfront.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/ignisfront_alt.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/ignisfront_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/ignisfront_alt.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/ignisfront_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/potentiafront.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/potentiafront.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/potentiafront.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/potentiafront.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/potentiafront_alt.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/potentiafront_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/potentiafront_alt.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/potentiafront_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/saxumfront.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/saxumfront.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/saxumfront.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/saxumfront.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/saxumfront_alt.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/saxumfront_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/saxumfront_alt.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/saxumfront_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/side.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/side.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/side.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/side.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/top.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/top.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_aer.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_aer.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_aer.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_aer.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_arbor.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_arbor.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_arbor.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_arbor.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_auram.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_auram.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_auram.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_auram.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_ignis.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_ignis.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_ignis.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_ignis.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_potentia.png b/src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_potentia.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/top_potentia.png rename to src/main/resources/assets/emt/textures/blocks/essentiagenerator/top_potentia.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/bottom.png b/src/main/resources/assets/emt/textures/blocks/machines/bottom.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/bottom.png rename to src/main/resources/assets/emt/textures/blocks/machines/bottom.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmacerator.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmacerator.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmacerator.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmacerator.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt2.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt2.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt2.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt3.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt3.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt3.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt3.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt4.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt4.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfront_alt4.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfront_alt4.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt2.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt2.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt2.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt3.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt3.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt3.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt3.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt4.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt4.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt4.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratorfrontactive_alt4.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortop.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortop.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortop.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortop.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortop_alt.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortop_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortop_alt.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortop_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortopactive.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortopactive.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortopactive.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortopactive.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortopactive_alt.png b/src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortopactive_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/etherealmaceratortopactive_alt.png rename to src/main/resources/assets/emt/textures/blocks/machines/etherealmaceratortopactive_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/side.png b/src/main/resources/assets/emt/textures/blocks/machines/side.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/side.png rename to src/main/resources/assets/emt/textures/blocks/machines/side.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/top.png b/src/main/resources/assets/emt/textures/blocks/machines/top.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/top.png rename to src/main/resources/assets/emt/textures/blocks/machines/top.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/top_alt.png b/src/main/resources/assets/emt/textures/blocks/machines/top_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/top_alt.png rename to src/main/resources/assets/emt/textures/blocks/machines/top_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/top_alt2.png b/src/main/resources/assets/emt/textures/blocks/machines/top_alt2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/top_alt2.png rename to src/main/resources/assets/emt/textures/blocks/machines/top_alt2.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/wandcharger.png b/src/main/resources/assets/emt/textures/blocks/machines/wandcharger.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/machines/wandcharger.png rename to src/main/resources/assets/emt/textures/blocks/machines/wandcharger.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/portablenode.png b/src/main/resources/assets/emt/textures/blocks/portablenode.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/portablenode.png rename to src/main/resources/assets/emt/textures/blocks/portablenode.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/raindispeller.png b/src/main/resources/assets/emt/textures/blocks/raindispeller.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/raindispeller.png rename to src/main/resources/assets/emt/textures/blocks/raindispeller.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/shield.png b/src/main/resources/assets/emt/textures/blocks/shield.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/shield.png rename to src/main/resources/assets/emt/textures/blocks/shield.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png b/src/main/resources/assets/emt/textures/blocks/solars/air/airside.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png rename to src/main/resources/assets/emt/textures/blocks/solars/air/airside.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png b/src/main/resources/assets/emt/textures/blocks/solars/bottom.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png rename to src/main/resources/assets/emt/textures/blocks/solars/bottom.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png b/src/main/resources/assets/emt/textures/blocks/solars/bottom32.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png rename to src/main/resources/assets/emt/textures/blocks/solars/bottom32.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png b/src/main/resources/assets/emt/textures/blocks/solars/dark/darkside.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png rename to src/main/resources/assets/emt/textures/blocks/solars/dark/darkside.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png b/src/main/resources/assets/emt/textures/blocks/solars/doublesolartop.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png rename to src/main/resources/assets/emt/textures/blocks/solars/doublesolartop.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png b/src/main/resources/assets/emt/textures/blocks/solars/doublesolartop32.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png rename to src/main/resources/assets/emt/textures/blocks/solars/doublesolartop32.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png b/src/main/resources/assets/emt/textures/blocks/solars/earth/earthside.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png rename to src/main/resources/assets/emt/textures/blocks/solars/earth/earthside.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png b/src/main/resources/assets/emt/textures/blocks/solars/fire/fireside.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png rename to src/main/resources/assets/emt/textures/blocks/solars/fire/fireside.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png b/src/main/resources/assets/emt/textures/blocks/solars/order/orderside.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png rename to src/main/resources/assets/emt/textures/blocks/solars/order/orderside.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png b/src/main/resources/assets/emt/textures/blocks/solars/side.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/side.png rename to src/main/resources/assets/emt/textures/blocks/solars/side.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png b/src/main/resources/assets/emt/textures/blocks/solars/side32.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png rename to src/main/resources/assets/emt/textures/blocks/solars/side32.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png b/src/main/resources/assets/emt/textures/blocks/solars/solartop.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png rename to src/main/resources/assets/emt/textures/blocks/solars/solartop.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png b/src/main/resources/assets/emt/textures/blocks/solars/solartop32.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png rename to src/main/resources/assets/emt/textures/blocks/solars/solartop32.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png b/src/main/resources/assets/emt/textures/blocks/solars/triplesolartop.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png rename to src/main/resources/assets/emt/textures/blocks/solars/triplesolartop.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png b/src/main/resources/assets/emt/textures/blocks/solars/triplesolartop32.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png rename to src/main/resources/assets/emt/textures/blocks/solars/triplesolartop32.png diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png b/src/main/resources/assets/emt/textures/blocks/solars/water/waterside.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png rename to src/main/resources/assets/emt/textures/blocks/solars/water/waterside.png diff --git a/src/main/resources/assets/electromagictools/textures/guis/etherealmacerator.png b/src/main/resources/assets/emt/textures/guis/etherealmacerator.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/guis/etherealmacerator.png rename to src/main/resources/assets/emt/textures/guis/etherealmacerator.png diff --git a/src/main/resources/assets/electromagictools/textures/guis/wandcharger.png b/src/main/resources/assets/emt/textures/guis/wandcharger.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/guis/wandcharger.png rename to src/main/resources/assets/emt/textures/guis/wandcharger.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest.png b/src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest.png rename to src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_jetpack.png b/src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_jetpack.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_jetpack.png rename to src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_jetpack.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_n.png b/src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_wing_n.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_n.png rename to src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_wing_n.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_q.png b/src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_wing_q.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_q.png rename to src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_wing_q.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_t.png b/src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_wing_t.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_t.png rename to src/main/resources/assets/emt/textures/items/armor/armor_quantum_chest_wing_t.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/boots_electric.png b/src/main/resources/assets/emt/textures/items/armor/boots_electric.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/boots_electric.png rename to src/main/resources/assets/emt/textures/items/armor/boots_electric.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/boots_electric_alt.png b/src/main/resources/assets/emt/textures/items/armor/boots_electric_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/boots_electric_alt.png rename to src/main/resources/assets/emt/textures/items/armor/boots_electric_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/boots_nano.png b/src/main/resources/assets/emt/textures/items/armor/boots_nano.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/boots_nano.png rename to src/main/resources/assets/emt/textures/items/armor/boots_nano.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/boots_quantum.png b/src/main/resources/assets/emt/textures/items/armor/boots_quantum.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/boots_quantum.png rename to src/main/resources/assets/emt/textures/items/armor/boots_quantum.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png b/src/main/resources/assets/emt/textures/items/armor/goggles_electric.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_electric.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png b/src/main/resources/assets/emt/textures/items/armor/goggles_electric_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_electric_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png b/src/main/resources/assets/emt/textures/items/armor/goggles_nano.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_nano.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png b/src/main/resources/assets/emt/textures/items/armor/goggles_nano_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_nano_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png b/src/main/resources/assets/emt/textures/items/armor/goggles_quantum.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_quantum.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png b/src/main/resources/assets/emt/textures/items/armor/goggles_quantum_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_quantum_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png b/src/main/resources/assets/emt/textures/items/armor/goggles_solar.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_solar.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png b/src/main/resources/assets/emt/textures/items/armor/goggles_solar_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_solar_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png b/src/main/resources/assets/emt/textures/items/armor/goggles_solar_alt2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_solar_alt2.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png b/src/main/resources/assets/emt/textures/items/armor/goggles_solar_alt3.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png rename to src/main/resources/assets/emt/textures/items/armor/goggles_solar_alt3.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/wing_feather.png b/src/main/resources/assets/emt/textures/items/armor/wing_feather.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/wing_feather.png rename to src/main/resources/assets/emt/textures/items/armor/wing_feather.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png b/src/main/resources/assets/emt/textures/items/armor/wing_nano.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png rename to src/main/resources/assets/emt/textures/items/armor/wing_nano.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/wing_quantum.png b/src/main/resources/assets/emt/textures/items/armor/wing_quantum.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/wing_quantum.png rename to src/main/resources/assets/emt/textures/items/armor/wing_quantum.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/wing_thaumium.png b/src/main/resources/assets/emt/textures/items/armor/wing_thaumium.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armor/wing_thaumium.png rename to src/main/resources/assets/emt/textures/items/armor/wing_thaumium.png diff --git a/src/main/resources/assets/electromagictools/textures/items/armoreumaker.png b/src/main/resources/assets/emt/textures/items/armoreumaker.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/armoreumaker.png rename to src/main/resources/assets/emt/textures/items/armoreumaker.png diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_charge.png b/src/main/resources/assets/emt/textures/items/focus_charge.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_charge.png rename to src/main/resources/assets/emt/textures/items/focus_charge.png diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_charge.png.mcmeta b/src/main/resources/assets/emt/textures/items/focus_charge.png.mcmeta similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_charge.png.mcmeta rename to src/main/resources/assets/emt/textures/items/focus_charge.png.mcmeta diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_chargeWand.png b/src/main/resources/assets/emt/textures/items/focus_chargeWand.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_chargeWand.png rename to src/main/resources/assets/emt/textures/items/focus_chargeWand.png diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_chargeWand.png.mcmeta b/src/main/resources/assets/emt/textures/items/focus_chargeWand.png.mcmeta similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_chargeWand.png.mcmeta rename to src/main/resources/assets/emt/textures/items/focus_chargeWand.png.mcmeta diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_christmas.png b/src/main/resources/assets/emt/textures/items/focus_christmas.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_christmas.png rename to src/main/resources/assets/emt/textures/items/focus_christmas.png diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_explosion.png b/src/main/resources/assets/emt/textures/items/focus_explosion.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_explosion.png rename to src/main/resources/assets/emt/textures/items/focus_explosion.png diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_shield.png b/src/main/resources/assets/emt/textures/items/focus_shield.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_shield.png rename to src/main/resources/assets/emt/textures/items/focus_shield.png diff --git a/src/main/resources/assets/electromagictools/textures/items/focus_shieldAlt.png b/src/main/resources/assets/emt/textures/items/focus_shieldAlt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/focus_shieldAlt.png rename to src/main/resources/assets/emt/textures/items/focus_shieldAlt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/electricthorhammer.png b/src/main/resources/assets/emt/textures/items/hammer/electricthorhammer.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/electricthorhammer.png rename to src/main/resources/assets/emt/textures/items/hammer/electricthorhammer.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/electricthorhammer.png.mcmeta b/src/main/resources/assets/emt/textures/items/hammer/electricthorhammer.png.mcmeta similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/electricthorhammer.png.mcmeta rename to src/main/resources/assets/emt/textures/items/hammer/electricthorhammer.png.mcmeta diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/electricthorhammer_alt.png b/src/main/resources/assets/emt/textures/items/hammer/electricthorhammer_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/electricthorhammer_alt.png rename to src/main/resources/assets/emt/textures/items/hammer/electricthorhammer_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric01.png b/src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric01.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric01.png rename to src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric01.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric02.png b/src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric02.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric02.png rename to src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric02.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric03.png b/src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric03.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric03.png rename to src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric03.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric04.png b/src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric04.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/hammerStages/electric04.png rename to src/main/resources/assets/emt/textures/items/hammer/hammerStages/electric04.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer.png b/src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer.png rename to src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer.png.mcmeta b/src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer.png.mcmeta similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer.png.mcmeta rename to src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer.png.mcmeta diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer_long.png b/src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer_long.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer_long.png rename to src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer_long.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer_short.png b/src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer_short.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/taintedthorhammer_short.png rename to src/main/resources/assets/emt/textures/items/hammer/taintedthorhammer_short.png diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/thorhammer.png b/src/main/resources/assets/emt/textures/items/hammer/thorhammer.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/hammer/thorhammer.png rename to src/main/resources/assets/emt/textures/items/hammer/thorhammer.png diff --git a/src/main/resources/assets/electromagictools/textures/items/inventoryeumaker.png b/src/main/resources/assets/emt/textures/items/inventoryeumaker.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/inventoryeumaker.png rename to src/main/resources/assets/emt/textures/items/inventoryeumaker.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/cardboard.png b/src/main/resources/assets/emt/textures/items/materials/cardboard.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/cardboard.png rename to src/main/resources/assets/emt/textures/items/materials/cardboard.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/cardboardsheet.png b/src/main/resources/assets/emt/textures/items/materials/cardboardsheet.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/cardboardsheet.png rename to src/main/resources/assets/emt/textures/items/materials/cardboardsheet.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/clusteruranium.png b/src/main/resources/assets/emt/textures/items/materials/clusteruranium.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/clusteruranium.png rename to src/main/resources/assets/emt/textures/items/materials/clusteruranium.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/crushedamber.png b/src/main/resources/assets/emt/textures/items/materials/crushedamber.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/crushedamber.png rename to src/main/resources/assets/emt/textures/items/materials/crushedamber.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/crushedcinnabar.png b/src/main/resources/assets/emt/textures/items/materials/crushedcinnabar.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/crushedcinnabar.png rename to src/main/resources/assets/emt/textures/items/materials/crushedcinnabar.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png b/src/main/resources/assets/emt/textures/items/materials/ducttape.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png rename to src/main/resources/assets/emt/textures/items/materials/ducttape.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/feathermesh.png b/src/main/resources/assets/emt/textures/items/materials/feathermesh.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/feathermesh.png rename to src/main/resources/assets/emt/textures/items/materials/feathermesh.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/glue.png b/src/main/resources/assets/emt/textures/items/materials/glue.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/glue.png rename to src/main/resources/assets/emt/textures/items/materials/glue.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/glueball.png b/src/main/resources/assets/emt/textures/items/materials/glueball.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/glueball.png rename to src/main/resources/assets/emt/textures/items/materials/glueball.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner.png b/src/main/resources/assets/emt/textures/items/materials/lightningsummoner.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner.png rename to src/main/resources/assets/emt/textures/items/materials/lightningsummoner.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner_alt.png b/src/main/resources/assets/emt/textures/items/materials/lightningsummoner_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner_alt.png rename to src/main/resources/assets/emt/textures/items/materials/lightningsummoner_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/purifiedamber.png b/src/main/resources/assets/emt/textures/items/materials/purifiedamber.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/purifiedamber.png rename to src/main/resources/assets/emt/textures/items/materials/purifiedamber.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/purifiedcinnabar.png b/src/main/resources/assets/emt/textures/items/materials/purifiedcinnabar.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/purifiedcinnabar.png rename to src/main/resources/assets/emt/textures/items/materials/purifiedcinnabar.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/rubberball.png b/src/main/resources/assets/emt/textures/items/materials/rubberball.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/rubberball.png rename to src/main/resources/assets/emt/textures/items/materials/rubberball.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/taintedfeather.png b/src/main/resources/assets/emt/textures/items/materials/taintedfeather.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/taintedfeather.png rename to src/main/resources/assets/emt/textures/items/materials/taintedfeather.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/thaumiumWing.png b/src/main/resources/assets/emt/textures/items/materials/thaumiumWing.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/thaumiumWing.png rename to src/main/resources/assets/emt/textures/items/materials/thaumiumWing.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/thaumiumplate.png b/src/main/resources/assets/emt/textures/items/materials/thaumiumplate.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/thaumiumplate.png rename to src/main/resources/assets/emt/textures/items/materials/thaumiumplate.png diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/uumatterdrop.png b/src/main/resources/assets/emt/textures/items/materials/uumatterdrop.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/materials/uumatterdrop.png rename to src/main/resources/assets/emt/textures/items/materials/uumatterdrop.png diff --git a/src/main/resources/assets/electromagictools/textures/items/onering.png b/src/main/resources/assets/emt/textures/items/onering.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/onering.png rename to src/main/resources/assets/emt/textures/items/onering.png diff --git a/src/main/resources/assets/emt/textures/items/tools/chainsaw_diamond.png b/src/main/resources/assets/emt/textures/items/tools/chainsaw_diamond.png new file mode 100644 index 0000000..7360968 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/chainsaw_diamond.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/chainsaw_stream.png b/src/main/resources/assets/emt/textures/items/tools/chainsaw_stream.png new file mode 100644 index 0000000..d81be1c Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/chainsaw_stream.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/chainsaw_thaumium.png b/src/main/resources/assets/emt/textures/items/tools/chainsaw_thaumium.png new file mode 100644 index 0000000..c8ce3d3 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/chainsaw_thaumium.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/chainsaw_thaumium_alt.png b/src/main/resources/assets/emt/textures/items/tools/chainsaw_thaumium_alt.png new file mode 100644 index 0000000..2417540 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/chainsaw_thaumium_alt.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/drill_rockbreaker.png b/src/main/resources/assets/emt/textures/items/tools/drill_rockbreaker.png new file mode 100644 index 0000000..617767e Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/drill_rockbreaker.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/drill_thaumium.png b/src/main/resources/assets/emt/textures/items/tools/drill_thaumium.png new file mode 100644 index 0000000..6bd7e61 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/drill_thaumium.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/drill_thaumium_alt.png b/src/main/resources/assets/emt/textures/items/tools/drill_thaumium_alt.png new file mode 100644 index 0000000..e9fc14b Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/drill_thaumium_alt.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/drill_thaumium_alt2.png b/src/main/resources/assets/emt/textures/items/tools/drill_thaumium_alt2.png new file mode 100644 index 0000000..e79c21a Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/drill_thaumium_alt2.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png b/src/main/resources/assets/emt/textures/items/tools/hoe_growth.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png rename to src/main/resources/assets/emt/textures/items/tools/hoe_growth.png diff --git a/src/main/resources/assets/emt/textures/items/tools/hoe_growth2.png b/src/main/resources/assets/emt/textures/items/tools/hoe_growth2.png new file mode 100644 index 0000000..703724b Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/hoe_growth2.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/omnitool_diamond.png b/src/main/resources/assets/emt/textures/items/tools/omnitool_diamond.png new file mode 100644 index 0000000..e09e04b Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/omnitool_diamond.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/omnitool_diamond_alt.png b/src/main/resources/assets/emt/textures/items/tools/omnitool_diamond_alt.png new file mode 100644 index 0000000..75f5cc8 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/omnitool_diamond_alt.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/omnitool_iron.png b/src/main/resources/assets/emt/textures/items/tools/omnitool_iron.png new file mode 100644 index 0000000..52fdcf0 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/omnitool_iron.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium.png b/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium.png new file mode 100644 index 0000000..b6640ac Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium_alt.png b/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium_alt.png new file mode 100644 index 0000000..163ca55 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium_alt.png differ diff --git a/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium_alt2.png b/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium_alt2.png new file mode 100644 index 0000000..aa4ef33 Binary files /dev/null and b/src/main/resources/assets/emt/textures/items/tools/omnitool_thaumium_alt2.png differ diff --git a/src/main/resources/assets/electromagictools/textures/misc/background.png b/src/main/resources/assets/emt/textures/misc/background.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/misc/background.png rename to src/main/resources/assets/emt/textures/misc/background.png diff --git a/src/main/resources/assets/emt/textures/misc/emt.png b/src/main/resources/assets/emt/textures/misc/emt.png new file mode 100644 index 0000000..62fe2a8 Binary files /dev/null and b/src/main/resources/assets/emt/textures/misc/emt.png differ diff --git a/src/main/resources/assets/electromagictools/textures/misc/thaumiumplaterecipe.png b/src/main/resources/assets/emt/textures/misc/thaumiumplaterecipe.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/misc/thaumiumplaterecipe.png rename to src/main/resources/assets/emt/textures/misc/thaumiumplaterecipe.png diff --git a/src/main/resources/assets/electromagictools/textures/models/electricboots.png b/src/main/resources/assets/emt/textures/models/electricboots.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/electricboots.png rename to src/main/resources/assets/emt/textures/models/electricboots.png diff --git a/src/main/resources/assets/electromagictools/textures/models/electricgoggles.png b/src/main/resources/assets/emt/textures/models/electricgoggles.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/electricgoggles.png rename to src/main/resources/assets/emt/textures/models/electricgoggles.png diff --git a/src/main/resources/assets/electromagictools/textures/models/featherwing.png b/src/main/resources/assets/emt/textures/models/featherwing.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/featherwing.png rename to src/main/resources/assets/emt/textures/models/featherwing.png diff --git a/src/main/resources/assets/electromagictools/textures/models/lasermodel.png b/src/main/resources/assets/emt/textures/models/lasermodel.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/lasermodel.png rename to src/main/resources/assets/emt/textures/models/lasermodel.png diff --git a/src/main/resources/assets/electromagictools/textures/models/nanobootstravel.png b/src/main/resources/assets/emt/textures/models/nanobootstravel.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/nanobootstravel.png rename to src/main/resources/assets/emt/textures/models/nanobootstravel.png diff --git a/src/main/resources/assets/electromagictools/textures/models/nanowing.png b/src/main/resources/assets/emt/textures/models/nanowing.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/nanowing.png rename to src/main/resources/assets/emt/textures/models/nanowing.png diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum.png b/src/main/resources/assets/emt/textures/models/quantum.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/quantum.png rename to src/main/resources/assets/emt/textures/models/quantum.png diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_jetpack.png b/src/main/resources/assets/emt/textures/models/quantum_jetpack.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/quantum_jetpack.png rename to src/main/resources/assets/emt/textures/models/quantum_jetpack.png diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_n.png b/src/main/resources/assets/emt/textures/models/quantum_wings_n.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/quantum_wings_n.png rename to src/main/resources/assets/emt/textures/models/quantum_wings_n.png diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_q.png b/src/main/resources/assets/emt/textures/models/quantum_wings_q.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/quantum_wings_q.png rename to src/main/resources/assets/emt/textures/models/quantum_wings_q.png diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_t.png b/src/main/resources/assets/emt/textures/models/quantum_wings_t.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/quantum_wings_t.png rename to src/main/resources/assets/emt/textures/models/quantum_wings_t.png diff --git a/src/main/resources/assets/electromagictools/textures/models/quantumbootstravel.png b/src/main/resources/assets/emt/textures/models/quantumbootstravel.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/quantumbootstravel.png rename to src/main/resources/assets/emt/textures/models/quantumbootstravel.png diff --git a/src/main/resources/assets/electromagictools/textures/models/quantumwing.png b/src/main/resources/assets/emt/textures/models/quantumwing.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/quantumwing.png rename to src/main/resources/assets/emt/textures/models/quantumwing.png diff --git a/src/main/resources/assets/electromagictools/textures/models/scaryhelmet.png b/src/main/resources/assets/emt/textures/models/scaryhelmet.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/scaryhelmet.png rename to src/main/resources/assets/emt/textures/models/scaryhelmet.png diff --git a/src/main/resources/assets/emt/textures/models/shield.png b/src/main/resources/assets/emt/textures/models/shield.png new file mode 100644 index 0000000..17a970f Binary files /dev/null and b/src/main/resources/assets/emt/textures/models/shield.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/solarrevealinghelmet.png b/src/main/resources/assets/emt/textures/models/solarrevealinghelmet.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/solarrevealinghelmet.png rename to src/main/resources/assets/emt/textures/models/solarrevealinghelmet.png diff --git a/src/main/resources/assets/electromagictools/textures/models/thaumicnanohelmet.png b/src/main/resources/assets/emt/textures/models/thaumicnanohelmet.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/thaumicnanohelmet.png rename to src/main/resources/assets/emt/textures/models/thaumicnanohelmet.png diff --git a/src/main/resources/assets/electromagictools/textures/models/thaumicquantumhelmet.png b/src/main/resources/assets/emt/textures/models/thaumicquantumhelmet.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/thaumicquantumhelmet.png rename to src/main/resources/assets/emt/textures/models/thaumicquantumhelmet.png diff --git a/src/main/resources/assets/electromagictools/textures/models/thaumiumwing.png b/src/main/resources/assets/emt/textures/models/thaumiumwing.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/models/thaumiumwing.png rename to src/main/resources/assets/emt/textures/models/thaumiumwing.png diff --git a/src/main/resources/assets/emt/textures/researches/electricCloud.png b/src/main/resources/assets/emt/textures/researches/electricCloud.png new file mode 100644 index 0000000..9747908 Binary files /dev/null and b/src/main/resources/assets/emt/textures/researches/electricCloud.png differ diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png index 661f59d..62fe2a8 100644 Binary files a/src/main/resources/logo.png and b/src/main/resources/logo.png differ