Trying to backport 1.18.4 and 1.18.5 fixes

age-series · Mar 27, 2021 · 8a4ba7a · 8a4ba7a
1 parent 4561471
commit 8a4ba7a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/src/main/java/mods/eln/node/six/SixNodeBlock.kt b/src/main/java/mods/eln/node/six/SixNodeBlock.kt
@@ -78,7 +78,7 @@ class SixNodeBlock  // public static ArrayList<Integer> repertoriedItemStackId =
     }
 
     // @SideOnly(Side.CLIENT)
-    override fun getSubBlocks(par1: Item, tab: CreativeTabs, subItems: List<*>?) {
+    override fun getSubBlocks(par1: Item, tab: CreativeTabs?, subItems: List<*>?) {
         /*
 		 * for (Integer id : repertoriedItemStackId) { subItems.add(new ItemStack(this, 1, id)); }
 		 */

diff --git a/src/main/java/mods/eln/sixnode/TreeResinCollector/TreeResinCollectorElement.java b/src/main/java/mods/eln/sixnode/TreeResinCollector/TreeResinCollectorElement.java
@@ -54,17 +54,6 @@ public int getConnectionMask(LRDU lrdu) {
         return 0;
     }
 
-    @Override
-    public String multiMeterString() {
-        return null;
-    }
-
-    @NotNull
-    @Override
-    public String thermoMeterString() {
-        return null;
-    }
-
     @Override
     public void initialize() {
     }