diff --git a/build.gradle b/build.gradle index 9d0d6a3b..176a66b3 100644 --- a/build.gradle +++ b/build.gradle @@ -43,6 +43,7 @@ minecraft { dependencies { compile files('lib/cglib-nodep-2.2.3.jar') + compile files('lib/NeiStub172.jar') } // configure the source folders @@ -50,7 +51,6 @@ sourceSets { main { java { srcDir 'src/main/java' - exclude '**/enderio/nei/**' exclude '**/enderio/trigger/**' // exclude 'some exclusion' // include 'some inclusion' diff --git a/common/cofh/api/energy/ItemEnergyContainer.java b/common/cofh/api/energy/ItemEnergyContainer.java deleted file mode 100644 index 703a2b30..00000000 --- a/common/cofh/api/energy/ItemEnergyContainer.java +++ /dev/null @@ -1,112 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -/** - * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or - * implement your own. - * - * @author King Lemming - * - */ -public class ItemEnergyContainer extends Item implements IEnergyContainerItem { - - protected int capacity; - protected int maxReceive; - protected int maxExtract; - - public ItemEnergyContainer(int itemID) { - - super(itemID); - } - - public ItemEnergyContainer(int itemID, int capacity) { - - this(itemID, capacity, capacity, capacity); - } - - public ItemEnergyContainer(int itemID, int capacity, int maxTransfer) { - - this(itemID, capacity, maxTransfer, maxTransfer); - } - - public ItemEnergyContainer(int itemID, int capacity, int maxReceive, int maxExtract) { - - super(itemID); - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } - - public ItemEnergyContainer setCapacity(int capacity) { - - this.capacity = capacity; - return this; - } - - public void setMaxTransfer(int maxTransfer) { - - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - } - - public void setMaxReceive(int maxReceive) { - - this.maxReceive = maxReceive; - } - - public void setMaxExtract(int maxExtract) { - - this.maxExtract = maxExtract; - } - - /* IEnergyContainerItem */ - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if(container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); - } - int energy = container.stackTagCompound.getInteger("Energy"); - int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - - if(!simulate) { - energy += energyReceived; - container.stackTagCompound.setInteger("Energy", energy); - } - return energyReceived; - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - - if(container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; - } - int energy = container.stackTagCompound.getInteger("Energy"); - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - - if(!simulate) { - energy -= energyExtracted; - container.stackTagCompound.setInteger("Energy", energy); - } - return energyExtracted; - } - - @Override - public int getEnergyStored(ItemStack container) { - if(container == null || container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; - } - return container.stackTagCompound.getInteger("Energy"); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - - return capacity; - } - -} diff --git a/lib/CodeChickenCore-dev 0.9.0.5_d2.jar b/lib/CodeChickenCore-dev 0.9.0.5_d2.jar deleted file mode 100644 index f468b3ab..00000000 Binary files a/lib/CodeChickenCore-dev 0.9.0.5_d2.jar and /dev/null differ diff --git a/lib/NeiStub172.jar b/lib/NeiStub172.jar new file mode 100644 index 00000000..a2a1557c Binary files /dev/null and b/lib/NeiStub172.jar differ diff --git a/lib/NotEnoughItems-dev 1.6.1.4.jar b/lib/NotEnoughItems-dev 1.6.1.4.jar deleted file mode 100644 index 56d8c009..00000000 Binary files a/lib/NotEnoughItems-dev 1.6.1.4.jar and /dev/null differ diff --git a/src/main/java/crazypants/enderio/crafting/impl/EnderIoRecipe.java b/src/main/java/crazypants/enderio/crafting/impl/EnderIoRecipe.java index 49a6323a..95613e94 100644 --- a/src/main/java/crazypants/enderio/crafting/impl/EnderIoRecipe.java +++ b/src/main/java/crazypants/enderio/crafting/impl/EnderIoRecipe.java @@ -90,6 +90,9 @@ public class EnderIoRecipe implements IEnderIoRecipe { @Override public boolean isOutput(ItemStack output) { + if(output == null) { + return false; + } for (IRecipeComponent rc : outputs) { if(rc.isEquivalent(output)) { return true; diff --git a/src/main/java/crazypants/enderio/crafting/impl/RecipeComponent.java b/src/main/java/crazypants/enderio/crafting/impl/RecipeComponent.java index 5b327470..d522482c 100644 --- a/src/main/java/crazypants/enderio/crafting/impl/RecipeComponent.java +++ b/src/main/java/crazypants/enderio/crafting/impl/RecipeComponent.java @@ -38,8 +38,8 @@ public abstract class RecipeComponent implements IRecipeComponent { } protected boolean isEqual(ItemStack left, ItemStack right) { - if(left.isItemEqual(right)) { - return left.stackTagCompound == null ? true : left.stackTagCompound.equals(right.stackTagCompound); + if(left != null && left.isItemEqual(right)) { + return left.stackTagCompound == null ? true : right.stackTagCompound != null && left.stackTagCompound.equals(right.stackTagCompound); } return false; } diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index 825268a5..94424786 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -1,8 +1,5 @@ package crazypants.enderio.nei; -import static codechicken.core.gui.GuiDraw.changeTexture; -import static codechicken.core.gui.GuiDraw.drawTexturedModalRect; - import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; @@ -56,6 +53,10 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(ItemStack result) { + if(result == null) { + return; + } + List recipes = RecipeReigistry.instance.getRecipesForOutput(IEnderIoRecipe.ALLOY_SMELTER_ID, result); for (IEnderIoRecipe recipe : recipes) { @@ -103,8 +104,9 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { @Override public void drawBackground(int recipe) { GL11.glColor4f(1, 1, 1, 1); - changeTexture(getGuiTexture()); - drawTexturedModalRect(0, 0, 5, 3, 166, 73); + + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(0, 0, 5, 3, 166, 73); } @Override @@ -136,7 +138,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { @Override public List getIngredients() { - return getCycledIngredients(cycleticks / 20, input); + return getCycledIngredients(cycleticks / 20, input); } @Override diff --git a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java index da879c24..e03bdc96 100644 --- a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java +++ b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java @@ -1,5 +1,6 @@ package crazypants.enderio.nei; +import net.minecraft.item.ItemStack; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import crazypants.enderio.Config; @@ -14,14 +15,15 @@ public class NEIEnderIOConfig implements IConfigureNEI { API.registerRecipeHandler(new SagMillRecipeHandler()); API.registerUsageHandler(new AlloySmelterRecipeHandler()); API.registerUsageHandler(new SagMillRecipeHandler()); + //TODO: API.setGuiOffset(GuiAlloySmelter.class, 5, 3); - API.hideItem(EnderIO.blockConduitFacade.blockID); - API.hideItem(EnderIO.itemEnderface.itemID); + API.hideItem(new ItemStack(EnderIO.blockConduitFacade)); + API.hideItem(new ItemStack(EnderIO.itemEnderface)); if(!Config.photovoltaicCellEnabled) { - API.hideItem(EnderIO.blockSolarPanel.blockID); + API.hideItem(new ItemStack(EnderIO.blockSolarPanel)); } if(!Config.travelAnchorEnabled) { - API.hideItem(EnderIO.itemTravelStaff.itemID); + API.hideItem(new ItemStack(EnderIO.itemTravelStaff)); } }