From 85aaa05d4b8443f1c81f750b674b19094038eed6 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Fri, 6 Dec 2013 11:37:06 -0800 Subject: [PATCH] Crafting Station Prototype --- resources/assets/tinker/lang/en_US.lang | 3 + .../assets/tinker/textures/gui/chestside.png | Bin 0 -> 1400 bytes .../tinker/textures/gui/tinkertable.png | Bin 0 -> 1043 bytes src/main/java/tconstruct/TConstruct.java | 7 +- .../tconstruct/blocks/ToolForgeBlock.java | 17 +- .../blocks/logic/CraftingStationLogic.java | 73 +++- .../blocks/logic/ToolForgeLogic.java | 2 +- .../java/tconstruct/client/TProxyClient.java | 3 +- .../client/gui/CraftingStationGui.java | 352 +++++++++++++++++- .../tconstruct/client/gui/ToolStationGui.java | 2 - src/main/java/tconstruct/common/TContent.java | 2 +- src/main/java/tconstruct/common/TRecipes.java | 16 +- src/main/java/tconstruct/common/TRepo.java | 4 +- .../inventory/CraftingStationContainer.java | 21 ++ .../java/tconstruct/inventory/SlotTool.java | 1 - .../java/tconstruct/items/tools/Cleaver.java | 4 +- .../tconstruct/library/armor/ArmorMod.java | 29 ++ .../library/crafting/ToolBuilder.java | 61 ++- .../tconstruct/library/tools/ToolMod.java | 13 +- .../modifiers/{ => tools}/ModAntiSpider.java | 2 +- .../modifiers/{ => tools}/ModAttack.java | 2 +- .../modifiers/{ => tools}/ModAutoSmelt.java | 2 +- .../modifiers/{ => tools}/ModBlaze.java | 2 +- .../modifiers/{ => tools}/ModBoolean.java | 2 +- .../modifiers/{ => tools}/ModButtertouch.java | 2 +- .../modifiers/{ => tools}/ModDurability.java | 2 +- .../{ => tools}/ModExtraModifier.java | 2 +- .../modifiers/{ => tools}/ModFlux.java | 2 +- .../modifiers/{ => tools}/ModInteger.java | 2 +- .../modifiers/{ => tools}/ModLapis.java | 2 +- .../modifiers/{ => tools}/ModPiston.java | 2 +- .../modifiers/{ => tools}/ModPotion.java | 2 +- .../modifiers/{ => tools}/ModRedstone.java | 2 +- .../modifiers/{ => tools}/ModReinforced.java | 2 +- .../modifiers/{ => tools}/ModRepair.java | 2 +- .../modifiers/{ => tools}/ModSmite.java | 2 +- .../modifiers/{ => tools}/TActiveOmniMod.java | 2 +- .../plugins/{appeng => }/AppEng.java | 3 +- .../{buildcraft => }/BuildcraftTransport.java | 3 +- .../plugins/{mystcraft => }/Mystcraft.java | 3 +- .../plugins/{nei => }/NEICompat.java | 2 +- .../plugins/{nei => }/NotEnoughItems.java | 3 +- .../tconstruct/plugins/PluginController.java | 5 - .../plugins/{thaumcraft => }/Thaumcraft.java | 3 +- .../ConnectedTexturesMicroMaterial.java | 2 +- .../plugins/fmp/ForgeMultiPart.java | 1 - .../fmp/{register => }/RegisterWithFMP.java | 2 +- .../{drinkable => }/Drinkables.java | 2 +- .../{harvestables => }/GrindableHorse.java | 2 +- .../HarvestableOreBerry.java | 2 +- .../MineFactoryReloaded.java | 2 +- .../minefactoryreloaded/mfrRegistering.java | 5 +- .../java/tconstruct/util/TEventHandler.java | 2 +- .../tconstruct/util/config/PHConstruct.java | 24 +- 54 files changed, 583 insertions(+), 129 deletions(-) create mode 100644 resources/assets/tinker/textures/gui/chestside.png create mode 100644 resources/assets/tinker/textures/gui/tinkertable.png create mode 100644 src/main/java/tconstruct/library/armor/ArmorMod.java rename src/main/java/tconstruct/modifiers/{ => tools}/ModAntiSpider.java (98%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModAttack.java (99%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModAutoSmelt.java (94%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModBlaze.java (98%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModBoolean.java (97%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModButtertouch.java (99%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModDurability.java (98%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModExtraModifier.java (96%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModFlux.java (98%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModInteger.java (97%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModLapis.java (99%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModPiston.java (98%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModPotion.java (95%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModRedstone.java (99%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModReinforced.java (98%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModRepair.java (99%) rename src/main/java/tconstruct/modifiers/{ => tools}/ModSmite.java (98%) rename src/main/java/tconstruct/modifiers/{ => tools}/TActiveOmniMod.java (99%) rename src/main/java/tconstruct/plugins/{appeng => }/AppEng.java (94%) rename src/main/java/tconstruct/plugins/{buildcraft => }/BuildcraftTransport.java (95%) rename src/main/java/tconstruct/plugins/{mystcraft => }/Mystcraft.java (94%) rename src/main/java/tconstruct/plugins/{nei => }/NEICompat.java (94%) rename src/main/java/tconstruct/plugins/{nei => }/NotEnoughItems.java (87%) rename src/main/java/tconstruct/plugins/{thaumcraft => }/Thaumcraft.java (93%) rename src/main/java/tconstruct/plugins/fmp/{register => }/ConnectedTexturesMicroMaterial.java (99%) rename src/main/java/tconstruct/plugins/fmp/{register => }/RegisterWithFMP.java (97%) rename src/main/java/tconstruct/plugins/minefactoryreloaded/{drinkable => }/Drinkables.java (92%) rename src/main/java/tconstruct/plugins/minefactoryreloaded/{harvestables => }/GrindableHorse.java (93%) rename src/main/java/tconstruct/plugins/minefactoryreloaded/{harvestables => }/HarvestableOreBerry.java (96%) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 4d65adb2287..a39912511aa 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -4,8 +4,10 @@ itemGroup.TConstructBlocks=TConstruct Blocks crafters.ToolStation=Tool Station crafters.ToolForge=Tool Forge +crafters.TinkerTable=Tinker Table crafters.PartBuilder=Part Builder crafters.PatternShaper=Stencil Table +crafters.CraftingStation=Crafting Station inventory.PatternChest=Pattern Chest crafters.Smeltery=Smeltery crafters.Frypan=Frying Pan @@ -19,6 +21,7 @@ ToolStation.CastingTable.name=Casting Table tile.FurnaceSlab.name=Slab Furnace tile.ToolForge.name=Tool Forge +tile.TinkerTable.name=Tinker Table tile.Armor.DryingRack.name=Drying Rack CraftedSoil.Slime.name=Slimy Mud CraftedSoil.Grout.name=Grout diff --git a/resources/assets/tinker/textures/gui/chestside.png b/resources/assets/tinker/textures/gui/chestside.png new file mode 100644 index 0000000000000000000000000000000000000000..f199772bf7ca558417725a9f66d6004ba7661a5c GIT binary patch literal 1400 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD+3)hO3Co(TiTtdEaktaqI2fz`RFR5)FaX zN9JXmHA_&Onjr3R)BUWO$JNlE`*@^Ety~v+77PELbA0Edi@k@<)q?*W`{2%bMXT=P z^KX0h+Wt={-Yw`=sBcmjeni4cQ}I~FdF}hp73(TLSAV{|?(F^g58u8$TV--=-uBni zr4P=QXJlYu5MXcs`2&+7mRJ1Ve&3!wJ#~$L>*V#OcbBF`q;J378+Ux(_N~unE9x5^ z`&hv<{q#{Q<2A-t!>eN-mwmhA&hUW;w~-)A5;nd&$9&`c_lFfWeRYDb&ul&?67zW5 zH=8yAFHO~!4?oL~&gR>^uJoNxd#7T{gdnb^Qv{N?JfHf$(o3_?j`2=h3QutCv*_b4 z3f1o<859^A7#NrsIKYesh8-*@0zjFN!!8TDuFY)9zH@EfY>tqNR%%Q)KT8WYO2rI} z3Fel9FU~!g6E%|~Md`w0^@iKsJ%OJ=`~#QI?R_K3VB&)j9V?C>Q(X~%y;P6MkD)=> zp}6QAh_&`s-uA@ZcXtU`Fm8GAZSCgo-^<0B)fo~Fa2^nuYUaFu^f0)UYhzRQs?dd+x?RFWxg> z``3GN&gM>sscVy!F7yO>JuI*=DddtktTO-SHOb!x!Ws5`+^%uukh25MbP7&XFKc9H z@cTT7yl#~|ljDknaO0~eUQA6ko}k`9WFBMoDGAWL1TLC z>z-7lfMg$*RoQdbt1*?viWi^rW2kw5ObYC-pVwU$tb6Umv5@B{_dR2V6(`=C|Nk|Q zaY~Tg)i>Yljh|>R|1tbxyLpE20btl<8*DzxlECTj;)p$)u`on1erEV_fMs6kTH|X; zYD_<^KGahn;+{j{CH|0I`2c+cR_}X zA82_8o{7MW4U-sV_;CZ18z^&a5o~zFVdQ&MBb@0K8iCWdHyG literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/gui/tinkertable.png b/resources/assets/tinker/textures/gui/tinkertable.png new file mode 100644 index 0000000000000000000000000000000000000000..3fab5f839702d69ee3b6ded8dd1acde189876b28 GIT binary patch literal 1043 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z;_6Q8AUa`8i0cAC7!;n?00$C7Lm z^>b;il;Dk%^5XVOBc~nhD?KiIz@Bl({r6$5Yj_U}2ns&7xW)Nq19QR0W(Ec(1`Y-V z2B2F|7y*5!)$1~@m!34v+aB$6dCJu}+j9T9DKhNen-KJ+R{pX{s_F65Av;(ZSQrEt z96+8&V>Bqo>Kv?m`|;XS|2?dl3@JKab&t=l;J&2Gkih<-zJBVjefD={1RCOJEYtic zGViU*{5j8dh`TY|E6I;K-RbbzhMRjHD>(s9Sj@|98l`O=|BDlob;pqTQ$fw ztcYM?SrAsnu!Gg&=h0tx<15AO%NUZFm>xW0X9W3e#}7w_m_G^(dUZeM2{#_Fj!pYYxw?Vlg(`h2Cb{x*4`Gn!vqfr^gt<4@?+u3KO4AS zP3c-`tg_M`OE61Jcbnz2JyyrB zudCN!xXnI6>G=AOX3N)D-U}+_#u^pS$YDz0bYN)UvbE)ZuqOU-u3u!a#ktGt*~^tC zSX!Q`v=KaUy?K8o`-WNu%{djxey?QInJU?cFwau(#GE(J3xLXJPW}rdYct3;W6pAQ zCda-x98bi+X`*4eO)bZZkc8r*8J{b(4Dz`Sd}CZv@M^8)%3_;2WyJW^QuGGcZOfU0 zWtKDTh9tICxBqSK_jWPyy}ai1rihpoCF~bs)`zclG_+y3bNn&Wx@j#=_2r=aNE7gY aWgo-FJ#H)W15_MA7I?b)xvX chest; + public WeakReference doubleChest; + public WeakReference patternChest; + public WeakReference furnace; + public boolean tinkerTable; + public boolean stencilTable; + public CraftingStationLogic() { - super(11); //9 for crafting, 1 for output, 1 for plans + super(17); //9 for crafting, 1 for output, 6 for extensions, 1 for plans } @Override public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) { + //System.out.println("Getting container on side: "+FMLCommonHandler.instance().getEffectiveSide()); + chest = null; + doubleChest = null; + patternChest = null; + furnace = null; + tinkerTable = false; + for (int yPos = y - 1; yPos <= y + 1; yPos++) + { + for (int xPos = x - 1; xPos <= x + 1; xPos++) + { + for (int zPos = z - 1; zPos <= x + 1; zPos++) + { + TileEntity tile = world.getBlockTileEntity(xPos, yPos, zPos); + if (chest == null && tile instanceof TileEntityChest) + { + chest = new WeakReference(tile); + checkForChest(world, xPos + 1, yPos, zPos); + checkForChest(world, xPos - 1, yPos, zPos); + checkForChest(world, xPos, yPos, zPos + 1); + checkForChest(world, xPos, yPos, zPos - 1); + } + else if (patternChest == null && tile instanceof PatternChestLogic) + patternChest = new WeakReference(tile); + else if (furnace == null && (tile instanceof TileEntityFurnace || tile instanceof FurnaceLogic)) + furnace = new WeakReference(tile); + else if (tinkerTable == false && tile instanceof ToolStationLogic) + tinkerTable = true; + } + } + } return new CraftingStationContainer(inventoryplayer, this, x, y, z); } + void checkForChest (World world, int x, int y, int z) + { + if (doubleChest != null) + return; + + TileEntity tile = world.getBlockTileEntity(x, y, z); + if (tile instanceof TileEntityChest) + doubleChest = new WeakReference(tile); + } + @Override protected String getDefaultName () { - return "crafters.craftingstation"; + return "crafters.CraftingStation"; } public boolean canDropInventorySlot (int slot) @@ -39,7 +96,7 @@ public boolean canDropInventorySlot (int slot) @Override public int[] getAccessibleSlotsFromSide (int var1) { - return new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + return new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }; } @Override @@ -51,6 +108,6 @@ public boolean canInsertItem (int i, ItemStack itemstack, int j) @Override public boolean canExtractItem (int i, ItemStack itemstack, int j) { - return i != 0; + return true; } } diff --git a/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java b/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java index 9bc2d16847e..47f92193454 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java @@ -12,7 +12,7 @@ /* Simple class for storing items in the block */ -public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory +public class ToolForgeLogic extends ToolStationLogic { ItemStack previousTool; String toolName; diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 34c866bb18f..4c3bf67989d 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -81,11 +81,10 @@ public Object getClientGuiElement (int ID, EntityPlayer player, World world, int return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == toolForgeID) return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == landmineID) return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.getBlockTileEntity(x, y, z))); if (ID == craftingStationID) - return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), x, y, z); + return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == furnaceID) return new FurnaceGui(player.inventory, (FurnaceLogic) world.getBlockTileEntity(x, y, z)); diff --git a/src/main/java/tconstruct/client/gui/CraftingStationGui.java b/src/main/java/tconstruct/client/gui/CraftingStationGui.java index 8ceb5120517..7e3002d1dc1 100644 --- a/src/main/java/tconstruct/client/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/client/gui/CraftingStationGui.java @@ -1,43 +1,361 @@ package tconstruct.client.gui; +import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.inventory.CraftingStationContainer; +import tconstruct.library.tools.ToolCore; public class CraftingStationGui extends GuiContainer { - public CraftingStationGui(InventoryPlayer inventoryplayer, CraftingStationLogic logic, int x, int y, int z) - { - super(new CraftingStationContainer(inventoryplayer, logic, x, y, z)); - } + public boolean active; + public String toolName; + public GuiTextField text; + public String title, body = ""; + CraftingStationLogic logic; - /*public void onGuiClosed () + public CraftingStationGui(InventoryPlayer inventory, CraftingStationLogic logic, World world, int x, int y, int z) { - TConstruct.logger.info("Gui Closed"); - super.onGuiClosed(); - }*/ + super(logic.getGuiContainer(inventory, world, x, y, z)); + this.logic = logic; + //text = new GuiTextField(this.fontRenderer, this.xSize / 2 - 5, 8, 30, 12); + //this.text.setText(""); + title = "\u00A7nRepair and Modification"; + body = "The main way to repair or change your tools or armor.\n\nPlace an item and a material on the left to get started."; + toolName = ""; + } @Override protected void drawGuiContainerForegroundLayer (int par1, int par2) { - fontRenderer.drawString("Crafting", 28, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + this.fontRenderer.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020); + this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x202020); + if (logic.chest != null) + this.fontRenderer.drawString(StatCollector.translateToLocal(logic.chest.get().getInvName()), -108, this.ySize - 160, 0x202020); + //this.fontRenderer.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff); + + if (logic.tinkerTable) + { + /*if (logic.isStackInSlot(0)) + drawToolStats(); + else*/ + drawToolInformation(); + } } - private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/crafting.png"); + void drawToolStats () + { + ItemStack stack = logic.getStackInSlot(0); + if (stack.getItem() instanceof ToolCore) + { + ToolCore tool = (ToolCore) stack.getItem(); + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + this.drawCenteredString(fontRenderer, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff); + + drawModularToolStats(stack, tool, tags); + } + } - @Override - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) + void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) { + List categories = Arrays.asList(tool.toolCategories()); + final int durability = tags.getInteger("Damage"); + final int maxDur = tags.getInteger("TotalDurability"); + int availableDurability = maxDur - durability; + + //Durability + int base = 24; + int offset = 0; + if (maxDur > 0) + { + if (maxDur >= 10000) + { + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); + offset++; + fontRenderer.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + offset++; + } + else + { + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + offset++; + } + } + + final float stonebound = tags.getFloat("Shoddy"); + //Attack + if (categories.contains("weapon")) + { + int attack = (int) (tags.getInteger("Attack")); + float stoneboundDamage = (float) Math.log(durability / 72f + 1) * -2 * stonebound; + attack += stoneboundDamage; + attack *= tool.getDamageModifier(); + if (attack < 1) + attack = 1; + + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); + if (attack % 2 == 0) + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + else + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + offset++; + + if (stoneboundDamage != 0) + { + heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); + String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); + this.fontRenderer.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + offset++; + } + offset++; + } + + if (categories.contains("bow")) + { + DecimalFormat df = new DecimalFormat("##.##"); + df.setRoundingMode(RoundingMode.DOWN); + int drawSpeed = tags.getInteger("DrawSpeed"); + float flightSpeed = tags.getFloat("FlightSpeed"); + float trueDraw = drawSpeed / 20f * flightSpeed; + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); + offset++; + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + } + + if (categories.contains("ammo")) + { + DecimalFormat df = new DecimalFormat("##.##"); + df.setRoundingMode(RoundingMode.DOWN); + int attack = (int) (tags.getInteger("Attack")); + float mass = tags.getFloat("Mass"); + float shatter = tags.getFloat("BreakChance"); + float accuracy = tags.getFloat("Accuracy"); + + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); + offset++; + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); + if (attack % 2 == 0) + this.fontRenderer.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + else + this.fontRenderer.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + offset++; + int minAttack = attack; + int maxAttack = attack * 2; + heart = StatCollector.translateToLocal("gui.partcrafter10"); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); + offset++; + this.fontRenderer.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); + offset++; + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); + offset++; + /*this.fontRenderer.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); + offset++;*/ + offset++; + } + + //Mining + if (categories.contains("dualharvest")) + { + float mineSpeed = tags.getInteger("MiningSpeed") / 100f; + float mineSpeed2 = tags.getInteger("MiningSpeed2") / 100f; + float stoneboundSpeed = (float) Math.log(durability / 90f + 1) * 2 * stonebound; + DecimalFormat df = new DecimalFormat("##.##"); + df.setRoundingMode(RoundingMode.DOWN); + float trueSpeed = mineSpeed + stoneboundSpeed; + float trueSpeed2 = mineSpeed + stoneboundSpeed; + + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); + offset++; + fontRenderer.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); + offset++; + if (stoneboundSpeed != 0) + { + String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); + fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + offset++; + } + offset++; + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); + offset++; + fontRenderer + .drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + } + else if (categories.contains("harvest")) + { + float mineSpeed = tags.getInteger("MiningSpeed"); + int heads = 1; + + if (tags.hasKey("MiningSpeed2")) + { + mineSpeed += tags.getInteger("MiningSpeed2"); + heads++; + } + + if (tags.hasKey("MiningSpeedHandle")) + { + mineSpeed += tags.getInteger("MiningSpeedHandle"); + heads++; + } + + if (tags.hasKey("MiningSpeedExtra")) + { + mineSpeed += tags.getInteger("MiningSpeedExtra"); + heads++; + } + + float trueSpeed = mineSpeed / (heads * 100f); + + float stoneboundSpeed = (float) Math.log(durability / 90f + 1) * 2 * stonebound; + DecimalFormat df = new DecimalFormat("##.##"); + df.setRoundingMode(RoundingMode.DOWN); + trueSpeed += stoneboundSpeed; + if (trueSpeed < 0) + trueSpeed = 0; + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); + offset++; + if (stoneboundSpeed != 0) + { + String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); + fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + offset++; + } + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + } + else if (categories.contains("utility")) + { + float mineSpeed = tags.getInteger("MiningSpeed"); + float trueSpeed = mineSpeed / (100f); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + } + + int modifiers = tags.getInteger("Modifiers"); + if (modifiers > 0) + { + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); + offset++; + } + if (tags.hasKey("Tooltip1")) + { + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); + } + + boolean displayToolTips = true; + int tipNum = 0; + while (displayToolTips) + { + tipNum++; + String tooltip = "ModifierTip" + tipNum; + if (tags.hasKey(tooltip)) + { + String tipName = tags.getString(tooltip); + fontRenderer.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff); + } + else + displayToolTips = false; + } + } + + protected String getHarvestLevelName (int num) + { + switch (num) + { + case 0: + return StatCollector.translateToLocal("gui.partcrafter.mining1"); + case 1: + return StatCollector.translateToLocal("gui.partcrafter.mining2"); + case 2: + return StatCollector.translateToLocal("gui.partcrafter.mining3"); + case 3: + return StatCollector.translateToLocal("gui.partcrafter.mining4"); + case 4: + return StatCollector.translateToLocal("gui.partcrafter.mining5"); + case 5: + return StatCollector.translateToLocal("gui.partcrafter.mining6"); + default: + return String.valueOf(num); + } + } + + void drawToolInformation () + { + this.drawCenteredString(fontRenderer, title, xSize + 63, 8, 0xffffff); + fontRenderer.drawSplitString(body, xSize + 8, 24, 115, 0xffffff); + } + + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/tinkertable.png"); + private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png"); + private static final ResourceLocation icons = new ResourceLocation("tinker", "textures/gui/icons.png"); + private static final ResourceLocation chest = new ResourceLocation("tinker", "textures/gui/chestside.png"); + + protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) + { + // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); - int l = (width - xSize) / 2; - int i1 = (height - ySize) / 2; - drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); + + if (active) + { + this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.ySize, 112, 22); + } + + this.mc.getTextureManager().bindTexture(icons); + // Draw the slots + + if (logic.tinkerTable && !logic.isStackInSlot(5)) + this.drawTexturedModalRect(cornerX + 47, cornerY + 33, 0, 233, 18, 18); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(icons); + + //Draw chest side + if (logic.chest != null) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(chest); + if (logic.doubleChest == null) + this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.ySize); + else + this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 121, this.ySize + 21); + } + + // Draw description + if (logic.tinkerTable) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(description); + cornerX = (this.width + this.xSize) / 2; + cornerY = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30); + } + } + } diff --git a/src/main/java/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java index 49acfa0d556..e6d9dfadcb0 100644 --- a/src/main/java/tconstruct/client/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/client/gui/ToolStationGui.java @@ -166,8 +166,6 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) drawToolStats(); else drawToolInformation(); - - //this.fontRenderer.drawString("Namebox active: "+active, this.xSize / 2 - 18, -10, 0xffffff); } void drawToolStats () diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 80ed0ff8aed..709916207f3 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -43,7 +43,7 @@ import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; import tconstruct.library.util.IPattern; -import tconstruct.modifiers.*; +import tconstruct.modifiers.tools.*; import tconstruct.util.*; import tconstruct.util.config.*; diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index 751e13d0e1a..485f837edf7 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -27,7 +27,7 @@ import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.*; import tconstruct.library.util.IPattern; -import tconstruct.modifiers.*; +import tconstruct.modifiers.tools.*; import tconstruct.util.RecipeRemover; import tconstruct.util.TDispenserBehaviorArrow; import tconstruct.util.TDispenserBehaviorSpawnEgg; @@ -173,10 +173,10 @@ public static void addOreDictionarySmelteryRecipes () Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); // Ores - Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre); + Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2); + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); // Blocks Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); @@ -1075,15 +1075,15 @@ protected static void addRecipesForBasinCasting () protected static void addRecipesForSmeltery () { //Alloy Smelting - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenBronzeFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy), new FluidStack(TRepo.moltenCopperFluid, + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenBronzeFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TRepo.moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TRepo.moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy), new FluidStack(TRepo.moltenAluminumFluid, + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenAlubrassFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack(TRepo.moltenAluminumFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TRepo.moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenAlumiteFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy), new FluidStack(TRepo.moltenAluminumFluid, + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenAlumiteFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack(TRepo.moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenManyullynFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(TRepo.moltenCobaltFluid, + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenManyullynFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack(TRepo.moltenCobaltFluid, TConstruct.ingotLiquidValue), new FluidStack(TRepo.moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn - Smeltery.addAlloyMixing(new FluidStack(TRepo.pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue), + Smeltery.addAlloyMixing(new FluidStack(TRepo.pigIronFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue), new FluidStack(TRepo.moltenEmeraldFluid, 640), new FluidStack(TRepo.bloodFluid, 80)); //Pigiron // Stone parts diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java index d87a3d7037d..6bc1f202c38 100644 --- a/src/main/java/tconstruct/common/TRepo.java +++ b/src/main/java/tconstruct/common/TRepo.java @@ -4,8 +4,8 @@ import tconstruct.blocks.slime.SlimeLeaves; import tconstruct.blocks.slime.SlimeSapling; import tconstruct.library.tools.ToolCore; -import tconstruct.modifiers.ModFlux; -import tconstruct.modifiers.ModLapis; +import tconstruct.modifiers.tools.ModFlux; +import tconstruct.modifiers.tools.ModLapis; import net.minecraft.block.Block; import net.minecraft.block.StepSound; import net.minecraft.block.material.Material; diff --git a/src/main/java/tconstruct/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/inventory/CraftingStationContainer.java index 68b525e687a..e15797dc4ca 100644 --- a/src/main/java/tconstruct/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/inventory/CraftingStationContainer.java @@ -58,6 +58,27 @@ public CraftingStationContainer(InventoryPlayer inventorplayer, CraftingStationL this.addSlotToContainer(new Slot(inventorplayer, column, 8 + column * 18, 142)); } + //Side inventory + if (logic.chest != null) + { + IInventory chest = logic.chest.get(); + IInventory doubleChest = logic.doubleChest == null ? null : logic.doubleChest.get(); + int count = 0; + for (column = 0; column < 9; column++) + { + for (row = 0; row < 6; row++) + { + int value = count < 27 ? count : count - 27; + this.addSlotToContainer(new Slot(count < 27 ? chest : doubleChest, value, -108 + row * 18, 19 + column * 18)); + count++; + if (count >= 27 && doubleChest == null) + break; + } + if (count >= 27 && doubleChest == null) + break; + } + } + this.onCraftMatrixChanged(this.craftMatrix); } diff --git a/src/main/java/tconstruct/inventory/SlotTool.java b/src/main/java/tconstruct/inventory/SlotTool.java index e2b38e76048..0421ebecb39 100644 --- a/src/main/java/tconstruct/inventory/SlotTool.java +++ b/src/main/java/tconstruct/inventory/SlotTool.java @@ -63,7 +63,6 @@ protected void onCrafting (ItemStack stack) inventory.decrStackSize(1, amount); if (!player.worldObj.isRemote && full) player.worldObj.playSoundEffect(player.posX, player.posY, player.posZ, "tinker:little_saw", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); - //player.worldObj.playAuxSFX(1021, (int)player.posX, (int)player.posY, (int)player.posZ, 0); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); } } diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index 71b78485908..ddd2fa4bf74 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -18,7 +18,7 @@ public class Cleaver extends Weapon { public Cleaver(int itemID) { - super(itemID, 4); + super(itemID, 6); this.setUnlocalizedName("InfiTool.Cleaver"); } @@ -73,7 +73,7 @@ public float getDurabilityModifier () @Override public float getDamageModifier () { - return 1.25f; + return 1.4f; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/library/armor/ArmorMod.java b/src/main/java/tconstruct/library/armor/ArmorMod.java new file mode 100644 index 00000000000..50d0bce045b --- /dev/null +++ b/src/main/java/tconstruct/library/armor/ArmorMod.java @@ -0,0 +1,29 @@ +package tconstruct.library.armor; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.ToolMod; + +public abstract class ArmorMod extends ToolMod +{ + public ArmorMod(ItemStack[] items, int effect, String dataKey) + { + super(items, effect, dataKey); + } + + @Override + protected String getTagName() + { + return "TinkerArmor"; + } + + public boolean validArmorType(ArmorCore armor) + { + return true; + } +} diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index fe330787902..1393fc2d90a 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -5,19 +5,20 @@ import java.util.HashMap; import java.util.List; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event.Result; import tconstruct.library.TConstructRegistry; +import tconstruct.library.armor.ArmorCore; +import tconstruct.library.armor.ArmorMod; import tconstruct.library.event.ToolCraftEvent; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.tools.ToolMod; import tconstruct.library.util.IToolPart; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.Event.Result; - public class ToolBuilder { public static ToolBuilder instance = new ToolBuilder(); @@ -26,6 +27,7 @@ public class ToolBuilder public List combos = new ArrayList(); public HashMap modifiers = new HashMap(); public List toolMods = new ArrayList(); + public List armorMods = new ArrayList(); /* Build tools */ public static void addNormalToolRecipe (ToolCore output, Item head, Item handle) @@ -128,8 +130,13 @@ else if (item instanceof IToolPart) public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) { - if (headStack != null && headStack.getItem() instanceof ToolCore) - return modifyTool(headStack, handleStack, accessoryStack, extraStack, name); + if (headStack != null) + { + if (headStack.getItem() instanceof ToolCore) + return modifyTool(headStack, handleStack, accessoryStack, extraStack, name); + else if (headStack.getItem() instanceof ArmorCore) + return modifyArmor(headStack, new ItemStack[] { handleStack, accessoryStack, extraStack }, name); + } if (headStack == null || handleStack == null) //Nothing to build without these. All tools need at least two parts! return null; @@ -356,6 +363,42 @@ else if (event.getResult() == Result.ALLOW) return tool; } + public ItemStack modifyTool (ItemStack input, ItemStack[] modifiers, String name) + { + return null; + } + + public ItemStack modifyArmor (ItemStack input, ItemStack[] slots, String name) + { + ItemStack armor = input.copy(); + NBTTagCompound tags = armor.getTagCompound().getCompoundTag("TinkerArmor"); + tags.removeTag("Built"); + + boolean built = false; + for (ArmorMod mod : armorMods) + { + if (mod.matches(slots, armor)) + { + built = true; + mod.addMatchingEffect(armor); + mod.modify(slots, armor); + } + } + + tags = armor.getTagCompound(); + if (name != null && !name.equals("") && !tags.hasKey("display")) + { + tags.setCompoundTag("display", new NBTTagCompound()); + tags.getCompoundTag("display").setString("Name", "\u00A7f" + name); + } + + if (built) + return armor; + else + return null; + } + + @Deprecated public ItemStack modifyTool (ItemStack input, ItemStack topSlot, ItemStack bottomSlot, ItemStack extraStack, String name) { if (extraStack != null) @@ -379,7 +422,7 @@ public ItemStack modifyTool (ItemStack input, ItemStack topSlot, ItemStack botto mod.modify(slots, tool); } } - + tags = tool.getTagCompound(); if (name != null && !name.equals("") && !tags.hasKey("display")) { diff --git a/src/main/java/tconstruct/library/tools/ToolMod.java b/src/main/java/tconstruct/library/tools/ToolMod.java index 9932c2e7732..50b2a6814af 100644 --- a/src/main/java/tconstruct/library/tools/ToolMod.java +++ b/src/main/java/tconstruct/library/tools/ToolMod.java @@ -70,6 +70,11 @@ public boolean matches (ItemStack[] input, ItemStack tool) return list.isEmpty(); } + + protected String getTagName() + { + return "InfiTool"; + } /** * @@ -79,7 +84,7 @@ public boolean matches (ItemStack[] input, ItemStack tool) protected boolean canModify (ItemStack tool, ItemStack[] input) { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + NBTTagCompound tags = tool.getTagCompound().getCompoundTag(getTagName()); return tags.getInteger("Modifiers") > 0; } @@ -92,7 +97,7 @@ protected boolean canModify (ItemStack tool, ItemStack[] input) public void addMatchingEffect (ItemStack tool) { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + NBTTagCompound tags = tool.getTagCompound().getCompoundTag(getTagName()); if (tags.hasKey("Effect6") || tags.hasKey(key)) return; @@ -124,7 +129,7 @@ else if (tags.hasKey("Effect1")) protected int addModifierTip (ItemStack tool, String modifierTip) { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + NBTTagCompound tags = tool.getTagCompound().getCompoundTag(getTagName()); int tipNum = 0; while (true) { @@ -142,7 +147,7 @@ protected int addModifierTip (ItemStack tool, String modifierTip) protected int addToolTip (ItemStack tool, String tooltip, String modifierTip) { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + NBTTagCompound tags = tool.getTagCompound().getCompoundTag(getTagName()); int tipNum = 0; while (true) { diff --git a/src/main/java/tconstruct/modifiers/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java similarity index 98% rename from src/main/java/tconstruct/modifiers/ModAntiSpider.java rename to src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java index 189127ed8af..cd860d7e5b4 100644 --- a/src/main/java/tconstruct/modifiers/ModAntiSpider.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/modifiers/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java similarity index 99% rename from src/main/java/tconstruct/modifiers/ModAttack.java rename to src/main/java/tconstruct/modifiers/tools/ModAttack.java index bc00ee4d451..3e949a26b73 100644 --- a/src/main/java/tconstruct/modifiers/ModAttack.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAttack.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/ModAutoSmelt.java b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java similarity index 94% rename from src/main/java/tconstruct/modifiers/ModAutoSmelt.java rename to src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java index 6d1d86c0b33..c640c7683ed 100644 --- a/src/main/java/tconstruct/modifiers/ModAutoSmelt.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java similarity index 98% rename from src/main/java/tconstruct/modifiers/ModBlaze.java rename to src/main/java/tconstruct/modifiers/tools/ModBlaze.java index bea3683e61c..afaa4dfcb9c 100644 --- a/src/main/java/tconstruct/modifiers/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/ModBoolean.java b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java similarity index 97% rename from src/main/java/tconstruct/modifiers/ModBoolean.java rename to src/main/java/tconstruct/modifiers/tools/ModBoolean.java index cf8a22ed6b3..19998f9bf0c 100644 --- a/src/main/java/tconstruct/modifiers/ModBoolean.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/modifiers/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java similarity index 99% rename from src/main/java/tconstruct/modifiers/ModButtertouch.java rename to src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index e4b4039677c..685b7fcbe6d 100644 --- a/src/main/java/tconstruct/modifiers/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.Iterator; diff --git a/src/main/java/tconstruct/modifiers/ModDurability.java b/src/main/java/tconstruct/modifiers/tools/ModDurability.java similarity index 98% rename from src/main/java/tconstruct/modifiers/ModDurability.java rename to src/main/java/tconstruct/modifiers/tools/ModDurability.java index 48c7824e501..52e30aa8f42 100644 --- a/src/main/java/tconstruct/modifiers/ModDurability.java +++ b/src/main/java/tconstruct/modifiers/tools/ModDurability.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/ModExtraModifier.java b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java similarity index 96% rename from src/main/java/tconstruct/modifiers/ModExtraModifier.java rename to src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java index d8a2d3958c3..f560ad0eb4c 100644 --- a/src/main/java/tconstruct/modifiers/ModExtraModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/modifiers/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java similarity index 98% rename from src/main/java/tconstruct/modifiers/ModFlux.java rename to src/main/java/tconstruct/modifiers/tools/ModFlux.java index 2386536f404..171b92b2c2a 100644 --- a/src/main/java/tconstruct/modifiers/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import cofh.api.energy.IEnergyContainerItem; diff --git a/src/main/java/tconstruct/modifiers/ModInteger.java b/src/main/java/tconstruct/modifiers/tools/ModInteger.java similarity index 97% rename from src/main/java/tconstruct/modifiers/ModInteger.java rename to src/main/java/tconstruct/modifiers/tools/ModInteger.java index b7ad5e261d6..3ad27ccd1eb 100644 --- a/src/main/java/tconstruct/modifiers/ModInteger.java +++ b/src/main/java/tconstruct/modifiers/tools/ModInteger.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/modifiers/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java similarity index 99% rename from src/main/java/tconstruct/modifiers/ModLapis.java rename to src/main/java/tconstruct/modifiers/tools/ModLapis.java index 1ac6b3fe0c0..b41cf35b40c 100644 --- a/src/main/java/tconstruct/modifiers/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.Iterator; diff --git a/src/main/java/tconstruct/modifiers/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java similarity index 98% rename from src/main/java/tconstruct/modifiers/ModPiston.java rename to src/main/java/tconstruct/modifiers/tools/ModPiston.java index 473a3efac08..7a5184d5852 100644 --- a/src/main/java/tconstruct/modifiers/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/ModPotion.java b/src/main/java/tconstruct/modifiers/tools/ModPotion.java similarity index 95% rename from src/main/java/tconstruct/modifiers/ModPotion.java rename to src/main/java/tconstruct/modifiers/tools/ModPotion.java index da8010b3b7e..cc2581fc17b 100644 --- a/src/main/java/tconstruct/modifiers/ModPotion.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPotion.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import tconstruct.library.tools.ToolMod; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/modifiers/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java similarity index 99% rename from src/main/java/tconstruct/modifiers/ModRedstone.java rename to src/main/java/tconstruct/modifiers/tools/ModRedstone.java index 89c8ab68d2f..dfd4847222a 100644 --- a/src/main/java/tconstruct/modifiers/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/ModReinforced.java b/src/main/java/tconstruct/modifiers/tools/ModReinforced.java similarity index 98% rename from src/main/java/tconstruct/modifiers/ModReinforced.java rename to src/main/java/tconstruct/modifiers/tools/ModReinforced.java index 600f662f523..757c57d2c53 100644 --- a/src/main/java/tconstruct/modifiers/ModReinforced.java +++ b/src/main/java/tconstruct/modifiers/tools/ModReinforced.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/ModRepair.java b/src/main/java/tconstruct/modifiers/tools/ModRepair.java similarity index 99% rename from src/main/java/tconstruct/modifiers/ModRepair.java rename to src/main/java/tconstruct/modifiers/tools/ModRepair.java index d0bf97ccd9f..b92f54d44f0 100644 --- a/src/main/java/tconstruct/modifiers/ModRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRepair.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/ModSmite.java b/src/main/java/tconstruct/modifiers/tools/ModSmite.java similarity index 98% rename from src/main/java/tconstruct/modifiers/ModSmite.java rename to src/main/java/tconstruct/modifiers/tools/ModSmite.java index e6df65fc843..98dd07e7e12 100644 --- a/src/main/java/tconstruct/modifiers/ModSmite.java +++ b/src/main/java/tconstruct/modifiers/tools/ModSmite.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/modifiers/TActiveOmniMod.java b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java similarity index 99% rename from src/main/java/tconstruct/modifiers/TActiveOmniMod.java rename to src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java index 9ccba19bf9e..d72be6f9c3c 100644 --- a/src/main/java/tconstruct/modifiers/TActiveOmniMod.java +++ b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers; +package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/appeng/AppEng.java b/src/main/java/tconstruct/plugins/AppEng.java similarity index 94% rename from src/main/java/tconstruct/plugins/appeng/AppEng.java rename to src/main/java/tconstruct/plugins/AppEng.java index 30c84244de9..4a082326479 100644 --- a/src/main/java/tconstruct/plugins/appeng/AppEng.java +++ b/src/main/java/tconstruct/plugins/AppEng.java @@ -1,8 +1,7 @@ -package tconstruct.plugins.appeng; +package tconstruct.plugins; import cpw.mods.fml.common.event.FMLInterModComms; import tconstruct.TConstruct; -import tconstruct.plugins.ICompatPlugin; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/buildcraft/BuildcraftTransport.java b/src/main/java/tconstruct/plugins/BuildcraftTransport.java similarity index 95% rename from src/main/java/tconstruct/plugins/buildcraft/BuildcraftTransport.java rename to src/main/java/tconstruct/plugins/BuildcraftTransport.java index 1289b994f15..2037fc7be1b 100644 --- a/src/main/java/tconstruct/plugins/buildcraft/BuildcraftTransport.java +++ b/src/main/java/tconstruct/plugins/BuildcraftTransport.java @@ -1,9 +1,8 @@ -package tconstruct.plugins.buildcraft; +package tconstruct.plugins; import cpw.mods.fml.common.event.FMLInterModComms; import tconstruct.TConstruct; import tconstruct.common.TRepo; -import tconstruct.plugins.ICompatPlugin; public class BuildcraftTransport implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/mystcraft/Mystcraft.java b/src/main/java/tconstruct/plugins/Mystcraft.java similarity index 94% rename from src/main/java/tconstruct/plugins/mystcraft/Mystcraft.java rename to src/main/java/tconstruct/plugins/Mystcraft.java index f32f72766b1..e6199223ad8 100644 --- a/src/main/java/tconstruct/plugins/mystcraft/Mystcraft.java +++ b/src/main/java/tconstruct/plugins/Mystcraft.java @@ -1,9 +1,8 @@ -package tconstruct.plugins.mystcraft; +package tconstruct.plugins; import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.nbt.NBTTagCompound; import tconstruct.TConstruct; -import tconstruct.plugins.ICompatPlugin; public class Mystcraft implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/nei/NEICompat.java b/src/main/java/tconstruct/plugins/NEICompat.java similarity index 94% rename from src/main/java/tconstruct/plugins/nei/NEICompat.java rename to src/main/java/tconstruct/plugins/NEICompat.java index f53ee738c62..c6ccc3a5fab 100644 --- a/src/main/java/tconstruct/plugins/nei/NEICompat.java +++ b/src/main/java/tconstruct/plugins/NEICompat.java @@ -1,4 +1,4 @@ -package tconstruct.plugins.nei; +package tconstruct.plugins; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/tconstruct/plugins/nei/NotEnoughItems.java b/src/main/java/tconstruct/plugins/NotEnoughItems.java similarity index 87% rename from src/main/java/tconstruct/plugins/nei/NotEnoughItems.java rename to src/main/java/tconstruct/plugins/NotEnoughItems.java index 4a36c27dfa4..c4f558122fc 100644 --- a/src/main/java/tconstruct/plugins/nei/NotEnoughItems.java +++ b/src/main/java/tconstruct/plugins/NotEnoughItems.java @@ -1,7 +1,6 @@ -package tconstruct.plugins.nei; +package tconstruct.plugins; import tconstruct.TConstruct; -import tconstruct.plugins.ICompatPlugin; public class NotEnoughItems implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/PluginController.java b/src/main/java/tconstruct/plugins/PluginController.java index fc0cdccb42a..fb96a10c6fb 100644 --- a/src/main/java/tconstruct/plugins/PluginController.java +++ b/src/main/java/tconstruct/plugins/PluginController.java @@ -3,14 +3,9 @@ import cpw.mods.fml.common.Loader; import net.minecraftforge.common.Configuration; import tconstruct.TConstruct; -import tconstruct.plugins.appeng.AppEng; -import tconstruct.plugins.buildcraft.BuildcraftTransport; import tconstruct.plugins.fmp.ForgeMultiPart; import tconstruct.plugins.ic2.IC2; import tconstruct.plugins.minefactoryreloaded.MineFactoryReloaded; -import tconstruct.plugins.mystcraft.Mystcraft; -import tconstruct.plugins.nei.NotEnoughItems; -import tconstruct.plugins.thaumcraft.Thaumcraft; import tconstruct.plugins.waila.Waila; import java.io.File; diff --git a/src/main/java/tconstruct/plugins/thaumcraft/Thaumcraft.java b/src/main/java/tconstruct/plugins/Thaumcraft.java similarity index 93% rename from src/main/java/tconstruct/plugins/thaumcraft/Thaumcraft.java rename to src/main/java/tconstruct/plugins/Thaumcraft.java index 83cfe1971a0..a824fc4f30c 100644 --- a/src/main/java/tconstruct/plugins/thaumcraft/Thaumcraft.java +++ b/src/main/java/tconstruct/plugins/Thaumcraft.java @@ -1,10 +1,9 @@ -package tconstruct.plugins.thaumcraft; +package tconstruct.plugins; import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.item.ItemStack; import tconstruct.TConstruct; import tconstruct.common.TRepo; -import tconstruct.plugins.ICompatPlugin; public class Thaumcraft implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/fmp/register/ConnectedTexturesMicroMaterial.java b/src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java similarity index 99% rename from src/main/java/tconstruct/plugins/fmp/register/ConnectedTexturesMicroMaterial.java rename to src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java index 1a0472dc1e5..494be869516 100644 --- a/src/main/java/tconstruct/plugins/fmp/register/ConnectedTexturesMicroMaterial.java +++ b/src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java @@ -1,4 +1,4 @@ -package tconstruct.plugins.fmp.register; +package tconstruct.plugins.fmp; import codechicken.lib.lighting.*; import codechicken.lib.render.*; diff --git a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java index 18ed706a18e..524c0cf5471 100644 --- a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java +++ b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java @@ -3,7 +3,6 @@ import tconstruct.TConstruct; import tconstruct.common.TRepo; import tconstruct.plugins.ICompatPlugin; -import tconstruct.plugins.fmp.register.RegisterWithFMP; public class ForgeMultiPart implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/fmp/register/RegisterWithFMP.java b/src/main/java/tconstruct/plugins/fmp/RegisterWithFMP.java similarity index 97% rename from src/main/java/tconstruct/plugins/fmp/register/RegisterWithFMP.java rename to src/main/java/tconstruct/plugins/fmp/RegisterWithFMP.java index 3a614e6cd60..a1635f8b03c 100644 --- a/src/main/java/tconstruct/plugins/fmp/register/RegisterWithFMP.java +++ b/src/main/java/tconstruct/plugins/fmp/RegisterWithFMP.java @@ -1,4 +1,4 @@ -package tconstruct.plugins.fmp.register; +package tconstruct.plugins.fmp; import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/drinkable/Drinkables.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/Drinkables.java similarity index 92% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/drinkable/Drinkables.java rename to src/main/java/tconstruct/plugins/minefactoryreloaded/Drinkables.java index 556eb21f239..8c78523934e 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/drinkable/Drinkables.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/Drinkables.java @@ -1,4 +1,4 @@ -package tconstruct.plugins.minefactoryreloaded.drinkable; +package tconstruct.plugins.minefactoryreloaded; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/GrindableHorse.java similarity index 93% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java rename to src/main/java/tconstruct/plugins/minefactoryreloaded/GrindableHorse.java index 558e24d037c..db2859ffedd 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/GrindableHorse.java @@ -1,4 +1,4 @@ -package tconstruct.plugins.minefactoryreloaded.harvestables; +package tconstruct.plugins.minefactoryreloaded; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/HarvestableOreBerry.java similarity index 96% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java rename to src/main/java/tconstruct/plugins/minefactoryreloaded/HarvestableOreBerry.java index e822ad4ee19..fbb06da8891 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/HarvestableOreBerry.java @@ -1,4 +1,4 @@ -package tconstruct.plugins.minefactoryreloaded.harvestables; +package tconstruct.plugins.minefactoryreloaded; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java index 920bc297b52..246a02d9f3e 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java @@ -19,7 +19,7 @@ public void preInit() { public void init() { TConstruct.logger.info("MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry."); - mfrRegistering.registerWithMFR(); + MFRRegistering.registerWithMFR(); /* * Perhaps TC ores should be registered as drops from the MFR Laser Drill here, but I don't know which things would be suitable for that. * Syntax: FarmingRegistry.registerLaserOre(int weight, ItemStack droppedStack)); diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java index d776eefac0d..5e352deb798 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java @@ -2,11 +2,8 @@ import powercrystals.minefactoryreloaded.api.FactoryRegistry; import tconstruct.common.TRepo; -import tconstruct.plugins.minefactoryreloaded.drinkable.Drinkables; -import tconstruct.plugins.minefactoryreloaded.harvestables.GrindableHorse; -import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry; -public class mfrRegistering +public class MFRRegistering { public static void registerWithMFR () { diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 67d50b240d2..dd8b0e88111 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -56,7 +56,7 @@ import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.Weapon; -import tconstruct.modifiers.ModAttack; +import tconstruct.modifiers.tools.ModAttack; import tconstruct.util.config.PHConstruct; import tconstruct.util.player.TPlayerStats; diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 58aec7ffa81..e3ada4ef915 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -48,12 +48,12 @@ public static void initProps (File confFile) miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); - ingotsPerOre = config.get("Smeltery Output Modification", "Ingots per ore", 2, "Number of ingots returned from smelting ores in the smeltery").getInt(2); - ingotsBronzeAlloy = config.get("Smeltery Output Modification", "Bronze ingot return", 3, "Number of ingots returned from smelting Bronze in the smeltery").getInt(3); - ingotsAluminumBrassAlloy = config.get("Smeltery Output Modification", "Aluminum Brass ingot return", 4, "Number of ingots returned from smelting Aluminum Brass in the smeltery").getInt(4); - ingotsAlumiteAlloy = config.get("Smeltery Output Modification", "Alumite ingot return", 3, "Number of ingots returned from smelting Alumite in the smeltery").getInt(3); - ingotsManyullynAlloy = config.get("Smeltery Output Modification", "Manyullyn ingot return", 1, "Number of ingots returned from smelting Manyullyn in the smeltery").getInt(1); - ingotsPigironAlloy = config.get("Smeltery Output Modification", "Pig Iron ingot return", 1, "Number of ingots returned from smelting Pig Iron in the smeltery").getInt(1); + ingotsPerOre = config.get("Smeltery Output Modification", "Ingots per ore", 2, "Number of ingots returned from smelting ores in the smeltery").getDouble(2); + ingotsBronzeAlloy = config.get("Smeltery Output Modification", "Bronze ingot return", 3, "Number of ingots returned from smelting Bronze in the smeltery").getDouble(3); + ingotsAluminumBrassAlloy = config.get("Smeltery Output Modification", "Aluminum Brass ingot return", 4, "Number of ingots returned from smelting Aluminum Brass in the smeltery").getDouble(4); + ingotsAlumiteAlloy = config.get("Smeltery Output Modification", "Alumite ingot return", 3, "Number of ingots returned from smelting Alumite in the smeltery").getDouble(3); + ingotsManyullynAlloy = config.get("Smeltery Output Modification", "Manyullyn ingot return", 1, "Number of ingots returned from smelting Manyullyn in the smeltery").getDouble(1); + ingotsPigironAlloy = config.get("Smeltery Output Modification", "Pig Iron ingot return", 1, "Number of ingots returned from smelting Pig Iron in the smeltery").getDouble(1); //1467-1489 woodStation = config.getBlock("Wood Tool Station", 1471).getInt(1471); @@ -677,12 +677,12 @@ public static void initProps (File confFile) public static boolean denyMattock; //Smeltery Output Modification - public static int ingotsPerOre; - public static int ingotsBronzeAlloy; - public static int ingotsAluminumBrassAlloy; - public static int ingotsAlumiteAlloy; - public static int ingotsManyullynAlloy; - public static int ingotsPigironAlloy; + public static double ingotsPerOre; + public static double ingotsBronzeAlloy; + public static double ingotsAluminumBrassAlloy; + public static double ingotsAlumiteAlloy; + public static double ingotsManyullynAlloy; + public static double ingotsPigironAlloy; //Ultra Hardcore modifiers public static boolean enableHealthRegen;