diff --git a/build.properties b/build.properties index 3d65396..d56c816 100644 --- a/build.properties +++ b/build.properties @@ -3,5 +3,5 @@ package_group=com.tombenpotter.emt mc_version=1.7.10 forge_version=10.13.4.1481 -mod_version=2.0.0Alpha2 +mod_version=1.2.0 mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/ModInformation.java b/src/main/java/tombenpotter/emt/ModInformation.java index 8b61781..f5a4174 100644 --- a/src/main/java/tombenpotter/emt/ModInformation.java +++ b/src/main/java/tombenpotter/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 = "2.0.0Alpha4"; + public static final String version = "1.2.0"; public static final String texturePath = "electromagictools"; public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory"; public static final String clientProxy = "tombenpotter.emt.proxies.ClientProxy"; diff --git a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java index f8ba870..5b8d439 100644 --- a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java +++ b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java @@ -27,7 +27,6 @@ public class EMTGuiConfig extends GuiConfig { list.add(new ConfigElement(config.getCategory(CATEGORY_VALUES.toLowerCase()))); list.add(new ConfigElement(config.getCategory(CATEGORY_RESEARCH.toLowerCase()))); list.add(new ConfigElement(config.getCategory(CATEGORY_OUTPUTS.toLowerCase()))); - list.add(new ConfigElement(config.getCategory(CATEGORY_MODULES.toLowerCase()))); return list; } diff --git a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java index 091febb..33baace 100644 --- a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java +++ b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java @@ -7,6 +7,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBow; import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; @@ -106,9 +108,9 @@ public class ModelCpecialArmor extends ModelBiped model.rotateAngleZ = z; } - public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_) + public void render(Entity entity, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_) { - this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); + this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, entity); this.bipedBody.render(p_78088_7_); this.bipedRightArm.render(p_78088_7_); @@ -127,6 +129,11 @@ public class ModelCpecialArmor extends ModelBiped public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity entity) { + EntityPlayer player = (EntityPlayer) entity; + if(player.inventory.getCurrentItem() != null) + this.heldItemRight = 1; + else + this.heldItemRight = 0; this.bipedHead.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI); this.bipedHead.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI); this.bipedRightArm.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F + (float)Math.PI) * 2.0F * p_78087_2_ * 0.5F; @@ -213,7 +220,7 @@ public class ModelCpecialArmor extends ModelBiped this.bipedRightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; this.bipedLeftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; - if (this.aimedBow) + if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof ItemBow && player.isUsingItem()) { f6 = 0.0F; f7 = 0.0F; diff --git a/src/main/java/tombenpotter/emt/EMTResearch.java b/src/main/java/tombenpotter/emt/common/EMTResearch.java similarity index 98% rename from src/main/java/tombenpotter/emt/EMTResearch.java rename to src/main/java/tombenpotter/emt/common/EMTResearch.java index eb0b87c..addf798 100644 --- a/src/main/java/tombenpotter/emt/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/EMTResearch.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt; +package tombenpotter.emt.common; import ic2.api.item.IC2Items; import net.minecraft.item.ItemStack; @@ -36,7 +36,6 @@ public class EMTResearch { public static void addResearch() { ResearchItem research; String text; - // String text2; /** Research that can't be disabled **/ text = "1"; @@ -395,5 +394,9 @@ public class EMTResearch { research = new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem(); research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.quantumWings)); } + + text = "1"; + research = new EMTResearchItem("InfusedQuantumArmor", "EMT", ResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); } } diff --git a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java index e700323..379e75f 100644 --- a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java @@ -14,6 +14,7 @@ package tombenpotter.emt.common; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; @@ -37,6 +38,7 @@ import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.items.ItemRegistry; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.CraftingAspects; +import tombenpotter.emt.common.util.RandomHelper; import tombenpotter.emt.common.util.TextHelper; import java.util.Iterator; @@ -48,8 +50,8 @@ public class RecipeRegistry { private static void registerShapedRecipes() { /** Crafting Recipes **/ - ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ironOmnitool), "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(new ItemStack(ItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + ironOmnitool = GameRegistry.addShapedRecipe(RandomHelper.getChargedItem(ItemRegistry.ironOmnitool, 10), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); + diamondChainsaw = GameRegistry.addShapedRecipe(RandomHelper.getChargedItem(ItemRegistry.diamondChainsaw, 10), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); 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)); @@ -166,16 +168,15 @@ public class RecipeRegistry { public static void registerLateRecipes() { /** Infusion Recipes **/ + thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", RandomHelper.getChargedItem(ItemRegistry.thaumiumDrill, 10), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 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", new ItemStack(ItemRegistry.thaumiumDrill), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); + thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", RandomHelper.getChargedItem(ItemRegistry.thaumiumChainsaw, 10), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), 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", new ItemStack(ItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); + thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.quantumThaumicHelmet, 10), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), 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", new ItemStack(ItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")}); + thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.nanoThaumicHelmet, 10), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), 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", new ItemStack(ItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")}); - - thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.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", RandomHelper.getChargedItem(ItemRegistry.thaumiumOmnitool, 10), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")}); diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), 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")}); @@ -185,29 +186,29 @@ public class RecipeRegistry { potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.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", new ItemStack(ItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); + streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", RandomHelper.getChargedItem(ItemRegistry.streamChainsaw, 10), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); - rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", new ItemStack(ItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); + rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", RandomHelper.getChargedItem(ItemRegistry.rockbreakerDrill, 10), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber")}); - superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", new ItemStack(ItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", RandomHelper.getChargedItem(ItemRegistry.electricThorHammer, 10), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), 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", new ItemStack(ItemRegistry.solarHelmetRevealing), 5, CraftingAspects.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", RandomHelper.getChargedItem(ItemRegistry.solarHelmetRevealing, 10), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4)}); - electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", new ItemStack(ItemRegistry.electricBootsTraveller), 2, CraftingAspects.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)}); + electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.electricBootsTraveller, 10), 2, CraftingAspects.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", new ItemStack(ItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.nanoBootsTraveller, 10), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", new ItemStack(ItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate")}); + quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.quantumBootsTraveller, 10), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate")}); etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[]{IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5)}); tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1)}); - electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(ItemRegistry.electricHoeGrowth), 4, CraftingAspects.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)}); + electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", RandomHelper.getChargedItem(ItemRegistry.electricHoeGrowth, 10), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[]{new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE)}); chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 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)}); @@ -217,19 +218,21 @@ public class RecipeRegistry { armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.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("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); - nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", new ItemStack(ItemRegistry.nanoWing), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing), new ItemStack[]{IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); + nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", RandomHelper.getChargedItem(ItemRegistry.nanoWing, 10), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing), new ItemStack[]{IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); - quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", new ItemStack(ItemRegistry.quantumWing), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); + quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", RandomHelper.getChargedItem(ItemRegistry.quantumWing, 10), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); + + infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("InfusedQuantumArmor", RandomHelper.getChargedItem(ItemRegistry.quantumArmor, 10), 5, CraftingAspects.quantumWing, new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(BlockRegistry.shield), new ItemStack(BlockRegistry.shield)}); /** Arcane Worktable Recipes **/ - diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", RandomHelper.getChargedItem(ItemRegistry.diamondOmnitool, 10), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); - electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", new ItemStack(ItemRegistry.electricGoggles), CraftingAspects.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); + electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", RandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Blocks", new ItemStack(BlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); @@ -239,7 +242,7 @@ public class RecipeRegistry { doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0)); - electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(ItemRegistry.electricScribingTools), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", RandomHelper.getChargedItem(ItemRegistry.electricScribingTools, 10), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.itemEMTItems, 1, 14), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 13), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', IC2Items.getItem("plateiron")); @@ -295,7 +298,7 @@ public class RecipeRegistry { /** IC2 Stuff related recipes **/ - /* Ore Clusters Macerator Recipes */ + /* Ore Clusters Macerator Recipes */ ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy(); ironClusterRecipe.stackSize = 22; Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)), null, ironClusterRecipe); @@ -396,7 +399,7 @@ public class RecipeRegistry { public static InfusionRecipe shardToRedstone; public static InfusionRecipe shardToLapis; public static InfusionRecipe glowstoneDustToBlock; - + public static InfusionRecipe infusedQuantumArmor; public static InfusionRecipe thaumiumDrill; public static InfusionRecipe thaumiumChainsaw; public static InfusionRecipe thaumicQuantumHelmet; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java index 650da6f..bae6b85 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java @@ -54,36 +54,36 @@ public class BlockEMTSolars extends BlockBaseContainer { this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop"); this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop"); - this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/solartop"); - this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/doublesolartop"); - this.top[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/triplesolartop"); - this.top[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/solartop"); - this.top[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/doublesolartop"); - this.top[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/triplesolartop"); - this.top[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/solartop"); - this.top[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/doublesolartop"); - this.top[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/triplesolartop"); - this.top[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/solartop"); - this.top[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/doublesolartop"); - this.top[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/triplesolartop"); - this.top[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/solartop"); + this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); + this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop"); + this.top[5] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop"); + this.top[6] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); + this.top[7] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop"); + this.top[8] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop"); + this.top[9] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); + this.top[10] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop"); + this.top[11] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop"); + this.top[12] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); + this.top[13] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop"); + this.top[14] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop"); + this.top[15] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); - this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterbottom"); - this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterbottom"); - this.bottom[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterbottom"); - this.bottom[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkbottom"); - this.bottom[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkbottom"); - this.bottom[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkbottom"); - this.bottom[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderbottom"); - this.bottom[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderbottom"); - this.bottom[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderbottom"); - this.bottom[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/firebottom"); - this.bottom[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/firebottom"); - this.bottom[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/firebottom"); - this.bottom[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airbottom"); + this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[5] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[6] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[7] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[8] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[9] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[10] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[11] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[12] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[13] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[14] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[15] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); this.frontOff[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); this.frontOff[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); @@ -105,19 +105,19 @@ public class BlockEMTSolars extends BlockBaseContainer { this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside"); - this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside"); - this.side[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside"); - this.side[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside"); - this.side[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside"); - this.side[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside"); - this.side[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside"); - this.side[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside"); - this.side[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside"); - this.side[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside"); - this.side[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside"); - this.side[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside"); - this.side[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); + this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[5] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[6] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[7] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[8] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[9] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[10] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[11] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[12] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[13] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[14] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[15] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java index 2af4728..9fb0301 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java @@ -40,17 +40,17 @@ public class BlockEMTSolars2 extends BlockBaseContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister ri) { - this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/doublesolartop"); - this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/triplesolartop"); - this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/solartop"); - this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/doublesolartop"); - this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/triplesolartop"); + this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); + this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); + this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop"); + this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop"); + this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop"); - this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airbottom"); - this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airbottom"); - this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthbottom"); - this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthbottom"); - this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthbottom"); + this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); + this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom"); this.frontOff[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); this.frontOff[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); @@ -58,11 +58,11 @@ public class BlockEMTSolars2 extends BlockBaseContainer { this.frontOff[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); this.frontOff[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); - this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); - this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); - this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); - this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); - this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); + this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java index 55b39ff..541bcd5 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java @@ -22,7 +22,7 @@ public class BlockRegistry { public static Block emtSolars; public static Block emtMachines; public static Block emtSolars2; - public static Block essentiaGenerator; + //public static Block essentiaGenerator; public static void registerBlocks() { @@ -44,7 +44,7 @@ public class BlockRegistry { essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens"); GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); - essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator"); - GameRegistry.registerBlock(essentiaGenerator, ItemBlockEssentiaGenerator.class, "Essentia Generator"); + //essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator"); + //GameRegistry.registerBlock(essentiaGenerator, ItemBlockEssentiaGenerator.class, "Essentia Generator"); } } diff --git a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java index c94e830..5efcc29 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java @@ -79,8 +79,6 @@ public class ItemRegistry { public static ItemArmor.ArmorMaterial featherWingMaterial = EnumHelper.addArmorMaterial("FEATEHRWiNG", 1, new int[]{2, 2, 2, 2}, 6); public static void registerItems() { - quantumArmor = new ItemEMTQuantum(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + "quantum"); - itemEMTItems = new ItemMaterials().setUnlocalizedName(ModInformation.modid + ".emtitems"); GameRegistry.registerItem(itemEMTItems, "EMTItems"); @@ -90,6 +88,8 @@ public class ItemRegistry { onering = new ItemOneRing(); GameRegistry.registerItem(onering, "BaseBaubles"); + quantumArmor = new ItemEMTQuantum(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + ".quantum"); + electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric"); GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); diff --git a/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java b/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java index f992562..2c93d0d 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java @@ -96,11 +96,6 @@ public class ItemEMTQuantum extends ItemArmorElectric { icon4 = iconRegister.registerIcon(ModInformation.texturePath + ":armor/armor_quantum_chest_wing_q"); } - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int par1, int par2) { - return getIconFromDamage(par1); - } - @SubscribeEvent public void onEntityLivingFallEvent(LivingFallEvent event) { if ((IC2.platform.isSimulating()) && ((event.entity instanceof EntityLivingBase))) { @@ -116,15 +111,14 @@ public class ItemEMTQuantum extends ItemArmorElectric { } } } - - public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase entity, ItemStack armor, DamageSource source, double damage, int slot) - { - return super.getProperties(entity, armor, source, damage, slot); - } public double getDamageAbsorptionRatio() { return 1.1D; } + + private double getBaseAbsorptionRatio() { + return 0.15D; + } public int getEnergyPerDamage() { return 20000; @@ -146,6 +140,12 @@ public class ItemEMTQuantum extends ItemArmorElectric { boolean jetpack = nbtData.getBoolean("jetpack"); boolean hoverMode = nbtData.getBoolean("hoverMode"); boolean jetpackUsed = false; + String useother = nbtData.getString("useother"); + + if(!useother.equals("TW") && !useother.equals("NW") && !useother.equalsIgnoreCase("QW") && !useother.equals("Jetpack") && !useother.equals("None")){ + nbtData.setString("useother", "None"); + } + if ((IC2.keyboard.isJumpKeyDown(player)) && (IC2.keyboard.isModeSwitchKeyDown(player)) && (toggleTimer == 0)) { toggleTimer = 30; hoverMode = !hoverMode; @@ -163,7 +163,7 @@ public class ItemEMTQuantum extends ItemArmorElectric { } if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && (player.inventory.getCurrentItem().getUnlocalizedName().equals("ic2.itemArmorJetpackElectric")) && toggleTimer == 0){ + if(IC2.keyboard.isSneakKeyDown(player) && (player.inventory.getCurrentItem().getUnlocalizedName().equals("ic2.itemArmorJetpackElectric")) && toggleTimer == 0 && nbtData.getString("useother").equals("None")){ toggleTimer = 30; if (IC2.platform.isSimulating()) { player.inventory.armorInventory[2].stackTagCompound.setBoolean("jetpack", true); @@ -178,7 +178,7 @@ public class ItemEMTQuantum extends ItemArmorElectric { } if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && (player.inventory.getCurrentItem().getUnlocalizedName().equals("item.EMT.wing.thaumium")) && toggleTimer == 0){ + if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing && toggleTimer == 0 && nbtData.getString("useother").equals("None")){ toggleTimer = 30; if (IC2.platform.isSimulating()) { IC2.platform.messagePlayer(player, "Thaumium wings enabled.", new Object[0]); @@ -191,12 +191,13 @@ public class ItemEMTQuantum extends ItemArmorElectric { } if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && (player.inventory.getCurrentItem().getUnlocalizedName().equals("item.EMT.wing.nano")) && toggleTimer == 0){ + if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing && toggleTimer == 0 && nbtData.getString("useother").equals("None")){ toggleTimer = 30; if (IC2.platform.isSimulating()) { IC2.platform.messagePlayer(player, "Nano wings enabled.", new Object[0]); if(player.inventory.armorInventory[2] == itemStack){ player.inventory.armorInventory[2].stackTagCompound.setString("useother", "NW"); + player.inventory.armorInventory[2].stackTagCompound.setInteger("NWCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem())); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } } @@ -204,12 +205,13 @@ public class ItemEMTQuantum extends ItemArmorElectric { } if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && (player.inventory.getCurrentItem().getUnlocalizedName().equals("item.EMT.wing.quantum")) && toggleTimer == 0){ + if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing && toggleTimer == 0 && nbtData.getString("useother").equals("None")){ toggleTimer = 30; if (IC2.platform.isSimulating()) { IC2.platform.messagePlayer(player, "Quantum wings enabled.", new Object[0]); if(player.inventory.armorInventory[2] == itemStack){ player.inventory.armorInventory[2].stackTagCompound.setString("useother", "QW"); + player.inventory.armorInventory[2].stackTagCompound.setInteger("QWCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem())); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } } @@ -225,7 +227,10 @@ public class ItemEMTQuantum extends ItemArmorElectric { jetpack = false; player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem()); - ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), true, false); + if(player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge") > 50) + ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), true, false); + else + ElectricItem.manager.charge(charged, 50, 50, true, false); player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); } @@ -238,13 +243,23 @@ public class ItemEMTQuantum extends ItemArmorElectric { if(player.inventory.armorInventory[2].stackTagCompound.getString("useother").equals("NW")){ IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]); player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); - player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.nanoWing)); + ItemStack charged = new ItemStack(ItemRegistry.nanoWing); + if(player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge") > 1) + ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), true, false); + else + ElectricItem.manager.charge(charged, 1, 1, true, false); + player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); } if(player.inventory.armorInventory[2].stackTagCompound.getString("useother").equals("QW")){ IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]); player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); - player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.quantumWing)); + ItemStack charged = new ItemStack(ItemRegistry.quantumWing); + if(player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge") > 1) + ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), true, false); + else + ElectricItem.manager.charge(charged, 1, 1, true, false); + player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); } } } @@ -255,20 +270,19 @@ public class ItemEMTQuantum extends ItemArmorElectric { } if ((player.inventory.armorInventory[2].stackTagCompound.getString("useother").equals("TW"))) { - useWings(player, itemStack, world, 0.15f, 0.8f, 0.5f); + useWings(player, itemStack, world, 0.15f, 0.7f, 0.5f, false); } if ((player.inventory.armorInventory[2].stackTagCompound.getString("useother").equals("NW"))) { - useWings(player, itemStack, world, 0.25f, 0.7f, 0.3f); + useWings(player, itemStack, world, 0.25f, 0.6f, 0.3f, true); } if ((player.inventory.armorInventory[2].stackTagCompound.getString("useother").equals("QW"))) { - useWings(player, itemStack, world, 0.33f, 0.6f, 0.3f); + useWings(player, itemStack, world, 0.33f, 0.5f, 0.2f, true); } if ((IC2.platform.isSimulating()) && (toggleTimer > 0)) { toggleTimer = (byte) (toggleTimer - 1); - nbtData.setByte("toggleTimer", toggleTimer); } if ((IC2.platform.isRendering()) && (player == IC2.platform.getPlayerInstance())) { @@ -291,9 +305,9 @@ public class ItemEMTQuantum extends ItemArmorElectric { } } - if(world.isRemote) + if(world.isRemote){ getIconIndex(itemStack); - + } ret = jetpackUsed; player.extinguish(); @@ -308,20 +322,33 @@ public class ItemEMTQuantum extends ItemArmorElectric { @SideOnly(Side.CLIENT) @Override public IIcon getIconIndex(ItemStack stack){ - if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){ - return icon1; + try{ + if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){ + return icon1; + } + if((stack.stackTagCompound.getString("useother")).equals("TW")){ + return icon2; + } + if((stack.stackTagCompound.getString("useother")).equals("NW")){ + return icon3; + } + if((stack.stackTagCompound.getString("useother")).equals("QW")){ + return icon4; + } } - if((stack.stackTagCompound.getString("useother")).equals("TW")){ - return icon2; - } - if((stack.stackTagCompound.getString("useother")).equals("NW")){ - return icon3; - } - if((stack.stackTagCompound.getString("useother")).equals("QW")){ - return icon4; + catch(Exception ex){ + return icon0; } + return icon0; } + + @SideOnly(Side.CLIENT) + @Override + public IIcon getIconFromDamage(int par1) + { + return icon0; + } @Override public int getItemEnchantability() { @@ -347,7 +374,7 @@ public class ItemEMTQuantum extends ItemArmorElectric { if((stack.stackTagCompound.getString("useother")).equals("QW")){ return ModInformation.texturePath + ":textures/models/quantum_wings_q.png"; } - return super.getArmorTexture(stack, entity, slot, type); + return ModInformation.texturePath + ":textures/models/quantum.png"; } @Override @@ -367,10 +394,16 @@ public class ItemEMTQuantum extends ItemArmorElectric { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add(String.valueOf((int)ElectricItem.manager.getCharge(stack)) + " EU"); - if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){ + list.add(String.valueOf((int)ElectricItem.manager.getCharge(stack)) + "EU"); + if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){ list.add((stack.stackTagCompound.getInteger("jetpackCharge")) + " EU JETPACK"); } + if((stack.stackTagCompound.getString("useother")).equals("NW")){ + list.add((stack.stackTagCompound.getInteger("NWCharge")) + " EU NW"); + } + if((stack.stackTagCompound.getString("useother")).equals("QW")){ + list.add((stack.stackTagCompound.getInteger("QWCharge")) + " EU QW"); + } } public boolean useJetpack(EntityPlayer player, boolean hoverMode, ItemStack stack) { @@ -433,35 +466,39 @@ public class ItemEMTQuantum extends ItemArmorElectric { return true; } - void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1){ + void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, boolean isElectric){ NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack); - nbtData.setBoolean("isJumping", IC2.keyboard.isJumpKeyDown(player)); - if(nbtData.getBoolean("isJumping")){ - nbtData.setBoolean("isHolding", true); - f += 1; - if(f > 7) f = 7; - } - else if(nbtData.getBoolean("isHolding")){ - nbtData.setBoolean("isHolding", false); - player.motionY = motionY * f; - player.motionX /= motionXZ; - player.motionZ /= motionXZ; - f = 0; - } + if((nbtData.getString("useother").equals("NW") && nbtData.getInteger("NWCharge") > 0) || (nbtData.getString("useother").equals("QW") && nbtData.getInteger("QWCharge") > 0) || nbtData.getString("useother").equals("TW")){ + + nbtData.setBoolean("isJumping", IC2.keyboard.isJumpKeyDown(player)); + if(nbtData.getBoolean("isJumping")){ + nbtData.setBoolean("isHolding", true); + nbtData.setInteger("f", nbtData.getInteger("f") + 1); + if(nbtData.getInteger("f") > 7) nbtData.setInteger("f", 7); + } + else if(nbtData.getBoolean("isHolding")){ + nbtData.setBoolean("isHolding", false); + player.motionY = motionY * nbtData.getInteger("f"); + player.motionX /= motionXZ; + player.motionZ /= motionXZ; + world.playSoundEffect(player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, "mob.ghast.fireball", 1.0F, 0.7F + 0.3F); + nbtData.setInteger("f", 0); + } - if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0 && !player.capabilities.isCreativeMode) - player.motionY *= f1; + if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0) + player.motionY *= f1; - if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2; + if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2; - if(ConfigHandler.impactOfRain){ - if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) + if(ConfigHandler.impactOfRain){ + if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) player.motionY = -0.3; - } + } - if (player.isSneaking() && !player.onGround) player.motionY = -0.6; + if (player.isSneaking() && !player.onGround) player.motionY = -0.6; - if (player.fallDistance > 0.0F) player.fallDistance = 0; + if (player.fallDistance > 0.0F) player.fallDistance = 0; + } } } \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java index 5980d23..f50bfd3 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java @@ -41,7 +41,6 @@ public class ItemFeatherWing extends ItemArmor { @Override @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - if(stack.stackTagCompound.getBoolean("isJumping")){ return ModInformation.texturePath + ":textures/models/quantumwing.png";} return ModInformation.texturePath + ":textures/models/featherwing.png"; } @@ -68,19 +67,20 @@ public class ItemFeatherWing extends ItemArmor { if(nbtData.getBoolean("isJumping")){ nbtData.setBoolean("isHolding", true); - f += 1; - if(f > 7) f = 7; + nbtData.setInteger("f", nbtData.getInteger("f") + 1); + if(nbtData.getInteger("f") > 7) nbtData.setInteger("f", 7); } else if(nbtData.getBoolean("isHolding")){ nbtData.setBoolean("isHolding", false); - player.motionY = motionY * f; + player.motionY = motionY * nbtData.getInteger("f"); player.motionX /= motionXZ; player.motionZ /= motionXZ; - f = 0; + world.playSoundEffect(player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, "mob.ghast.fireball", 1.0F, 0.7F + 0.3F); + nbtData.setInteger("f", 0); } - if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0 && !player.capabilities.isCreativeMode) + if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0) player.motionY *= f1; if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java index 918bd9e..89c141c 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java @@ -66,7 +66,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - this.updateWings(player, stack, world, 0.25f, 0.7f, 0.3f); + this.updateWings(player, stack, world, 0.25f, 0.6f, 0.3f); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java index 0286d37..5f375a4 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java @@ -39,6 +39,6 @@ public class ItemQuantumWing extends ItemNanoWing { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - this.updateWings(player, stack, world, 0.33f, 0.6f, 0.3f); + this.updateWings(player, stack, world, 0.33f, 0.5f, 0.2f); } } diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java index f1fd870..d40fd60 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java @@ -57,39 +57,6 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - this.updateWings(player, stack, world, 0.15f, 0.8f, 0.5f); - - - NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack); - - nbtData.setBoolean("isJumping", IC2.keyboard.isJumpKeyDown(player)); - - if (world.isRemote) { - if(nbtData.getBoolean("isJumping")){ - nbtData.setBoolean("isHolding", true); - f += 1; - if(f > 7) f = 7; - } - else if(nbtData.getBoolean("isJumping")){ - nbtData.setBoolean("isHolding", false); - player.motionY = 0.15 * f; - player.motionX /= 0.8; - player.motionZ /= 0.8; - f = 0; - } - - if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0 && !player.capabilities.isCreativeMode) - player.motionY *= 0.5; - - if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2; - - if(ConfigHandler.impactOfRain){ - if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) - player.motionY = -0.3; - } - - if (player.isSneaking() && !player.onGround) player.motionY = -0.6; - } - if (player.fallDistance > 0.0F) player.fallDistance = 0; + this.updateWings(player, stack, world, 0.15f, 0.7f, 0.5f); } } diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java index e88eff6..d2303d0 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemBaseFocus.java @@ -29,7 +29,7 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { public ItemBaseFocus(String unlocName, String textureName) { super(); - setUnlocalizedName(ModInformation.modid + ".module." + unlocName); + setUnlocalizedName(ModInformation.modid + unlocName); setCreativeTab(ElectroMagicTools.tabEMT); setMaxDamage(1); setNoRepair(); diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java index 29942a0..738fa41 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java @@ -29,7 +29,7 @@ public class ItemChargeFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); public ItemChargeFocus() { - super("ic2.focus.charge", "focus_charge"); + super(".focus.charge", "focus_charge"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java index aca5748..7594c7e 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java @@ -33,7 +33,7 @@ public class ItemChristmasFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); public ItemChristmasFocus() { - super("base.focus.christmas", "focus_christmas" ); + super(".focus.christmas", "focus_christmas" ); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java index 7715068..6a8db61 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java @@ -27,7 +27,7 @@ public class ItemExplosionFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200); public ItemExplosionFocus() { - super("base.focus.explosion", "focus_explosion"); + super(".focus.explosion", "focus_explosion"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java index 3b2de3e..001e354 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java @@ -32,7 +32,7 @@ public class ItemShieldFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10); public ItemShieldFocus() { - super("base.focus.shield", "focus_shield"); + super(".focus.shield", "focus_shield"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java index b2a0942..84995f9 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemWandChargingFocus.java @@ -14,7 +14,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus { AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); public ItemWandChargingFocus() { - super("ic2.focus.charge.wand", "focus_wandCharge"); + super(".focus.charge.wand", "focus_wandCharge"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java index 3d7f99b..b37b39a 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java @@ -16,16 +16,27 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.blocks.BlockCustomPlant; +import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.items.equipment.ItemElementalHoe; +import thaumcraft.common.lib.utils.Utils; import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.ModInformation; import java.util.List; -public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectricItem { +public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { public IIcon icon; public int maxCharge = 1000000; @@ -36,14 +47,13 @@ public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectric super(ToolMaterial.EMERALD); this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); + this.growthCost = 10000; } -// Why this no work? :( -// @SideOnly(Side.CLIENT) -// @Override -// public void registerIcons(IIconRegister iconRegister) { -// this.icon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/hoe_growth"); -// } + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + this.icon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/hoe_growth"); + } @SuppressWarnings({"rawtypes", "unchecked"}) @SideOnly(Side.CLIENT) @@ -58,17 +68,77 @@ public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectric itemList.add(new ItemStack(this, 1, getMaxDamage())); } } + + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1) + { + return this.icon; + } @Override public boolean isRepairable() { return false; } + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) + { + if(ElectricItem.manager.getCharge(stack) > 10000){ + boolean did = false; + for (int x1 = -1; x1 <= 1; x1++) { + for (int z1 = -1; z1 <= 1; z1++) { + if (super.onItemUse(stack, player, world, x + x1, y, z + z1, par7, par8, par9, par10)) + { + ElectricItem.manager.discharge(stack, 250, 2, true, false, false); + Thaumcraft.proxy.blockSparkle(world, x + x1, y, z + z1, 8401408, 2); + if (!did) { + did = true; + } + } + } + } + if (!did) + { + did = Utils.useBonemealAtLoc(world, player, x, y, z); + if (!did) + { + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + if ((block == ConfigBlocks.blockCustomPlant) && (meta == 0) && (ElectricItem.manager.getCharge(stack) + 20 <= this.getMaxCharge(stack))) + { + ((BlockCustomPlant)block).growGreatTree(world, x, y, z, world.rand); + ElectricItem.manager.discharge(stack, 50, 2, true, false, false); + Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 2); + did = true; + } + else if ((block == ConfigBlocks.blockCustomPlant) && (meta == 1) && (ElectricItem.manager.getCharge(stack) + 150 <= this.getMaxCharge(stack))) + { + ((BlockCustomPlant)block).growSilverTree(world, x, y, z, world.rand); + ElectricItem.manager.discharge(stack, 250, 2, true, false, false); + Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 2); + did = true; + } + } + else + { + ElectricItem.manager.discharge(stack, 1, 2, true, false, false); + Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 3); + } + if (did) { + world.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "thaumcraft:wand", 0.75F, 0.9F + world.rand.nextFloat() * 0.2F); + } + } + return did; + } + else + return false; + } /* IC2 API METHODS */ @Override public boolean canProvideEnergy(ItemStack itemStack) { - return false; + return true; } @Override @@ -78,7 +148,7 @@ public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectric @Override public int getTier(ItemStack itemStack) { - return 3; + return 1; } @Override @@ -88,7 +158,7 @@ public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectric @Override public Item getChargedItem(ItemStack itemStack) { - return this; + return this; } @Override diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java b/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java index 15bfc46..fa19f33 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/TileEntitySolarBase.java @@ -10,7 +10,7 @@ import java.util.Random; public abstract class TileEntitySolarBase extends TileEntityEMT implements IWrenchable { - public BasicSource energySource = new BasicSource(this, 10000, 1); + public BasicSource energySource= new BasicSource(this, 10000, 4); public static Random random = new Random(); public boolean initialized; public boolean theSunIsVisible; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java index c48017d..0751cf0 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java @@ -12,6 +12,7 @@ package tombenpotter.emt.common.tile.solars.air; +import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.blocks.BlockRegistry; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java index a3f687c..eb23105 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java @@ -12,6 +12,7 @@ package tombenpotter.emt.common.tile.solars.air; +import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.blocks.BlockRegistry; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java index 2c61590..1a379eb 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java @@ -12,6 +12,7 @@ package tombenpotter.emt.common.tile.solars.air; +import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.blocks.BlockRegistry; diff --git a/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java b/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java index 2f4f8a2..6640290 100644 --- a/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java @@ -13,7 +13,6 @@ public class ConfigHandler { public static String CATEGORY_RESEARCH = "Research"; public static String CATEGORY_VALUES = "Numeric Values"; public static String CATEGORY_OUTPUTS = "Essentia Generator Outputs"; - public static String CATEGORY_MODULES = "Modules"; public static int essentiaGeneratorsDelay; public static int etherealProcessorBaseSpeed; @@ -105,9 +104,6 @@ public class ConfigHandler { public static boolean quantumWingsResearch; public static boolean aerGeneratorResearch; - public static boolean enableIC2Module; - public static boolean enableTEModule; - public static void init(File file) { config = new Configuration(file); syncConfig(); @@ -119,7 +115,6 @@ public class ConfigHandler { config.addCustomCategoryComment(CATEGORY_RESEARCH, "The only way to disable some researches. " + "Be careful, if you disable some researches, " + "all researches linked to it will be removed too. " + "Really, don't touch that unless you know exactly what you are doing."); config.addCustomCategoryComment(CATEGORY_OUTPUTS, "Change outputs linked to different Essentias here"); config.addCustomCategoryComment(CATEGORY_RANDOM, "Options that don't fit into the other categories."); - config.addCustomCategoryComment(CATEGORY_MODULES, "Currently does nothing. Here for dev purposes."); capesOn = config.get(CATEGORY_RANDOM, "Enable capes", true, "This config option is to enable or disable capes for people who have them. " + "Seriously, you shouldn't touch that unless you have another cape and " + "it conflicts with it.").getBoolean(capesOn); toolsInBore = config.get(CATEGORY_RANDOM, "Tools for Arcane Bore", false, "This will augment the durablilty of the tools, and will also decrease the EU cost to 1. " + "The tools should have the same number of uses than before.").getBoolean(toolsInBore); @@ -205,9 +200,6 @@ public class ConfigHandler { quantumWingsResearch = config.get(CATEGORY_RESEARCH, "Quantum Wings", false).getBoolean(quantumWingsResearch); aerGeneratorResearch = config.get(CATEGORY_RESEARCH, "Aer Generator", false).getBoolean(aerGeneratorResearch); - enableIC2Module = config.get(CATEGORY_MODULES, "IC2 Module", true).getBoolean(enableIC2Module); - enableTEModule = config.get(CATEGORY_MODULES, "TE Module", true).getBoolean(enableTEModule); - if (config.hasChanged()) { config.save(); } diff --git a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java b/src/main/java/tombenpotter/emt/common/util/RandomHelper.java index c70ad76..5d8b2d7 100644 --- a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java +++ b/src/main/java/tombenpotter/emt/common/util/RandomHelper.java @@ -1,5 +1,7 @@ package tombenpotter.emt.common.util; +import ic2.api.item.ElectricItem; +import tombenpotter.emt.common.items.ItemRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -43,5 +45,9 @@ public class RandomHelper { return false; } - + public static ItemStack getChargedItem(Item item, int charge){ + ItemStack stack = new ItemStack(item); + ElectricItem.manager.charge(stack, charge, charge, true, false); + return stack; + } } diff --git a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java index 8e48abd..b8e48af 100644 --- a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java @@ -1,6 +1,7 @@ package tombenpotter.emt.common.util; -import tombenpotter.emt.EMTResearch; +import tombenpotter.emt.common.EMTResearch; + public class RegistryHandler { diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 4d0d972..45ee07d 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -77,6 +77,7 @@ item.EMT.wing.feather.name=Feather Duct-Taped Wings item.EMT.wing.thaumium.name=Thaumium Reinforced Wings item.EMT.wing.nano.name=Nanosuit Wings item.EMT.wing.quantum.name=Quantum Wings +ic2.EMT.quantum=Infused Quantum Сhestplate item.EMT.hammer.broken.name=Broken Relic of Mjolnir item.EMT.hammer.name=Mjolnir @@ -95,83 +96,11 @@ item.EMT.chainsaw.stream.name=Chainsaw of the Stream item.EMT.drill.rockbreaker.name=Drill of the Rockbreaker item.EMT.hoeofgrowth.electric.name=Electric Hoe of Growth -item.EMT.module.base.focus.explosion.name=Wand Focus: Explosion -item.EMT.module.base.focus.christmas.name=Wand Focus: Kris-tmas -item.EMT.module.base.focus.shield.name=Wand Focus: Shield -item.EMT.module.ic2.focus.charge.name=Wand Focus: Charging -item.EMT.module.ic2.focus.charge.wand.name=Wand Focus: Wand Charging - -item.EMT.drill.wood.name=Wooden Drill -item.EMT.drill.stone.name=Stone Drill -item.EMT.drill.iron.name=Iron Drill -item.EMT.drill.gold.name=Golden Drill -item.EMT.drill.diamond.name=Diamond Drill -item.EMT.drill.copper.name=Copper Drill -item.EMT.drill.tin.name=Tin Drill -item.EMT.drill.lead.name=Lead Drill -item.EMT.drill.bronze.name=Bronze Drill - -item.EMT.chainsaw.wood.name=Wooden Chainsaw -item.EMT.chainsaw.stone.name=Stone Chainsaw -item.EMT.chainsaw.iron.name=Iron Chainsaw -item.EMT.chainsaw.gold.name=Golden Chainsaw -item.EMT.chainsaw.diamond.name=Diamond Chainsaw -item.EMT.chainsaw.copper.name=Copper Chainsaw -item.EMT.chainsaw.tin.name=Tin Chainsaw -item.EMT.chainsaw.lead.name=Lead Chainsaw -item.EMT.chainsaw.bronze.name=Bronze Chainsaw - -item.EMT.omnitool.iron.name=Iron Omnitool -item.EMT.omnitool.gold.name=Golden Omnitool -item.EMT.omnitool.diamond.name=Diamond Omnitool -item.EMT.omnitool.copper.name=Copper Omnitool -item.EMT.omnitool.tin.name=Tin Omnitool -item.EMT.omnitool.lead.name=Lead Omnitool -item.EMT.omnitool.bronze.name=Bronze Omnitool - -item.EMT.module.base.components.drillTop.wood.name=Wooden Drill Top -item.EMT.module.base.components.drillTop.stone.name=Stone Drill Top -item.EMT.module.base.components.drillTop.iron.name=Iron Drill Top -item.EMT.module.base.components.drillTop.gold.name=Golden Drill Top -item.EMT.module.base.components.drillTop.diamond.name=Diamond Drill Top -item.EMT.module.base.components.drillTop.tin.name=Tin Drill Top -item.EMT.module.base.components.drillTop.copper.name=Copper Drill Top -item.EMT.module.base.components.drillTop.lead.name=Lead Drill Top -item.EMT.module.base.components.drillTop.bronze.name=Bronze Drill Top - -item.EMT.module.base.components.chainsawTop.wood.name=Wooden Chainsaw Top -item.EMT.module.base.components.chainsawTop.stone.name=Stone Chainsaw Top -item.EMT.module.base.components.chainsawTop.iron.name=Iron Chainsaw Top -item.EMT.module.base.components.chainsawTop.gold.name=Golden Chainsaw Top -item.EMT.module.base.components.chainsawTop.diamond.name=Diamond Chainsaw Top -item.EMT.module.base.components.chainsawTop.tin.name=Tin Chainsaw Top -item.EMT.module.base.components.chainsawTop.copper.name=Copper Chainsaw Top -item.EMT.module.base.components.chainsawTop.lead.name=Lead Chainsaw Top -item.EMT.module.base.components.chainsawTop.bronze.name=Bronze Chainsaw Top - -item.EMT.module.base.components.omnitoolTop.iron.name=Iron Omnitool Top -item.EMT.module.base.components.omnitoolTop.gold.name=Golden Omnitool Top -item.EMT.module.base.components.omnitoolTop.diamond.name=Diamond Omnitool Top -item.EMT.module.base.components.omnitoolTop.copper.name=Copper Omnitool Top -item.EMT.module.base.components.omnitoolTop.tin.name=Tin Omnitool Top -item.EMT.module.base.components.omnitoolTop.lead.name=Lead Omnitool Top -item.EMT.module.base.components.omnitoolTop.bronze.name=Bronze Omnitool Top - -item.EMT.module.base.components.shard.wood.name=Wooden Shard -item.EMT.module.base.components.shard.stone.name=Stone Shard -item.EMT.module.base.components.shard.iron.name=Iron Shard -item.EMT.module.base.components.shard.gold.name=Golden Shard -item.EMT.module.base.components.shard.obsidian.name=Obsidian Shard -item.EMT.module.base.components.shard.copper.name=Copper Shard -item.EMT.module.base.components.shard.tin.name=Tin Shard -item.EMT.module.base.components.shard.lead.name=Lead Shard -item.EMT.module.base.components.shard.bronze.name=Bronze Shard - -item.EMT.carver.wood.name=Wooden Shard Carver -item.EMT.carver.stone.name=Stone Shard Carver -item.EMT.carver.iron.name=Iron Shard Carver -item.EMT.carver.obsidian.name=Obsidian Shard Carver -item.EMT.carver.diamond.name=Diamond Shard Carver +item.EMT.focus.explosion.name=Wand Focus: Explosion +item.EMT.focus.christmas.name=Wand Focus: Kris-tmas +item.EMT.focus.shield.name=Wand Focus: Shield +item.EMT.focus.charge.name=Wand Focus: Charging +item.EMT.focus.charge.wand.name=Wand Focus: Wand Charging #=============Block Names============= tile.EMT.shield.name=Shield Block @@ -260,7 +189,8 @@ emt.tag.The One Ring=Forged inside the pit of the volcanic Mount Doom... emt.tag.Feather Wings=It only works in anime... emt.tag.Thaumium Reinforced Wings=Already much better emt.tag.Nanosuit Wings=Nanotechnologies to the rescue! -emt.tag.Quantum Wings=The last step is here... +emt.tag.Quantum Wings=Quantum technologies. +emt.tag.InfusedQuantumArmor=The last step is here... #=============Thaumonomicon Texts============= emt.rsname.Electric Magic Tools=Electric Magic Tools @@ -381,7 +311,7 @@ emt.rsname.Order Infused Solar Panels=Order Infused Solar Panels emt.text.Order Infused Solar Panels=Harnessing the power of Order, you have managed to triple the output of your Solar Panels at day! emt.rsname.Fire Infused Solar Panels=Fire Infused Solar Panels -emt.text.Fire Infused Solar Panels=Fascinated by the Nether, you created a monster. These Solar Panels work like normal in the Overworld, but also produce more energy when they are located in the Nether! A monster I tell you.. +emt.text.Fire Infused Solar Panels=Fascinated by the Nether, you created a monster. These Solar Panels work like normal in the Overworld, but also produce more energy when they are located in the Nether! A monster I tell you... emt.rsname.Air Infused Solar Panels=Air Infused Solar Panels emt.text.Air Infused Solar Panels=Your adventurous mind and the natural amount of air existing at the top of the world make these Solar Panels yield more energy when located over Y = 160. @@ -424,6 +354,9 @@ emt.text.Nanosuit Wings=Combining the magic harnessed by Thaumium with the nanot emt.rsname.Quantum Wings=Quantum Wings emt.text.Quantum Wings=After exploring all the possibilities of nanotechnologies, you decided to do the last jump. Quantum. You can thrust yourself many blocks high, have a very good protection, and your fall is slowed down a lot. However, the quantum unpredictability happened once again. Your fall will be completely stopped when spacebar and sneak are maintained. You don't know why, but it works. Included: fall damage reduction, 100%. + +emt.rsname.InfusedQuantumArmor=Infused Quantum Сhestplate. +emt.text.InfusedQuantumArmor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + Ctrl. #=============Console Logging============= console.EMT.preInit.begin=Starting planning the world domination console.EMT.preInit.configRead=Creating/Reading the config file diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index 2a33405..8f7a125 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -77,6 +77,7 @@ item.EMT.wing.feather.name=Склеенные крылья из картона item.EMT.wing.thaumium.name=Укреплённые таум-крылья item.EMT.wing.nano.name=Нано-крылья item.EMT.wing.quantum.name=Квантовые крылья +ic2.EMT.quantum=Наполненный квантовый нагрудник item.EMT.hammer.broken.name=Сломанная реликвия Мьёлнира item.EMT.hammer.name=Мьёлнир @@ -95,83 +96,11 @@ item.EMT.chainsaw.stream.name=Электропила Потока item.EMT.drill.rockbreaker.name=Бур Камнелома item.EMT.hoeofgrowth.electric.name=Электрическая мотыга Роста -item.EMT.module.base.focus.explosion.name=Набалдашник: Взрыв -item.EMT.module.base.focus.christmas.name=Набалдашник: Рождество -item.EMT.module.base.focus.shield.name=Набалдашник: Щит -item.EMT.module.ic2.focus.charge.name=Набалдашник: Зарядка -item.EMT.module.ic2.focus.charge.wand.name=Набалдашник: Зарядка жезла - -item.EMT.drill.wood.name -item.EMT.drill.stone.name -item.EMT.drill.iron.name -item.EMT.drill.gold.name -item.EMT.drill.diamond.name -item.EMT.drill.copper.name -item.EMT.drill.tin.name -item.EMT.drill.lead.name -item.EMT.drill.bronze.name - -item.EMT.chainsaw.wood.name -item.EMT.chainsaw.stone.name -item.EMT.chainsaw.iron.name -item.EMT.chainsaw.gold.name -item.EMT.chainsaw.diamond.name -item.EMT.chainsaw.copper.name -item.EMT.chainsaw.tin.name -item.EMT.chainsaw.lead.name -item.EMT.chainsaw.bronze.name - -item.EMT.omnitool.iron.name -item.EMT.omnitool.gold.name -item.EMT.omnitool.diamond.name -item.EMT.omnitool.copper.name -item.EMT.omnitool.tin.name -item.EMT.omnitool.lead.name -item.EMT.omnitool.bronze.name - -item.EMT.module.base.components.drillTop.wood.name=Wooden Drill Top -item.EMT.module.base.components.drillTop.stone.name=Stone Drill Top -item.EMT.module.base.components.drillTop.iron.name=Iron Drill Top -item.EMT.module.base.components.drillTop.gold.name=Golden Drill Top -item.EMT.module.base.components.drillTop.diamond.name=Diamond Drill Top -item.EMT.module.base.components.drillTop.tin.name=Tin Drill Top -item.EMT.module.base.components.drillTop.copper.name=Copper Drill Top -item.EMT.module.base.components.drillTop.lead.name=Lead Drill Top -item.EMT.module.base.components.drillTop.bronze.name=Bronze Drill Top - -item.EMT.module.base.components.chainsawTop.wood.name=Wooden Chainsaw Top -item.EMT.module.base.components.chainsawTop.stone.name=Stone Chainsaw Top -item.EMT.module.base.components.chainsawTop.iron.name=Iron Chainsaw Top -item.EMT.module.base.components.chainsawTop.gold.name=Golden Chainsaw Top -item.EMT.module.base.components.chainsawTop.diamond.name=Diamond Chainsaw Top -item.EMT.module.base.components.chainsawTop.tin.name=Tin Chainsaw Top -item.EMT.module.base.components.chainsawTop.copper.name=Copper Chainsaw Top -item.EMT.module.base.components.chainsawTop.lead.name=Lead Chainsaw Top -item.EMT.module.base.components.chainsawTop.bronze.name=Bronze Chainsaw Top - -item.EMT.module.base.components.omnitoolTop.iron.name=Iron Omnitool Top -item.EMT.module.base.components.omnitoolTop.gold.name=Golden Omnitool Top -item.EMT.module.base.components.omnitoolTop.diamond.name=Diamond Omnitool Top -item.EMT.module.base.components.omnitoolTop.copper.name=Copper Omnitool Top -item.EMT.module.base.components.omnitoolTop.tin.name=Tin Omnitool Top -item.EMT.module.base.components.omnitoolTop.lead.name=Lead Omnitool Top -item.EMT.module.base.components.omnitoolTop.bronze.name=Bronze Omnitool Top - -item.EMT.module.base.components.shard.wood.name -item.EMT.module.base.components.shard.stone.name -item.EMT.module.base.components.shard.iron.name -item.EMT.module.base.components.shard.gold.name -item.EMT.module.base.components.shard.obsidian.name -item.EMT.module.base.components.shard.copper.name -item.EMT.module.base.components.shard.tin.name -item.EMT.module.base.components.shard.lead.name -item.EMT.module.base.components.shard.bronze.name - -item.EMT.carver.wood.name=Деревянный резчик по осколкам -item.EMT.carver.stone.name=Каменный резчик по осколкам -item.EMT.carver.iron.name=Железный резчик по осколкам -item.EMT.carver.obsidian.name=Обсидиановый резчик по осколкам -item.EMT.carver.diamond.name=Алмазный резчик по осколкам +item.EMT.focus.explosion.name=Набалдашник: Взрыв +item.EMT.focus.christmas.name=Набалдашник: Рождество +item.EMT.focus.shield.name=Набалдашник: Щит +item.EMT.focus.charge.name=Набалдашник: Зарядка +item.EMT.focus.charge.wand.name=Набалдашник: Зарядка жезла #=============Block Names============= tile.EMT.shield.name=Щит-блок @@ -420,8 +349,12 @@ emt.tag.Nanosuit Wings=Нанотехнологии в помощь! emt.text.Nanosuit Wings=Объединение магии таум-металла с нанотехнологиями в Ваших крыльях.. кажется логичным. Вы можете взлететь намного выше, чем когда-либо, и падать намного медленнее, если пробел зажат. Также включает: уменьшение урона от падения на 75%. emt.rsname.Quantum Wings=Квантовые крылья -emt.tag.Quantum Wings=Последний шаг... -emt.text.Quantum Wings=После исследования всех возможностей нанотехнологий, Вы решили сделать последний прыжок. Квантовый. Вы можете взмыть на много блоков вверх, имея очень хорошую защиту и Ваше падение будет замедленно. Однако квантовая непредсказуемость случается. Ваше падение будет полностью остановлено, когда кнопки пробел и приседания зажаты. Вы не знаете, почему, но это работает. Также включает: уменьшение урона от падения на 100%. +emt.tag.Quantum Wings=А вот и квантовые технологии! +emt.text.Quantum Wings=После исследования всех возможностей нанотехнологий, Вы решили сделать последний прыжок. Квантовый. Вы можете взмыть на много блоков вверх, имея очень хорошую защиту и Ваше падение будет замедленно. Однако квантовая непредсказуемость случается. Ваше падение будет полностью остановлено, когда кнопки пробел и приседания зажаты. Вы не знаете почему, но это работает. Также включает: уменьшение урона от падения на 100%. + +emt.rsname.InfusedQuantumArmor=Наполненный квантовый нагрудник. +emt.tag.InfusedQuantumArmor=Последний шаг... +emt.text.InfusedQuantumArmor=Вам было нечего делать, и Вы решили заняться хоть чем-то полезным. Вам в голову пришла идея создания брони, на которую можно нацепить крылья или ранец, чтобы быть защищёнными в полёте. Возмите в руку крылья или ранец, и присядьте чтобы надеть их на броню. Чтобы снять их, зажмите Shift + LCtrl. #=============Console Logging============= console.EMT.preInit.begin=Начало планирования над мировым господством diff --git a/src/main/resources/assets/electromagictools/textures/blocks/portablenode.png b/src/main/resources/assets/electromagictools/textures/blocks/portablenode.png index 9898336..2cddb74 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/portablenode.png and b/src/main/resources/assets/electromagictools/textures/blocks/portablenode.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png index 15a9035..d0da022 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png index 9ddf27c..23964cf 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png index bd4b554..60e0fc2 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png index 797aa00..49c6438 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png index e860147..a8d1558 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png index 06ce193..06ab98a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png index ec7191a..6291f21 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png index 1ded25e..e9bb63a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png index ddf4eb3..5c4da47 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png index efe16f0..25aeee7 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png index e30fe95..29b2f84 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest.png b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest.png index e74cbc4..c7d6b35 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest.png and b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_jetpack.png b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_jetpack.png index e8943ed..a7c61e2 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_jetpack.png and b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_jetpack.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_n.png b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_n.png index 756315d..fc4a98a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_n.png and b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_n.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_q.png b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_q.png index 118379d..0fbaf65 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_q.png and b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_q.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_t.png b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_t.png index 0770e56..a6c8b7d 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_t.png and b/src/main/resources/assets/electromagictools/textures/items/armor/armor_quantum_chest_wing_t.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png index 75c62e8..a042d0d 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png index a6fcc90..6532cf4 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png index 1cdcde5..3b1f995 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png index 3e506ac..2110211 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png index 15122a1..ec57b1b 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png index 6a81a4b..2680fb8 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png index b6afd43..ebe00eb 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png index 33d97ac..758889e 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png index 41981eb..41959ae 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png index a81cf04..2c73d38 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png and b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/OLDlightningsummoner.png b/src/main/resources/assets/electromagictools/textures/items/materials/OLDlightningsummoner.png deleted file mode 100644 index edb3892..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/materials/OLDlightningsummoner.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/denseironsheet.png b/src/main/resources/assets/electromagictools/textures/items/materials/denseironsheet.png deleted file mode 100644 index 6de0984..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/materials/denseironsheet.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png b/src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png index 4d86abf..aebfa19 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png and b/src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw.png deleted file mode 100644 index c291364..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw.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 index 13c34b2..a15bd94 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond.png and b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond_16x.png deleted file mode 100644 index 7b24e1d..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond_16x.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 index a582498..2395d88 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png and b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png differ 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 index 6cafc21..57725ee 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium.png and b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_16x.png deleted file mode 100644 index 8fbab9d..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_16x.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 index be90695..f77346b 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_alt.png and b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_alt.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill.png deleted file mode 100644 index 1abe4b3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill_diamond_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_diamond_16x.png deleted file mode 100644 index b8e07be..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_diamond_16x.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 index f6a2c53..9084741 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker.png and b/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker_16x.png deleted file mode 100644 index ef13b77..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker_16x.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 index 3abc5d8..d7d6524 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium.png and b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_16x.png deleted file mode 100644 index 1d103b8..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_16x.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 index 488af88..3eb59ab 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt.png and b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt.png 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 index 14e3a3b..745059a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt2.png and b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt2.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_diamond.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_diamond.png deleted file mode 100644 index 2945b06..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_diamond.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_diamond_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_diamond_alt.png deleted file mode 100644 index 50fc9bc..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_diamond_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_gold.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_gold.png deleted file mode 100644 index 42d2f87..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_gold.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_gold_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_gold_alt.png deleted file mode 100644 index c8847cf..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_gold_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_iron.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_iron.png deleted file mode 100644 index a498259..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_iron.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_stone.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_stone.png deleted file mode 100644 index 676cc49..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_stone.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_stone_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_stone_alt.png deleted file mode 100644 index c264f93..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_stone_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_wood.png b/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_wood.png deleted file mode 100644 index a8300d4..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/drills/drill_wood.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_electric_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_electric_16x.png deleted file mode 100644 index 8a2e933..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_electric_16x.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png index 5333f73..162deb1 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png and b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_32x.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_32x.png rename to src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth2.png diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_16x.png deleted file mode 100644 index 8ab4713..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_16x.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt.png deleted file mode 100644 index 18db965..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt_32x.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt_32x.png deleted file mode 100644 index 6eca21b..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt_32x.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 index 30cb978..8525f06 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond.png and b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_16x.png deleted file mode 100644 index 57cee36..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_16x.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 index a03c2d7..4b65cf6 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_alt.png and b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_alt.png 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 index 8bace47..b70389e 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron.png and b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron_16x.png deleted file mode 100644 index a4d2a37..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron_16x.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 index b03ae8d..e520abe 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium.png and b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_16x.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_16x.png deleted file mode 100644 index 2bce875..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_16x.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 index c352475..1cb95c2 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt.png and b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt.png 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 index 1fac839..39cce3d 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt2.png and b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt2.png differ diff --git a/src/main/resources/assets/electromagictools/textures/misc/thaumiumplaterecipe.png b/src/main/resources/assets/electromagictools/textures/misc/thaumiumplaterecipe.png index a90541a..3667f76 100644 Binary files a/src/main/resources/assets/electromagictools/textures/misc/thaumiumplaterecipe.png and b/src/main/resources/assets/electromagictools/textures/misc/thaumiumplaterecipe.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum.png b/src/main/resources/assets/electromagictools/textures/models/quantum.png new file mode 100644 index 0000000..74f58ee Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/models/quantum.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_jetpack.png b/src/main/resources/assets/electromagictools/textures/models/quantum_jetpack.png index d8eb8fb..dcc1f1a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/quantum_jetpack.png and b/src/main/resources/assets/electromagictools/textures/models/quantum_jetpack.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_n.png b/src/main/resources/assets/electromagictools/textures/models/quantum_wings_n.png index d2f482d..5923ff5 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_n.png and b/src/main/resources/assets/electromagictools/textures/models/quantum_wings_n.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_q.png b/src/main/resources/assets/electromagictools/textures/models/quantum_wings_q.png index cbde6db..b1a5ea8 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_q.png and b/src/main/resources/assets/electromagictools/textures/models/quantum_wings_q.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_t.png b/src/main/resources/assets/electromagictools/textures/models/quantum_wings_t.png index 1dfeb55..c51393e 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/quantum_wings_t.png and b/src/main/resources/assets/electromagictools/textures/models/quantum_wings_t.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 629a478..81cc152 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,11 +3,11 @@ "modid": "EMT", "name": "Electro-Magic Tools", "description": "Ever thought about combining magic and electricity?", - "version": "1.1.4", + "version": "1.2.0", "mcversion": "1.7.10", "url": "http://www.minecraftforum.net/topic/2196652-", "updateUrl": "", - "authorList": ["Tombenpotter"], + "authorList": ["Tombenpotter", "TehNut"], "credits": "Azanor, the IC2 guys, TehNut, and the forge guys!", "logoFile": "emt.png", "screenshots": [],