diff --git a/src/main/java/tombenpotter/emt/EMTResearch.java b/src/main/java/tombenpotter/emt/EMTResearch.java index eb0b87c..c3a8d20 100644 --- a/src/main/java/tombenpotter/emt/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/EMTResearch.java @@ -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/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/common/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java index e700323..e78a9e5 100644 --- a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java @@ -166,7 +166,6 @@ public class RecipeRegistry { public static void registerLateRecipes() { /** Infusion Recipes **/ - 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", 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")}); @@ -220,6 +219,8 @@ public class RecipeRegistry { 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)}); 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)}); + + infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("InfusedQuantumArmor", new ItemStack(ItemRegistry.quantumArmor), 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 **/ @@ -295,7 +296,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 +397,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/items/armor/ItemEMTQuantum.java b/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java index f992562..7048018 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 @@ -371,6 +398,12 @@ public class ItemEMTQuantum extends ItemArmorElectric { 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/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/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java index 2d1b433..8f94d01 100644 --- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java @@ -19,7 +19,9 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.item.ItemEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; @@ -67,4 +69,9 @@ public class EventHandlerEMT { } } } + + @SubscribeEvent + public void breaktool(PlayerDestroyItemEvent event){ + event.entityPlayer.stopUsingItem(); + } } diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 4d0d972..52a279f 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -260,7 +260,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 @@ -424,6 +425,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=RANDOMTEXT #=============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..fe114ba 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -420,8 +420,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=RURANDOMTEXT #=============Console Logging============= console.EMT.preInit.begin=Начало планирования над мировым господством 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..3f245d0 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..fa2b9d2 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..480a161 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..90e4368 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..a7f7242 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/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