From 47a466ef217dfdc885ddcb586724cca7bc424bd5 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Wed, 11 Nov 2015 15:24:13 +0000 Subject: [PATCH] Some fixes for #242 --- .../java/techreborn/client/gui/GuiGrinder.java | 2 +- .../client/gui/GuiImplosionCompressor.java | 2 +- .../client/gui/GuiIndustrialSawmill.java | 2 +- src/main/java/techreborn/lib/ModInfo.java | 2 -- .../techreborn/tiles/TileIndustrialSawmill.java | 2 +- .../resources/assets/techreborn/lang/en_US.lang | 17 +++++++++++++++-- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index fb0c683a7..96fb22879 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -47,7 +47,7 @@ public class GuiGrinder extends GuiContainer { if (grinder.getMutliBlock() != true) { GuiDraw.drawTooltipBox(k + 30, l + 50 + 12 - j, 114, 10); - this.fontRendererObj.drawString(ModInfo.MISSING_MULTIBLOCK, k + 38, l + 52 + 12 - j, -1); + this.fontRendererObj.drawString(StatCollector.translateToLocal("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12 - j, -1); } if (grinder.tank.getFluidAmount() != 0) { diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index b1c979c8f..2b91b3d1c 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -46,7 +46,7 @@ public class GuiImplosionCompressor extends GuiContainer { if (compresser.getMutliBlock() != true) { GuiDraw.drawTooltipBox(k + 30, l + 50 + 12 - j, 114, 10); - this.fontRendererObj.drawString(ModInfo.MISSING_MULTIBLOCK, k + 38, l + 52 + 12 - j, -1); + this.fontRendererObj.drawString(StatCollector.translateToLocal("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12 - j, -1); } this.drawTexturedModalRect(k + 60, l + 38, 176, 14, j + 1, 16); diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index e9ef64ac7..094795a3d 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -74,7 +74,7 @@ public class GuiIndustrialSawmill extends GuiContainer { if (sawmill.getMutliBlock() != true) { GuiUtil.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10); - this.fontRendererObj.drawString(ModInfo.MISSING_MULTIBLOCK, k + 38, l + 52 + 12 - 0, -1); + this.fontRendererObj.drawString(StatCollector.translateToLocal("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12 - 0, -1); } } diff --git a/src/main/java/techreborn/lib/ModInfo.java b/src/main/java/techreborn/lib/ModInfo.java index 09ca856c5..30e5bbc60 100644 --- a/src/main/java/techreborn/lib/ModInfo.java +++ b/src/main/java/techreborn/lib/ModInfo.java @@ -13,8 +13,6 @@ public class ModInfo implements IModInfo { public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy"; public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory"; - public static final String MISSING_MULTIBLOCK = StatCollector.translateToLocal("techreborn.message.missingmultiblock"); - @Override public String MOD_NAME() { return MOD_NAME; diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index 957f0a856..e2074a1d6 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -123,7 +123,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha tank.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } - + /* IFluidHandler */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index d7adb5b78..af98335e7 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -7,8 +7,8 @@ tile.techreborn.thermalGenerator.name=Thermal Generator tile.techreborn.quantumTank.name=Quantum Tank tile.techreborn.quantumChest.name=Quantum Chest tile.techreborn.digitalChest.name=Digital Chest -tile.techreborn.centrifuge.name=Centrifuge -tile.techreborn.rollingmachine.name=Rolling machine +tile.techreborn.centrifuge.name=Industrial Centrifuge +tile.techreborn.rollingmachine.name=Rolling Machine tile.techreborn.machineCasing.standard.name=Standard Machine Casing tile.techreborn.machineCasing.reinforced.name=Reinforced Machine Casing tile.techreborn.machineCasing.advanced.name=Advanced Machine Casing @@ -553,6 +553,8 @@ item.techreborn.part.iridiumNeutronReflector.name=Iridium Neutron Reflector item.techreborn.part.massHoleDevice.name=Mass Hole Device item.techreborn.part.computerMonitor.name=Computer Monitor item.techreborn.part.machineParts.name=Machine Parts +item.techreborn.part.neutronReflector.name=Neutron Reflector +item.techreborn.part.thickNeutronReflector.name=Thick Neutron Reflector #Tools item.techreborn.rockcutter.name=Rockcutter @@ -772,6 +774,15 @@ config.techreborn.category.power=Power Configs config.techreborn.category.crafting=Crafting Configs config.techreborn.category.uu=UU Configs config.techreborn.category.emc=EMC Configs +config.techreborn.category.integration=Integration + +tr.configgui.category.trGeneral.tooltip=General +tr.configgui.category.trWorld.tooltip=World +tr.configgui.category.trPower.tooltip=Power +tr.configgui.category.trCrafting.tooltip=Crafting +tr.configgui.category.truu.tooltip=UU +tr.configgui.category.tremc.tooltip=EMC +tr.configgui.category.treinter.tooltip=Mod Integration #Recipe Handlers techreborn.recipe.alloysmelter=Alloy Furnace Recipe @@ -784,6 +795,8 @@ techreborn.recipe.industrialelectrolyzer=Industrial Electrolyzer Recipe techreborn.recipe.industrialsawmill=Industrial Sawmill Recipe techreborn.recipe.lathe=Lathe Recipe techreborn.recipe.platecuttingmachine=Plate Cutting Machine Recipe +techreborn.recipe.chemicalReactor=Chemical Reactor Recipe +techreborn.recipe.implosioncompressor=Implosion Compressor #Message techreborn.message.missingmultiblock=MISSING MULTIBLOCK