Fixed "Biomes O' Plenty" compatibility

core/src/main/java/me/duart/mctb/blocks/BlockIds.java

@@ -14,17 +14,19 @@ public class BlockIds {
             "bamboo",
             "mangrove",
             // biomesoplenty:
-            "bop_cherry",
-            "dead",
-            "fir",
-            "hellbark",
-            "jacaranda",
-            "magic",
-            "mahogany",
-            "palm",
-            "redwood",
-            "umbran",
-            "willow",
+            "fir",              // fine
+            "bop_pine",         // new block :: biomesoplenty:pine_planks
+            "bop_maple",        // new block :: biomesoplenty:maple_planks
+            "redwood",          // update texture
+            "mahogany",         // update texture
+            "jacaranda",        // update texture
+            "palm",             // fine
+            "willow",           // fine
+            "dead",             // fine
+            "magic",            // fine
+            "umbran",           // update texture
+            "hellbark",         // fine
+            "empyreal",         // new block :: biomesoplenty:empyrean_planks
             // quark:
             "azalea",
             "ancient",

core/src/main/resources/assets/mctb/blockstates/bop_maple_crafting_table.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mctb:block/bop_maple_crafting_table"
+    }
+  }
+}

core/src/main/resources/assets/mctb/blockstates/bop_pine_crafting_table.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mctb:block/bop_pine_crafting_table"
+    }
+  }
+}

core/src/main/resources/assets/mctb/blockstates/empyreal_crafting_table.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mctb:block/empyreal_crafting_table"
+    }
+  }
+}

core/src/main/resources/assets/mctb/lang/en_us.json

@@ -11,7 +11,6 @@
   "block.mctb.mangrove_crafting_table": "Mangrove Crafting Table",
   "block.mctb.bamboo_crafting_table": "Bamboo Crafting Table",
 
-  "block.mctb.bop_cherry_crafting_table": "Cherry Crafting Table",
   "block.mctb.dead_crafting_table": "Dead Crafting Table",
   "block.mctb.fir_crafting_table": "Fir Crafting Table",
   "block.mctb.hellbark_crafting_table": "Hellbark Crafting Table",
@@ -22,6 +21,9 @@
   "block.mctb.redwood_crafting_table": "Redwood Crafting Table",
   "block.mctb.umbran_crafting_table": "Umbran Crafting Table",
   "block.mctb.willow_crafting_table": "Willow Crafting Table",
+  "block.mctb.bop_maple_crafting_table": "Maple Crafting Table",
+  "block.mctb.bop_pine_crafting_table": "Pine Crafting Table",
+  "block.mctb.empyreal_crafting_table": "Empyreal Crafting Table",
 
   "block.mctb.azalea_crafting_table": "Azalea Crafting Table",
   "block.mctb.cherry_crafting_table": "Cherry Crafting Table",

core/src/main/resources/assets/mctb/models/block/bop_maple_crafting_table.json

@@ -0,0 +1,12 @@
+{
+  "parent": "minecraft:block/cube",
+  "textures": {
+    "particle": "mctb:block/bop_maple_crafting_table_front",
+    "up": "mctb:block/bop_maple_crafting_table_top",
+    "down": "mctb:block/bop_maple_planks",
+    "north": "mctb:block/bop_maple_crafting_table_front",
+    "south": "mctb:block/bop_maple_crafting_table_side",
+    "west": "mctb:block/bop_maple_crafting_table_front",
+    "east": "mctb:block/bop_maple_crafting_table_side"
+  }
+}

core/src/main/resources/assets/mctb/models/block/bop_pine_crafting_table.json

@@ -0,0 +1,12 @@
+{
+  "parent": "minecraft:block/cube",
+  "textures": {
+    "particle": "mctb:block/bop_pine_crafting_table_front",
+    "up": "mctb:block/bop_pine_crafting_table_top",
+    "down": "mctb:block/bop_pine_planks",
+    "north": "mctb:block/bop_pine_crafting_table_front",
+    "south": "mctb:block/bop_pine_crafting_table_side",
+    "west": "mctb:block/bop_pine_crafting_table_front",
+    "east": "mctb:block/bop_pine_crafting_table_side"
+  }
+}

core/src/main/resources/assets/mctb/models/block/empyreal_crafting_table.json

@@ -0,0 +1,12 @@
+{
+  "parent": "minecraft:block/cube",
+  "textures": {
+    "particle": "mctb:block/empyreal_crafting_table_front",
+    "up": "mctb:block/empyreal_crafting_table_top",
+    "down": "mctb:block/empyreal_planks",
+    "north": "mctb:block/empyreal_crafting_table_front",
+    "south": "mctb:block/empyreal_crafting_table_side",
+    "west": "mctb:block/empyreal_crafting_table_front",
+    "east": "mctb:block/empyreal_crafting_table_side"
+  }
+}

core/src/main/resources/assets/mctb/models/item/bop_maple_crafting_table.json

@@ -0,0 +1,3 @@
+{
+  "parent": "mctb:block/bop_maple_crafting_table"
+}

core/src/main/resources/assets/mctb/models/item/bop_pine_crafting_table.json

@@ -0,0 +1,3 @@
+{
+  "parent": "mctb:block/bop_pine_crafting_table"
+}

core/src/main/resources/assets/mctb/models/item/empyreal_crafting_table.json

@@ -0,0 +1,3 @@
+{
+  "parent": "mctb:block/empyreal_crafting_table"
+}

core/src/main/resources/data/forge/tags/block/workbench.json

@@ -12,7 +12,6 @@
     "mctb:bamboo_crafting_table",
     "mctb:mangrove_crafting_table",
 
-    "mctb:bop_cherry_crafting_table",
     "mctb:dead_crafting_table",
     "mctb:fir_crafting_table",
     "mctb:hellbark_crafting_table",
