From caa6c3f5a3eaeb04d41e2f1469c41ed4c5cb6a6c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Dec 2015 19:50:05 +0100 Subject: [PATCH] remove nei for now and make machines work --- build.gradle | 3 - .../java/storagecraft/block/BlockCable.java | 2 +- .../java/storagecraft/block/BlockMachine.java | 2 +- .../nei/CraftingHandlerSolderer.java | 82 ------------------- src/main/java/storagecraft/nei/NEIConfig.java | 27 ------ 5 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 src/main/java/storagecraft/nei/CraftingHandlerSolderer.java delete mode 100644 src/main/java/storagecraft/nei/NEIConfig.java diff --git a/build.gradle b/build.gradle index e8e296576..efc8073eb 100644 --- a/build.gradle +++ b/build.gradle @@ -33,9 +33,6 @@ repositories { } } dependencies { - compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev" - compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev" - compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" } processResources { diff --git a/src/main/java/storagecraft/block/BlockCable.java b/src/main/java/storagecraft/block/BlockCable.java index cb5581fba..126ba1499 100644 --- a/src/main/java/storagecraft/block/BlockCable.java +++ b/src/main/java/storagecraft/block/BlockCable.java @@ -34,7 +34,7 @@ public class BlockCable extends BlockBase implements ITileEntityProvider @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(SENSITIVE, meta); + return getDefaultState().withProperty(SENSITIVE, meta == 1 ? true : false); } @Override diff --git a/src/main/java/storagecraft/block/BlockMachine.java b/src/main/java/storagecraft/block/BlockMachine.java index bc082d46d..ce9e9bd21 100644 --- a/src/main/java/storagecraft/block/BlockMachine.java +++ b/src/main/java/storagecraft/block/BlockMachine.java @@ -27,7 +27,7 @@ public abstract class BlockMachine extends BlockBase implements ITileEntityProvi @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(CONNECTED, meta); + return getDefaultState().withProperty(CONNECTED, meta == 1 ? true : false); } @Override diff --git a/src/main/java/storagecraft/nei/CraftingHandlerSolderer.java b/src/main/java/storagecraft/nei/CraftingHandlerSolderer.java deleted file mode 100644 index e6b979b82..000000000 --- a/src/main/java/storagecraft/nei/CraftingHandlerSolderer.java +++ /dev/null @@ -1,82 +0,0 @@ -package storagecraft.nei; - -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import storagecraft.StorageCraft; -import storagecraft.gui.GuiSolderer; -import storagecraft.tile.solderer.ISoldererRecipe; -import storagecraft.tile.solderer.SoldererRegistry; - -public class CraftingHandlerSolderer extends TemplateRecipeHandler -{ - class SoldererRecipe extends CachedRecipe - { - private ArrayList ingredients = new ArrayList(); - private PositionedStack result; - - public SoldererRecipe(ISoldererRecipe recipe) - { - int x = 44 - 5; - int y = 20 - 11; - - for (int i = 0; i < 3; ++i) - { - if (recipe.getRow(i) != null) - { - this.ingredients.add(new PositionedStack(recipe.getRow(i), x, y)); - } - - y += 18; - } - - this.result = new PositionedStack(recipe.getResult(), 134 - 5, 38 - 11); - } - - @Override - public PositionedStack getResult() - { - return result; - } - - @Override - public List getIngredients() - { - return ingredients; - } - } - - @Override - public String getGuiTexture() - { - return new ResourceLocation(StorageCraft.ID, "textures/gui/solderer.png").toString(); - } - - @Override - public String getRecipeName() - { - return StatCollector.translateToLocal("gui." + StorageCraft.ID + ":solderer"); - } - - @Override - public Class getGuiClass() - { - return GuiSolderer.class; - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - ISoldererRecipe recipe = SoldererRegistry.getRecipe(result); - - if (recipe != null) - { - arecipes.add(new SoldererRecipe(recipe)); - } - } -} diff --git a/src/main/java/storagecraft/nei/NEIConfig.java b/src/main/java/storagecraft/nei/NEIConfig.java deleted file mode 100644 index 90ae63cfc..000000000 --- a/src/main/java/storagecraft/nei/NEIConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package storagecraft.nei; - -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import storagecraft.StorageCraft; - -public class NEIConfig implements IConfigureNEI -{ - @Override - public void loadConfig() - { - API.registerRecipeHandler(new CraftingHandlerSolderer()); - API.registerUsageHandler(new CraftingHandlerSolderer()); - } - - @Override - public String getName() - { - return "StorageCraft Plugin"; - } - - @Override - public String getVersion() - { - return StorageCraft.VERSION; - } -}