diff --git a/core/src/main/java/me/duart/mctb/blocks/BlockIds.java b/core/src/main/java/me/duart/mctb/blocks/BlockIds.java index 166166d..278ba4c 100644 --- a/core/src/main/java/me/duart/mctb/blocks/BlockIds.java +++ b/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", diff --git a/core/src/main/resources/assets/mctb/blockstates/bop_maple_crafting_table.json b/core/src/main/resources/assets/mctb/blockstates/bop_maple_crafting_table.json new file mode 100644 index 0000000..38e4b11 --- /dev/null +++ b/core/src/main/resources/assets/mctb/blockstates/bop_maple_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "mctb:block/bop_maple_crafting_table" + } + } +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/blockstates/bop_pine_crafting_table.json b/core/src/main/resources/assets/mctb/blockstates/bop_pine_crafting_table.json new file mode 100644 index 0000000..7299fda --- /dev/null +++ b/core/src/main/resources/assets/mctb/blockstates/bop_pine_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "mctb:block/bop_pine_crafting_table" + } + } +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/blockstates/empyreal_crafting_table.json b/core/src/main/resources/assets/mctb/blockstates/empyreal_crafting_table.json new file mode 100644 index 0000000..a3b4a16 --- /dev/null +++ b/core/src/main/resources/assets/mctb/blockstates/empyreal_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "mctb:block/empyreal_crafting_table" + } + } +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/lang/en_us.json b/core/src/main/resources/assets/mctb/lang/en_us.json index cfe238d..ef76eab 100644 --- a/core/src/main/resources/assets/mctb/lang/en_us.json +++ b/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", diff --git a/core/src/main/resources/assets/mctb/models/block/bop_cherry_crafting_table.json b/core/src/main/resources/assets/mctb/models/block/bop_cherry_crafting_table.json deleted file mode 100644 index 2c36634..0000000 --- a/core/src/main/resources/assets/mctb/models/block/bop_cherry_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "mctb:block/bop_cherry_crafting_table_front", - "up": "mctb:block/bop_cherry_crafting_table_top", - "down": "mctb:block/bop_cherry_planks", - "north": "mctb:block/bop_cherry_crafting_table_front", - "south": "mctb:block/bop_cherry_crafting_table_side", - "west": "mctb:block/bop_cherry_crafting_table_front", - "east": "mctb:block/bop_cherry_crafting_table_side" - } -} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/models/block/bop_maple_crafting_table.json b/core/src/main/resources/assets/mctb/models/block/bop_maple_crafting_table.json new file mode 100644 index 0000000..2258de3 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/models/block/bop_pine_crafting_table.json b/core/src/main/resources/assets/mctb/models/block/bop_pine_crafting_table.json new file mode 100644 index 0000000..5a9f037 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/models/block/empyreal_crafting_table.json b/core/src/main/resources/assets/mctb/models/block/empyreal_crafting_table.json new file mode 100644 index 0000000..4ccfdcb --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/models/item/bop_maple_crafting_table.json b/core/src/main/resources/assets/mctb/models/item/bop_maple_crafting_table.json new file mode 100644 index 0000000..ec8d9a3 --- /dev/null +++ b/core/src/main/resources/assets/mctb/models/item/bop_maple_crafting_table.json @@ -0,0 +1,3 @@ +{ + "parent": "mctb:block/bop_maple_crafting_table" +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/models/item/bop_pine_crafting_table.json b/core/src/main/resources/assets/mctb/models/item/bop_pine_crafting_table.json new file mode 100644 index 0000000..e568a66 --- /dev/null +++ b/core/src/main/resources/assets/mctb/models/item/bop_pine_crafting_table.json @@ -0,0 +1,3 @@ +{ + "parent": "mctb:block/bop_pine_crafting_table" +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/models/item/empyreal_crafting_table.json b/core/src/main/resources/assets/mctb/models/item/empyreal_crafting_table.json new file mode 100644 index 0000000..8b60939 --- /dev/null +++ b/core/src/main/resources/assets/mctb/models/item/empyreal_crafting_table.json @@ -0,0 +1,3 @@ +{ + "parent": "mctb:block/empyreal_crafting_table" +} \ No newline at end of file diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_front.png b/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_front.png new file mode 100644 index 0000000..15d0617 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_front.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_side.png b/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_side.png new file mode 100644 index 0000000..7ae2ffe Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_side.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_top.png b/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_top.png new file mode 100644 index 0000000..e0d5766 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_maple_crafting_table_top.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_maple_planks.png b/core/src/main/resources/assets/mctb/textures/block/bop_maple_planks.png new file mode 100644 index 0000000..678e448 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_maple_planks.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_front.png b/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_front.png new file mode 100644 index 0000000..7c35d60 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_front.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_side.png b/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_side.png new file mode 100644 index 0000000..8d32490 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_side.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_top.png b/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_top.png new file mode 100644 index 0000000..0866de9 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_pine_crafting_table_top.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/bop_pine_planks.png b/core/src/main/resources/assets/mctb/textures/block/bop_pine_planks.png new file mode 100644 index 0000000..799029d Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/bop_pine_planks.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_front.png b/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_front.png new file mode 100644 index 0000000..7ae2ab8 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_front.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_side.png b/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_side.png new file mode 100644 index 0000000..7b9b7dd Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_side.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_top.png b/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_top.png new file mode 100644 index 0000000..87040b2 Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/empyreal_crafting_table_top.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/empyreal_planks.png b/core/src/main/resources/assets/mctb/textures/block/empyreal_planks.png new file mode 100644 index 0000000..13692ae Binary files /dev/null and b/core/src/main/resources/assets/mctb/textures/block/empyreal_planks.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_front.png b/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_front.png index 6c4d59f..77aa37b 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_front.png and b/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_front.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_side.png b/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_side.png index 34c0f73..2adc85c 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_side.png and b/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_side.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_top.png b/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_top.png index d2a54c2..8400ec6 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_top.png and b/core/src/main/resources/assets/mctb/textures/block/jacaranda_crafting_table_top.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/jacaranda_planks.png b/core/src/main/resources/assets/mctb/textures/block/jacaranda_planks.png index 1a9d82d..f582ffc 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/jacaranda_planks.png and b/core/src/main/resources/assets/mctb/textures/block/jacaranda_planks.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_front.png b/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_front.png index 88f8a79..37423ce 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_front.png and b/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_front.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_side.png b/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_side.png index 114c801..d97afbd 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_side.png and b/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_side.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_top.png b/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_top.png index 26770b6..f46f6ed 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_top.png and b/core/src/main/resources/assets/mctb/textures/block/mahogany_crafting_table_top.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/mahogany_planks.png b/core/src/main/resources/assets/mctb/textures/block/mahogany_planks.png index 6ea6ac1..571d95d 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/mahogany_planks.png and b/core/src/main/resources/assets/mctb/textures/block/mahogany_planks.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_front.png b/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_front.png index 279be56..b3b7198 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_front.png and b/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_front.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_side.png b/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_side.png index e744cc4..961fd0f 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_side.png and b/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_side.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_top.png b/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_top.png index c38ab46..a8c3374 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_top.png and b/core/src/main/resources/assets/mctb/textures/block/redwood_crafting_table_top.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/redwood_planks.png b/core/src/main/resources/assets/mctb/textures/block/redwood_planks.png index b4c1865..183957b 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/redwood_planks.png and b/core/src/main/resources/assets/mctb/textures/block/redwood_planks.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_front.png b/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_front.png index 7d6c7ef..4897212 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_front.png and b/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_front.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_side.png b/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_side.png index 701e494..38012cf 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_side.png and b/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_side.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_top.png b/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_top.png index 4c25bd9..1ad2963 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_top.png and b/core/src/main/resources/assets/mctb/textures/block/umbran_crafting_table_top.png differ diff --git a/core/src/main/resources/assets/mctb/textures/block/umbran_planks.png b/core/src/main/resources/assets/mctb/textures/block/umbran_planks.png index cbf3394..d65d86a 100644 Binary files a/core/src/main/resources/assets/mctb/textures/block/umbran_planks.png and b/core/src/main/resources/assets/mctb/textures/block/umbran_planks.png differ diff --git a/core/src/main/resources/data/forge/tags/block/workbench.json b/core/src/main/resources/data/forge/tags/block/workbench.json index a873683..63d5291 100644 --- a/core/src/main/resources/data/forge/tags/block/workbench.json +++ b/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", diff --git a/core/src/main/resources/data/forge/tags/block/workbenches.json b/core/src/main/resources/data/forge/tags/block/workbenches.json index a873683..63d5291 100644 --- a/core/src/main/resources/data/forge/tags/block/workbenches.json +++ b/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", diff --git a/core/src/main/resources/data/mctb/loot_table/blocks/bop_maple_crafting_table.json b/core/src/main/resources/data/mctb/loot_table/blocks/bop_maple_crafting_table.json new file mode 100644 index 0000000..f56f0f3 --- /dev/null +++ b/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" + } + ] + } + ] +} \ No newline at end of file diff --git a/core/src/main/resources/data/mctb/loot_table/blocks/bop_pine_crafting_table.json b/core/src/main/resources/data/mctb/loot_table/blocks/bop_pine_crafting_table.json new file mode 100644 index 0000000..cd28391 --- /dev/null +++ b/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" + } + ] + } + ] +} \ No newline at end of file diff --git a/core/src/main/resources/data/mctb/loot_table/blocks/empyreal_crafting_table.json b/core/src/main/resources/data/mctb/loot_table/blocks/empyreal_crafting_table.json new file mode 100644 index 0000000..2a184b2 --- /dev/null +++ b/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" + } + ] + } + ] +} \ No newline at end of file diff --git a/core/src/main/resources/data/mctb/recipe/bop_maple_crafting_table.json b/core/src/main/resources/data/mctb/recipe/bop_maple_crafting_table.json new file mode 100644 index 0000000..06d0010 --- /dev/null +++ b/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 + } +} \ No newline at end of file diff --git a/core/src/main/resources/data/mctb/recipe/bop_pine_crafting_table.json b/core/src/main/resources/data/mctb/recipe/bop_pine_crafting_table.json new file mode 100644 index 0000000..17c2188 --- /dev/null +++ b/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 + } +} \ No newline at end of file diff --git a/core/src/main/resources/data/mctb/recipe/default_crafting_table.json b/core/src/main/resources/data/mctb/recipe/default_crafting_table.json deleted file mode 100644 index 67243d8..0000000 --- a/core/src/main/resources/data/mctb/recipe/default_crafting_table.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "#": { - "tag": "minecraft:planks" - } - }, - "pattern": [ - "##", - "##" - ], - "result": { - "id": "minecraft:crafting_table" - }, - "show_notification": false -} \ No newline at end of file diff --git a/core/src/main/resources/data/mctb/recipe/empyreal_crafting_table.json b/core/src/main/resources/data/mctb/recipe/empyreal_crafting_table.json new file mode 100644 index 0000000..f2679c6 --- /dev/null +++ b/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 + } +} \ No newline at end of file diff --git a/core/src/main/resources/data/mctb/tags/item/revertable_workbench.json b/core/src/main/resources/data/mctb/tags/item/revertable_workbench.json index a873683..63d5291 100644 --- a/core/src/main/resources/data/mctb/tags/item/revertable_workbench.json +++ b/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", diff --git a/core/src/main/resources/data/minecraft/advancement/recipes/decorations/crafting_table.json b/core/src/main/resources/data/minecraft/advancement/recipes/decorations/crafting_table.json index 09f0561..8833f9c 100644 --- a/core/src/main/resources/data/minecraft/advancement/recipes/decorations/crafting_table.json +++ b/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" ] } } \ No newline at end of file diff --git a/core/src/main/resources/data/minecraft/tags/block/mineable/axe.json b/core/src/main/resources/data/minecraft/tags/block/mineable/axe.json index a873683..63d5291 100644 --- a/core/src/main/resources/data/minecraft/tags/block/mineable/axe.json +++ b/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", diff --git a/core/src/main/resources/mctb.png b/core/src/main/resources/mctb.png index d47b525..8c3a5e0 100644 Binary files a/core/src/main/resources/mctb.png and b/core/src/main/resources/mctb.png differ diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 97d002d..3266957 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/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=''' diff --git a/forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper b/forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper deleted file mode 100644 index ff2910d..0000000 --- a/forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -com.example.examplemod.platform.ForgePlatformHelper \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 759d238..4116f12 100644 --- a/gradle.properties +++ b/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 diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index ed34ec0..2ddb527 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -10,7 +10,7 @@ logoFile="mctb.png" credits="${credits}" authors=''' P3NG00 = Original creator of the mod for Fabric -852Duarte = Ported for Forge +852Duarte = Ported for Forge and NeoForge ''' description=''' diff --git a/neoforge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper b/neoforge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper deleted file mode 100644 index 3ae5a61..0000000 --- a/neoforge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -com.example.examplemod.platform.NeoForgePlatformHelper \ No newline at end of file