Trying to make Things usable as Ingredient

SleepyTrousers · Dec 12, 2017 · 9202e1f · 9202e1f
1 parent b8073bc
commit 9202e1f
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 196 deletions.
diff --git a/gradlew b/gradlew
diff --git a/src/main/java/com/enderio/core/client/ClientProxy.java b/src/main/java/com/enderio/core/client/ClientProxy.java
@@ -1,17 +1,12 @@
 package com.enderio.core.client;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.CommonProxy;
-import com.enderio.core.common.util.NNList;
 import com.enderio.core.common.util.Scheduler;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
@@ -40,15 +35,4 @@ public void onPreInit(@Nonnull FMLPreInitializationEvent event) {
     IconUtil.instance.init();
   }
 
-  @Override
-  public CreativeTabs getCreativeTab(@Nonnull ItemStack stack) {
-    return stack.getItem().getCreativeTab();
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public void getSubItems(@Nonnull Item itemIn, @Nullable CreativeTabs tab, @Nonnull NNList<ItemStack> subItems) {
-    itemIn.getSubItems(tab, subItems);
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/CommonProxy.java b/src/main/java/com/enderio/core/common/CommonProxy.java
@@ -1,14 +1,9 @@
 package com.enderio.core.common;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
-import com.enderio.core.common.util.NNList;
 import com.enderio.core.common.util.Scheduler;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
@@ -45,18 +40,4 @@ public void throwModCompatibilityError(@Nonnull String... msgs) {
   public void onPreInit(@Nonnull FMLPreInitializationEvent event) {
   }
 
-  /**
-   * Proxy for Item.getCreativeTab(), which is client-only.
-   */
-  public CreativeTabs getCreativeTab(@Nonnull ItemStack stack) {
-    return null;
-  }
-
-  /**
-   * Proxy for Item.getSubItems(), which is client-only.
-   */
-  public void getSubItems(@Nonnull Item itemIn, @Nullable CreativeTabs tab, @Nonnull NNList<ItemStack> subItems) {
-    subItems.add(new ItemStack(itemIn));
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/BlockThing.java b/src/main/java/com/enderio/core/common/util/stackable/BlockThing.java
@@ -56,9 +56,4 @@ public boolean is(@Nullable Block block) {
     return new NNList<Block>(thing);
   }
 
-  @Override
-  public @Nullable Object getRecipeObject() {
-    return thing;
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/IThing.java b/src/main/java/com/enderio/core/common/util/stackable/IThing.java
@@ -29,6 +29,4 @@ interface IThing {
   @Nonnull
   NNList<Block> getBlocks();
 
-  @Nullable
-  Object getRecipeObject();
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/ItemStackThing.java b/src/main/java/com/enderio/core/common/util/stackable/ItemStackThing.java
@@ -57,9 +57,4 @@ public boolean is(@Nullable Block block) {
     return block != Blocks.AIR ? new NNList<Block>(block) : NNList.<Block> emptyList();
   }
 
-  @Override
-  public @Nullable Object getRecipeObject() {
-    return thing;
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/ItemThing.java b/src/main/java/com/enderio/core/common/util/stackable/ItemThing.java
@@ -54,9 +54,4 @@ public boolean is(@Nullable Block block) {
     return block != Blocks.AIR ? new NNList<Block>(block) : NNList.<Block> emptyList();
   }
 
-  @Override
-  public @Nullable Object getRecipeObject() {
-    return thing;
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/OreThing.java b/src/main/java/com/enderio/core/common/util/stackable/OreThing.java
@@ -93,9 +93,4 @@ public boolean is(@Nullable Block block) {
     return result;
   }
 
-  @Override
-  public @Nullable Object getRecipeObject() {
-    return name;
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/ProducerThing.java b/src/main/java/com/enderio/core/common/util/stackable/ProducerThing.java
@@ -60,9 +60,4 @@ public boolean is(@Nullable Block block) {
     return NNList.<Block> emptyList();
   }
 
-  @Override
-  public @Nullable Object getRecipeObject() {
-    return null;
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/RebuildableThings.java b/src/main/java/com/enderio/core/common/util/stackable/RebuildableThings.java
diff --git a/src/main/java/com/enderio/core/common/util/stackable/ResourceThing.java b/src/main/java/com/enderio/core/common/util/stackable/ResourceThing.java
@@ -63,9 +63,4 @@ public boolean is(@Nullable Block block) {
     return NNList.<Block> emptyList();
   }
 
-  @Override
-  public @Nullable Object getRecipeObject() {
-    return null;
-  }
-
 }
diff --git a/src/main/java/com/enderio/core/common/util/stackable/StringThing.java b/src/main/java/com/enderio/core/common/util/stackable/StringThing.java
@@ -130,9 +130,4 @@ public boolean is(@Nullable Block block) {
     return NNList.<Block> emptyList();
   }
 
-  @Override
-  public @Nullable Object getRecipeObject() {
-    return null;
-  }
-
 }