@@ -23,6 +22,9 @@
     "mctb:redwood_crafting_table",
     "mctb:umbran_crafting_table",
     "mctb:willow_crafting_table",
+    "mctb:bop_maple_crafting_table",
+    "mctb:bop_pine_crafting_table",
+    "mctb:empyreal_crafting_table",
 
     "mctb:azalea_crafting_table",
     "mctb:ancient_crafting_table",

core/src/main/resources/data/forge/tags/block/workbenches.json

@@ -12,7 +12,6 @@
     "mctb:bamboo_crafting_table",
     "mctb:mangrove_crafting_table",
 
-    "mctb:bop_cherry_crafting_table",
     "mctb:dead_crafting_table",
     "mctb:fir_crafting_table",
     "mctb:hellbark_crafting_table",
@@ -23,6 +22,9 @@
     "mctb:redwood_crafting_table",
     "mctb:umbran_crafting_table",
     "mctb:willow_crafting_table",
+    "mctb:bop_maple_crafting_table",
+    "mctb:bop_pine_crafting_table",
+    "mctb:empyreal_crafting_table",
 
     "mctb:azalea_crafting_table",
     "mctb:ancient_crafting_table",

core/src/main/resources/data/mctb/loot_table/blocks/bop_maple_crafting_table.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "mctb:bop_maple_crafting_table"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

core/src/main/resources/data/mctb/loot_table/blocks/bop_pine_crafting_table.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "mctb:bop_pine_crafting_table"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

core/src/main/resources/data/mctb/loot_table/blocks/empyreal_crafting_table.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "mctb:empyreal_crafting_table"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

core/src/main/resources/data/mctb/recipe/bop_maple_crafting_table.json

@@ -0,0 +1,16 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "##",
+        "##"
+    ],
+    "key": {
+        "#": {
+            "item": "biomesoplenty:maple_planks"
+        }
+    },
+    "result": {
+        "id": "mctb:bop_maple_crafting_table",
+        "count": 1
+    }
+}

core/src/main/resources/data/mctb/recipe/bop_pine_crafting_table.json

@@ -0,0 +1,16 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "##",
+        "##"
+    ],
+    "key": {
+        "#": {
+            "item": "biomesoplenty:pine_planks"
+        }
+    },
+    "result": {
+        "id": "mctb:bop_pine_crafting_table",
+        "count": 1
+    }
+}

core/src/main/resources/data/mctb/recipe/empyreal_crafting_table.json

@@ -0,0 +1,16 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "##",
+        "##"
+    ],
+    "key": {
+        "#": {
+            "item": "biomesoplenty:empyreal_planks"
+        }
+    },
+    "result": {
+        "id": "mctb:empyreal_crafting_table",
+        "count": 1
+    }
+}

core/src/main/resources/data/mctb/tags/item/revertable_workbench.json

@@ -12,7 +12,6 @@
     "mctb:bamboo_crafting_table",
     "mctb:mangrove_crafting_table",
 
-    "mctb:bop_cherry_crafting_table",
     "mctb:dead_crafting_table",
     "mctb:fir_crafting_table",
     "mctb:hellbark_crafting_table",
@@ -23,6 +22,9 @@
     "mctb:redwood_crafting_table",
     "mctb:umbran_crafting_table",
     "mctb:willow_crafting_table",
+    "mctb:bop_maple_crafting_table",
+    "mctb:bop_pine_crafting_table",
+    "mctb:empyreal_crafting_table",
 
     "mctb:azalea_crafting_table",
     "mctb:ancient_crafting_table",

core/src/main/resources/data/minecraft/advancement/recipes/decorations/crafting_table.json

@@ -88,7 +88,10 @@
       "mctb:ru_redwood_crafting_table",
       "mctb:socotra_crafting_table",
       "mctb:ru_willow_crafting_table",
-      "mctb:yellow_bioshroom_crafting_table"
+      "mctb:yellow_bioshroom_crafting_table",
+      "mctb:bop_maple_crafting_table",
+      "mctb:bop_pine_crafting_table",
+      "mctb:empyreal_crafting_table"
     ]
   }
 }

core/src/main/resources/data/minecraft/tags/block/mineable/axe.json

@@ -12,7 +12,6 @@
     "mctb:bamboo_crafting_table",
     "mctb:mangrove_crafting_table",
 
-    "mctb:bop_cherry_crafting_table",
     "mctb:dead_crafting_table",
     "mctb:fir_crafting_table",
     "mctb:hellbark_crafting_table",
@@ -23,6 +22,9 @@
     "mctb:redwood_crafting_table",
     "mctb:umbran_crafting_table",
     "mctb:willow_crafting_table",
+    "mctb:bop_maple_crafting_table",
+    "mctb:bop_pine_crafting_table",
+    "mctb:empyreal_crafting_table",
 
     "mctb:azalea_crafting_table",
     "mctb:ancient_crafting_table",

forge/src/main/resources/META-INF/mods.toml

@@ -7,10 +7,10 @@ modId = "mctb"
 version = "${version}"
 displayName = "${mod_name}"
 logoFile="mctb.png"
-credits = "${credits}"
+credits= "${credits}"
 authors='''
 P3NG00 = Original creator of the mod for Fabric
-852Duarte = Ported for Forge
+852Duarte = Ported for Forge and NeoForge
 '''
 
 description='''

gradle.properties

@@ -3,7 +3,7 @@ group=com.duart.mctb
 java_version=21
 
 minecraft_version=1.21
-mod_name=MoreCraftingTables
+mod_name=More Crafting Tables
 mod_author=DaveDuart (fork), P3NG00 (original author)
 mod_id=mctb
 license=MIT