From 517c2a7655aeb75d1c07cc544ac243cda84c8bfd Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 13 Jun 2014 00:26:07 +0200 Subject: [PATCH] Re-added NEI --- .../nei/AdvancedMachineRecipeHandler.java | 6 ++--- .../client}/nei/BaseRecipeHandler.java | 23 ++++++++++++------- .../nei/ChanceMachineRecipeHandler.java | 6 ++--- .../ChemicalCrystallizerRecipeHandler.java | 6 ++--- ...emicalDissolutionChamberRecipeHandler.java | 6 ++--- .../nei/ChemicalInfuserRecipeHandler.java | 6 ++--- ...ChemicalInjectionChamberRecipeHandler.java | 0 .../nei/ChemicalOxidizerRecipeHandler.java | 6 ++--- .../nei/ChemicalWasherRecipeHandler.java | 6 ++--- .../client}/nei/CombinerRecipeHandler.java | 4 ++-- .../client}/nei/CrusherRecipeHandler.java | 0 .../ElectrolyticSeparatorRecipeHandler.java | 6 ++--- .../nei/EnrichmentChamberRecipeHandler.java | 0 .../client}/nei/MachineRecipeHandler.java | 6 ++--- .../client}/nei/MekanismRecipeHandler.java | 5 ++-- .../nei/MetallurgicInfuserRecipeHandler.java | 4 ++-- .../client}/nei/NEIMekanismConfig.java | 5 ++-- .../nei/OsmiumCompressorRecipeHandler.java | 0 .../nei/PrecisionSawmillRecipeHandler.java | 0 .../nei/PurificationChamberRecipeHandler.java | 4 ++-- .../RotaryCondensentratorRecipeHandler.java | 8 +++---- .../SalinationControllerRecipeHandler.java | 6 ++--- .../resources/assets/mekanism/lang/en_US.lang | 3 +++ 23 files changed, 64 insertions(+), 52 deletions(-) rename {toreturn => src/main/java/mekanism/client}/nei/AdvancedMachineRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/BaseRecipeHandler.java (89%) rename {toreturn => src/main/java/mekanism/client}/nei/ChanceMachineRecipeHandler.java (95%) rename {toreturn => src/main/java/mekanism/client}/nei/ChemicalCrystallizerRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/ChemicalDissolutionChamberRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/ChemicalInfuserRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/ChemicalInjectionChamberRecipeHandler.java (100%) rename {toreturn => src/main/java/mekanism/client}/nei/ChemicalOxidizerRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/ChemicalWasherRecipeHandler.java (98%) rename {toreturn => src/main/java/mekanism/client}/nei/CombinerRecipeHandler.java (91%) rename {toreturn => src/main/java/mekanism/client}/nei/CrusherRecipeHandler.java (100%) rename {toreturn => src/main/java/mekanism/client}/nei/ElectrolyticSeparatorRecipeHandler.java (98%) rename {toreturn => src/main/java/mekanism/client}/nei/EnrichmentChamberRecipeHandler.java (100%) rename {toreturn => src/main/java/mekanism/client}/nei/MachineRecipeHandler.java (95%) rename {toreturn => src/main/java/mekanism/client}/nei/MekanismRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/MetallurgicInfuserRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/NEIMekanismConfig.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/OsmiumCompressorRecipeHandler.java (100%) rename {toreturn => src/main/java/mekanism/client}/nei/PrecisionSawmillRecipeHandler.java (100%) rename {toreturn => src/main/java/mekanism/client}/nei/PurificationChamberRecipeHandler.java (89%) rename {toreturn => src/main/java/mekanism/client}/nei/RotaryCondensentratorRecipeHandler.java (97%) rename {toreturn => src/main/java/mekanism/client}/nei/SalinationControllerRecipeHandler.java (97%) diff --git a/toreturn/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java similarity index 97% rename from toreturn/nei/AdvancedMachineRecipeHandler.java rename to src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index 2ae08c079..ea9b5ae5a 100644 --- a/toreturn/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/toreturn/nei/BaseRecipeHandler.java b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java similarity index 89% rename from toreturn/nei/BaseRecipeHandler.java rename to src/main/java/mekanism/client/nei/BaseRecipeHandler.java index e4c75d041..e52ebd20f 100644 --- a/toreturn/nei/BaseRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java @@ -1,19 +1,19 @@ package mekanism.client.nei; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.gui; + import java.util.HashSet; import java.util.List; import java.util.Set; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.core.gui.GuiDraw.gui; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; @@ -141,20 +141,27 @@ public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements return false; } + @Override public void drawTexturedRect(int x, int y, int u, int v, int w, int h) { drawTexturedModalRect(x, y, u, v, w, h); } - public void drawTexturedRectFromIcon(int x, int y, Icon icon, int w, int h) + @Override + public void drawTexturedRectFromIcon(int x, int y, IIcon icon, int w, int h) { gui.drawTexturedModelRectFromIcon(x, y, icon, w, h); } + @Override public void displayTooltip(String s, int xAxis, int yAxis) {} + @Override public void displayTooltips(List list, int xAxis, int yAxis) {} - public FontRenderer getFont() { return null; } - + @Override + public FontRenderer getFont() + { + return null; + } } diff --git a/toreturn/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java similarity index 95% rename from toreturn/nei/ChanceMachineRecipeHandler.java rename to src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index d6303f3e3..b10388f53 100644 --- a/toreturn/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -1,8 +1,8 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.core.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.drawString; import java.awt.Rectangle; import java.util.Map; diff --git a/toreturn/nei/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java similarity index 97% rename from toreturn/nei/ChemicalCrystallizerRecipeHandler.java rename to src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java index a8ef1108c..ae29dba17 100644 --- a/toreturn/nei/ChemicalCrystallizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/toreturn/nei/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java similarity index 97% rename from toreturn/nei/ChemicalDissolutionChamberRecipeHandler.java rename to src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java index 4b5544644..65266ccb9 100644 --- a/toreturn/nei/ChemicalDissolutionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -23,7 +23,7 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/toreturn/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java similarity index 97% rename from toreturn/nei/ChemicalInfuserRecipeHandler.java rename to src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index 81ea0252b..d83deb3b6 100644 --- a/toreturn/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -21,7 +21,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; diff --git a/toreturn/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java similarity index 100% rename from toreturn/nei/ChemicalInjectionChamberRecipeHandler.java rename to src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java diff --git a/toreturn/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java similarity index 97% rename from toreturn/nei/ChemicalOxidizerRecipeHandler.java rename to src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index c3a071f80..53164be86 100644 --- a/toreturn/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; diff --git a/toreturn/nei/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java similarity index 98% rename from toreturn/nei/ChemicalWasherRecipeHandler.java rename to src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java index 765a531f1..1fab96d11 100644 --- a/toreturn/nei/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -22,7 +22,7 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; diff --git a/toreturn/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java similarity index 91% rename from toreturn/nei/CombinerRecipeHandler.java rename to src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index 6659dac1d..06178d47a 100644 --- a/toreturn/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -8,7 +8,7 @@ import mekanism.api.gas.Gas; import mekanism.client.gui.GuiCombiner; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; -import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler @@ -46,7 +46,7 @@ public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler @Override public List getFuelStacks(Gas gasType) { - return ListUtils.asList(new ItemStack(Block.cobblestone)); + return ListUtils.asList(new ItemStack(Blocks.cobblestone)); } @Override diff --git a/toreturn/nei/CrusherRecipeHandler.java b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java similarity index 100% rename from toreturn/nei/CrusherRecipeHandler.java rename to src/main/java/mekanism/client/nei/CrusherRecipeHandler.java diff --git a/toreturn/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java similarity index 98% rename from toreturn/nei/ElectrolyticSeparatorRecipeHandler.java rename to src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index 6ca8bd170..386412516 100644 --- a/toreturn/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -21,7 +21,7 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; diff --git a/toreturn/nei/EnrichmentChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java similarity index 100% rename from toreturn/nei/EnrichmentChamberRecipeHandler.java rename to src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java diff --git a/toreturn/nei/MachineRecipeHandler.java b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java similarity index 95% rename from toreturn/nei/MachineRecipeHandler.java rename to src/main/java/mekanism/client/nei/MachineRecipeHandler.java index 3edd5436a..bd1269ce8 100644 --- a/toreturn/nei/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java @@ -1,8 +1,8 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.core.gui.GuiDraw.gui; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.gui; import java.awt.Rectangle; import java.util.Map; diff --git a/toreturn/nei/MekanismRecipeHandler.java b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java similarity index 97% rename from toreturn/nei/MekanismRecipeHandler.java rename to src/main/java/mekanism/client/nei/MekanismRecipeHandler.java index e7feb7525..cdb1df989 100644 --- a/toreturn/nei/MekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java @@ -9,6 +9,7 @@ import mekanism.common.IEnergyCube; import mekanism.common.IFactory; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.MekanismRecipe; +import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -20,7 +21,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler @Override public String getRecipeName() { - return "Shaped Mekanism Crafting"; + return "Mekanism " + MekanismUtils.localize("recipe.mekanismShaped"); } @Override @@ -93,7 +94,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler return true; } - if(stack1.itemID != stack2.itemID) + if(stack1.getItem() != stack2.getItem()) { return false; } diff --git a/toreturn/nei/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java similarity index 97% rename from toreturn/nei/MetallurgicInfuserRecipeHandler.java rename to src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index 8ab757fc2..cb3fe2edd 100644 --- a/toreturn/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Rectangle; import java.util.ArrayList; diff --git a/toreturn/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java similarity index 97% rename from toreturn/nei/NEIMekanismConfig.java rename to src/main/java/mekanism/client/nei/NEIMekanismConfig.java index 017920404..3cf14e86f 100644 --- a/toreturn/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -17,6 +17,7 @@ import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.client.gui.GuiSalinationController; import mekanism.common.Mekanism; +import net.minecraft.item.ItemStack; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; @@ -93,8 +94,8 @@ public class NEIMekanismConfig implements IConfigureNEI API.setGuiOffset(GuiChemicalWasher.class, ChemicalWasherRecipeHandler.xOffset, ChemicalWasherRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalCrystallizer.class, ChemicalCrystallizerRecipeHandler.xOffset, ChemicalCrystallizerRecipeHandler.yOffset); - API.hideItem(Mekanism.boundingBlockID); - API.hideItem(Mekanism.ItemProxy.itemID); + API.hideItem(new ItemStack(Mekanism.BoundingBlock)); + API.hideItem(new ItemStack(Mekanism.ItemProxy)); } @Override diff --git a/toreturn/nei/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java similarity index 100% rename from toreturn/nei/OsmiumCompressorRecipeHandler.java rename to src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java diff --git a/toreturn/nei/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java similarity index 100% rename from toreturn/nei/PrecisionSawmillRecipeHandler.java rename to src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java diff --git a/toreturn/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java similarity index 89% rename from toreturn/nei/PurificationChamberRecipeHandler.java rename to src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index 126da20a8..890cee96f 100644 --- a/toreturn/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -10,7 +10,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; -import net.minecraft.item.Item; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler @@ -50,7 +50,7 @@ public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandl { if(gasType == GasRegistry.getGas("oxygen")) { - return ListUtils.asList(new ItemStack(Item.flint), MekanismUtils.getFullGasTank(GasRegistry.getGas("oxygen"))); + return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(GasRegistry.getGas("oxygen"))); } return new ArrayList(); diff --git a/toreturn/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java similarity index 97% rename from toreturn/nei/RotaryCondensentratorRecipeHandler.java rename to src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index 08ec78b7f..ed9e96e95 100644 --- a/toreturn/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -1,8 +1,8 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawString; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.awt.Rectangle; @@ -19,7 +19,7 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; diff --git a/toreturn/nei/SalinationControllerRecipeHandler.java b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java similarity index 97% rename from toreturn/nei/SalinationControllerRecipeHandler.java rename to src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java index 2e73c377a..105476ab1 100644 --- a/toreturn/nei/SalinationControllerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java @@ -1,7 +1,7 @@ package mekanism.client.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import java.awt.Point; import java.util.HashMap; @@ -20,7 +20,7 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import codechicken.core.gui.GuiDraw; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index a411d716d..3816eadc9 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -406,6 +406,9 @@ gui.digitalMiner.toMine=To mine gui.digitalMiner.running=Running gui.digitalMiner.inverse=Inverse mode +//Recipe names +recipe.mekanismShaped=Shaped Crafting + //Item and block tooltip text tooltip.configurator.modify=Modify tooltip.configurator.empty=Empty