tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Re-added NEI

Browse source
This commit is contained in:
Aidan C. Brady 2014-06-13 00:26:07 +02:00
parent c8fb800c1a
commit 517c2a7655
23 changed files with 64 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toreturn/nei/AdvancedMachineRecipeHandler.java → src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java
View file

@ -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;

23
toreturn/nei/BaseRecipeHandler.java → src/main/java/mekanism/client/nei/BaseRecipeHandler.java
View file

@ -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<String> list, int xAxis, int yAxis) {}
public FontRenderer getFont() { return null; }
@Override
public FontRenderer getFont()
{
return null;
}
}

6
toreturn/nei/ChanceMachineRecipeHandler.java → src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java
View file

@ -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;

6
toreturn/nei/ChemicalCrystallizerRecipeHandler.java → src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java
View file

@ -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;

6
toreturn/nei/ChemicalDissolutionChamberRecipeHandler.java → src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java
View file

@ -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;

6
toreturn/nei/ChemicalInfuserRecipeHandler.java → src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java
View file

@ -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;

0
toreturn/nei/ChemicalInjectionChamberRecipeHandler.java → src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java
View file

6
toreturn/nei/ChemicalOxidizerRecipeHandler.java → src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java
View file

@ -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;

6
toreturn/nei/ChemicalWasherRecipeHandler.java → src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java
View file

@ -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;

4
toreturn/nei/CombinerRecipeHandler.java → src/main/java/mekanism/client/nei/CombinerRecipeHandler.java
View file

@ -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<ItemStack> getFuelStacks(Gas gasType)
{
return ListUtils.asList(new ItemStack(Block.cobblestone));
return ListUtils.asList(new ItemStack(Blocks.cobblestone));
}
@Override

0
toreturn/nei/CrusherRecipeHandler.java → src/main/java/mekanism/client/nei/CrusherRecipeHandler.java
View file

6
toreturn/nei/ElectrolyticSeparatorRecipeHandler.java → src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java
View file

@ -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;

0
toreturn/nei/EnrichmentChamberRecipeHandler.java → src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java
View file

6
toreturn/nei/MachineRecipeHandler.java → src/main/java/mekanism/client/nei/MachineRecipeHandler.java
View file

@ -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;

5
toreturn/nei/MekanismRecipeHandler.java → src/main/java/mekanism/client/nei/MekanismRecipeHandler.java
View file

@ -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;
}

4
toreturn/nei/MetallurgicInfuserRecipeHandler.java → src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java
View file

@ -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;

5
toreturn/nei/NEIMekanismConfig.java → src/main/java/mekanism/client/nei/NEIMekanismConfig.java
View file

@ -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

0
toreturn/nei/OsmiumCompressorRecipeHandler.java → src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java
View file

0
toreturn/nei/PrecisionSawmillRecipeHandler.java → src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java
View file

4
toreturn/nei/PurificationChamberRecipeHandler.java → src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java
View file

@ -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<ItemStack>();

8
toreturn/nei/RotaryCondensentratorRecipeHandler.java → src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java
View file

@ -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;

6
toreturn/nei/SalinationControllerRecipeHandler.java → src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java
View file

@ -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;

3
src/main/resources/assets/mekanism/lang/en_US.lang
View file

@ -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