Hotfix for Assembly Line Casing ID Shift (#147)

* Revert "Remove Coke Oven Bricks (#122)" * Hide the Coke Oven block from JEI until we can actually remove it. * See #146 for more information
Shadows-of-Fire · May 7, 2021 · 5393918 · 5393918
1 parent 82b46d4
commit 5393918
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/gregicadditions/item/GAMultiblockCasing.java b/src/main/java/gregicadditions/item/GAMultiblockCasing.java
@@ -18,7 +18,7 @@ public GAMultiblockCasing() {
 		setResistance(10.0f);
 		setSoundType(SoundType.METAL);
 		setHarvestLevel("wrench", 2);
-		setDefaultState(getState(CasingType.TUNGSTENSTEEL_GEARBOX_CASING));
+		setDefaultState(getState(CasingType.COKE_OVEN_BRICKS));
 	}
 
 	@Override
@@ -28,6 +28,7 @@ public boolean canCreatureSpawn(IBlockState state, IBlockAccess world, BlockPos
 
 	public enum CasingType implements IStringSerializable {
 
+		COKE_OVEN_BRICKS("coke_oven_bricks"),
 		TUNGSTENSTEEL_GEARBOX_CASING("tungstensteel_gearbox_casing");
 
 		private final String name;

diff --git a/src/main/java/gregicadditions/jei/JEIGAPlugin.java b/src/main/java/gregicadditions/jei/JEIGAPlugin.java
@@ -1,9 +1,11 @@
 package gregicadditions.jei;
 
+import gregicadditions.item.*;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.JEIPlugin;
 import mezz.jei.api.recipe.IRecipeCategoryRegistration;
+import net.minecraft.block.*;
 
 @JEIPlugin
 public class JEIGAPlugin implements IModPlugin {
@@ -16,6 +18,10 @@ public void registerCategories(IRecipeCategoryRegistration registry) {
 	@Override
 	public void register(IModRegistry registry) {
 		GAMultiblockInfoCategory.registerRecipes(registry);
-
+		// Workaround - hide the Coke Oven blocks until we can remove them without ID shift
+		registry.getJeiHelpers()
+		        .getIngredientBlacklist()
+		        .addIngredientToBlacklist(GAMetaBlocks.MUTLIBLOCK_CASING
+			                                  .getItemVariant(GAMultiblockCasing.CasingType.COKE_OVEN_BRICKS));
 	}
 }
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/brick.coke.json b/src/main/resources/assets/gregtech/models/item/metaitems/brick.coke.json
@@ -0,0 +1,7 @@
+
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/metaitems/brick.coke"
+  }
+}
diff --git a/...rces/assets/gregtech/textures/blocks/casings/solid/machine_coke_oven_bricks.png b/...rces/assets/gregtech/textures/blocks/casings/solid/machine_coke_oven_bricks.png
diff --git a/src/main/resources/assets/gtadditions/blockstates/ga_multiblock_casing.json b/src/main/resources/assets/gtadditions/blockstates/ga_multiblock_casing.json
@@ -8,6 +8,11 @@
   },
   "variants": {
     "variant": {
+      "coke_oven_bricks": {
+        "textures": {
+          "all": "gregtech:blocks/casings/solid/machine_coke_oven_bricks"
+        }
+      },
       "tungstensteel_gearbox_casing": {
         "textures": {
           "all": "gregtech:blocks/casings/gearbox/machine_casing_gearbox_tungstensteel"