Migrate to Mantle retexturable block logic

Uses the new model loader system, bookshelf model migrated as welll
KnightMiner · Aug 3, 2020 · fcc70db · fcc70db
1 parent f76c772
commit fcc70db
Show file tree

Hide file tree

Showing 59 changed files with 1,272 additions and 2,284 deletions.
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -92,17 +92,17 @@ dcac070de003fa8aeec2ada4c67a36dacc065d86 data/inspirations/advancements/recipes/
 3de8bdaae1aedf120c998243648a5ecdd51c4c4f data/inspirations/advancements/recipes/tools/tools/waypoint_compass/red.json
 2872e430fac4cdfb12d06a721e3af38e725c63d2 data/inspirations/advancements/recipes/tools/tools/waypoint_compass/white.json
 8f5a61adc7462df676401e9e33b6eacbb14080e4 data/inspirations/advancements/recipes/tools/tools/waypoint_compass/yellow.json
-0af43a9fd2866b794d58cb8d87170e03d71e9d86 data/inspirations/loot_tables/blocks/ancient_bookshelf.json
+8238d05763437ab31061c3467f5fcb03dc475e32 data/inspirations/loot_tables/blocks/ancient_bookshelf.json
 4a5a9134f9412d0c0cecbc9bae94fb4f3deb1ee1 data/inspirations/loot_tables/blocks/black_carpeted_pressure_plate.json
 3d5fe728be14bb4a550c1a8ea96ba7bf38531f6b data/inspirations/loot_tables/blocks/black_carpeted_trapdoor.json
 5cfe384a29371404505ab32381ae7e491458cae0 data/inspirations/loot_tables/blocks/black_fitted_carpet.json
 2a2f0a2b60980fb0ba6cbf2e06e1e1b9fc05f0e1 data/inspirations/loot_tables/blocks/black_mulch.json
 ef419e59fb2d68877c83ecf71e261fe6c933bd65 data/inspirations/loot_tables/blocks/blue_carpeted_pressure_plate.json
 df8bff06f1e0876a2c8637a52ba1eaed75af9b84 data/inspirations/loot_tables/blocks/blue_carpeted_trapdoor.json
-69ea33a1a76c64861ce1fa445c481bc7bf9b0c5f data/inspirations/loot_tables/blocks/blue_enlightened_bush.json
+9883449166a73e8da14a304e260989d1b5eb994d data/inspirations/loot_tables/blocks/blue_enlightened_bush.json
 57db89f6ed16d577eeb5b9dde7e9634b24ca11ce data/inspirations/loot_tables/blocks/blue_fitted_carpet.json
 ade15590eb8913001828dbfa487912608fd50912 data/inspirations/loot_tables/blocks/blue_mulch.json
-804a0c2752a68e5564e5d4c9d3dadf0004d46646 data/inspirations/loot_tables/blocks/bookshelf.json
+c47501d85e1892dcb4dfdb5c7a20fdb5cdcae0a0 data/inspirations/loot_tables/blocks/bookshelf.json
 d3443039b9a26d4455f2a5421dca653269142954 data/inspirations/loot_tables/blocks/brick_path.json
 a96ad963692f2c93b949c8ea80b54d276f97cfac data/inspirations/loot_tables/blocks/brown_carpeted_pressure_plate.json
 8e4c46aefed04cac698d503827a45c7fd06e01f4 data/inspirations/loot_tables/blocks/brown_carpeted_trapdoor.json
@@ -121,7 +121,7 @@ ef6c73ffdd3b5fb08c6a2207589ea23cc9bb95f7 data/inspirations/loot_tables/blocks/gr
 d75e66cda005759dbcbf1e8673ef41882d4820e7 data/inspirations/loot_tables/blocks/gray_fitted_carpet.json
 8f630688b8c3507c6e98bdb9f94013d9502681bb data/inspirations/loot_tables/blocks/green_carpeted_pressure_plate.json
 7cc12be5f2f7ffaba639b13ce4eca09a64d46c8f data/inspirations/loot_tables/blocks/green_carpeted_trapdoor.json
-ecd2ceb14fd0586046d421c6e76ae65e6c283497 data/inspirations/loot_tables/blocks/green_enlightened_bush.json
+53fa30d243c754b4da47ec92ecc6d84d573271a0 data/inspirations/loot_tables/blocks/green_enlightened_bush.json
 96f5c4ec5a9d1ebdb00f7d398567c7af9ca73b00 data/inspirations/loot_tables/blocks/green_fitted_carpet.json
 3ec4192b57efce42c087bf6eba7f565796812672 data/inspirations/loot_tables/blocks/light_blue_carpeted_pressure_plate.json
 fcd7bb47f58849fed9b6bea76ed19305367e295b data/inspirations/loot_tables/blocks/light_blue_carpeted_trapdoor.json
@@ -151,10 +151,10 @@ d303503f0d1c3527530ec6252befb816cb8cff8b data/inspirations/loot_tables/blocks/po
 eb0f0b22f0fd93b789492372c696ffad07f099ee data/inspirations/loot_tables/blocks/purple_carpeted_pressure_plate.json
 451840f58c0c700cb0d49018dd78978b49888a50 data/inspirations/loot_tables/blocks/purple_carpeted_trapdoor.json
 25148e13f89056e622ca9ac8613bce6c89c95ab9 data/inspirations/loot_tables/blocks/purple_fitted_carpet.json
-555e2470ea0d4fd9759bc693dcb3034f7c3519a0 data/inspirations/loot_tables/blocks/rainbow_bookshelf.json
+c819b1bb0122fcdee45240ae05651c4cf2e8793d data/inspirations/loot_tables/blocks/rainbow_bookshelf.json
 06d3ff25696c251d440b32e5e56ec0d610fd0af4 data/inspirations/loot_tables/blocks/red_carpeted_pressure_plate.json
 00c3303882f412e54eace2134da713982de16715 data/inspirations/loot_tables/blocks/red_carpeted_trapdoor.json
-163b609025a744c578e20ea00785aa5fe038a4c1 data/inspirations/loot_tables/blocks/red_enlightened_bush.json
+8cc0681c6df565141740b1ea0b848de24aaccf87 data/inspirations/loot_tables/blocks/red_enlightened_bush.json
 e1098ca1931d5b3b6dff2656fbc94dd51f88d93a data/inspirations/loot_tables/blocks/red_fitted_carpet.json
 4f63cfd4f8ee4078d7ec4ae81388af7a4054dbb1 data/inspirations/loot_tables/blocks/red_mulch.json
 374fc761ad454802cb3e7a484cfec94537b114d8 data/inspirations/loot_tables/blocks/redstone_charge.json
@@ -165,14 +165,14 @@ c90ab094ee40355f6ae86bfe004f89e7b600f814 data/inspirations/loot_tables/blocks/ro
 a1e05929b5bf5a1bdee8ad324f965b837a133794 data/inspirations/loot_tables/blocks/sugar_cane.json
 a22220d01ba3540f2e3960886ecde7d4d75a5030 data/inspirations/loot_tables/blocks/syringa.json
 102f35b175c3302320053b3f93b353faeebbe744 data/inspirations/loot_tables/blocks/tile_path.json
-d7d2072a114e5750dc3dbe9acb97fcd040501646 data/inspirations/loot_tables/blocks/tomes_bookshelf.json
+53401ca850352af560e51bda9ae689da6e7fd9cd data/inspirations/loot_tables/blocks/tomes_bookshelf.json
 00243e7539cf0dc37e0240f03f939d0157e2159f data/inspirations/loot_tables/blocks/torch_lever.json
 61841ae546a07919413c10bb7d483aea04460ae0 data/inspirations/loot_tables/blocks/vine.json
 00243e7539cf0dc37e0240f03f939d0157e2159f data/inspirations/loot_tables/blocks/wall_torch_lever.json
 9e86e1745e01dc128fc5e888ca21a0751f158e90 data/inspirations/loot_tables/blocks/wet_hopper.json
 ba1324e3a9d2ac57bcdd3450d0982ebdbde3fbd1 data/inspirations/loot_tables/blocks/white_carpeted_pressure_plate.json
 e680bcbd06a62804166f4ea2a53bb6c600363c6e data/inspirations/loot_tables/blocks/white_carpeted_trapdoor.json
-cc9d0cfc14c0fa9c48db2da9bb825a2d45010c2d data/inspirations/loot_tables/blocks/white_enlightened_bush.json
+19ad23808d9648de5ea46ccdd66e193782fde858 data/inspirations/loot_tables/blocks/white_enlightened_bush.json
 24da3e9dbdd077ee9aafbb06e280bd6bc2b18ac2 data/inspirations/loot_tables/blocks/white_fitted_carpet.json
 8414820b8306f38fea6d02f953f858f03e437c4c data/inspirations/loot_tables/blocks/yellow_carpeted_pressure_plate.json
 1662e9e63a2a6348880aa59de1e3fdbaf9be9a65 data/inspirations/loot_tables/blocks/yellow_carpeted_trapdoor.json
@@ -193,16 +193,16 @@ a969bd273c9e52abcd719584a3ef6f7b20b27c89 data/inspirations/recipes/building/book
 56864f6a18d6d937ee0c41bd81a2c080e6236574 data/inspirations/recipes/building/books/red.json
 3dbabf386fe8a39c1491c6e18aa11e28ded233b2 data/inspirations/recipes/building/books/white.json
 f790e71e885aa2eb63b856ad34ddb515fd26ee89 data/inspirations/recipes/building/books/yellow.json
-86b4998f5b615f7a1b4651f539713c554c8ada5c data/inspirations/recipes/building/bookshelves/ancient.json
-9e243d30540a23f38bef000a65adc98b873ae6ee data/inspirations/recipes/building/bookshelves/normal.json
-888dc488bdf437a8b3421771c3628809830ac4f2 data/inspirations/recipes/building/bookshelves/rainbow_grb.json
-4e1fd8b6820ea52e57fbe00e9cc076c4ddc8c283 data/inspirations/recipes/building/bookshelves/rainbow_rbg.json
-19237322146c3033f8f20823aa8b7afd57fda0e6 data/inspirations/recipes/building/bookshelves/rainbow_rgb.json
-ffd592183b9528140c5a00c3ed66da159e12a3da data/inspirations/recipes/building/bookshelves/tomes.json
-9fb0a0758e6c24089dc6a58f7594f013e1df88dc data/inspirations/recipes/building/enlightened_bush/blue.json
-547561844f8f699024722a250666ddf3f0925609 data/inspirations/recipes/building/enlightened_bush/green.json
-ea1ce39e407ef7e9615301bdb6654a4ea81dd441 data/inspirations/recipes/building/enlightened_bush/red.json
-d2e71d78ada436eb979f3236a82b4dcc60b3aac3 data/inspirations/recipes/building/enlightened_bush/white.json
+7b0f16390849291b3c78719f233155f6b6c1c417 data/inspirations/recipes/building/bookshelves/ancient.json
+2dc377abe763361af599251ee57a9c9d269339c2 data/inspirations/recipes/building/bookshelves/normal.json
+87ec965cbbd02e0f7b0a87765327149b722eef84 data/inspirations/recipes/building/bookshelves/rainbow_grb.json
+15a4e73b433be6c105764d4b0fcc4de2da87d705 data/inspirations/recipes/building/bookshelves/rainbow_rbg.json
+6c8aed5cf8ecc547d2b93e397d1b325f4cd0e868 data/inspirations/recipes/building/bookshelves/rainbow_rgb.json
+0377a84f0ce9e997ea7af9e413eade6bc0fa0e44 data/inspirations/recipes/building/bookshelves/tomes.json
+9904d7f33675695b9d1b5820e7f385bbbfad4024 data/inspirations/recipes/building/enlightened_bush/blue.json
+d46d7fd0fac0a96d9d1a67559afbc40ad7538882 data/inspirations/recipes/building/enlightened_bush/green.json
+d5146861224931066fddae4ffa3f82649f751525 data/inspirations/recipes/building/enlightened_bush/red.json
+ad904b45ce44d9e09f55742aaf931820de7345e4 data/inspirations/recipes/building/enlightened_bush/white.json
 08cd5a998186a44d22a9368ba10e6f2cc815e6c1 data/inspirations/recipes/building/flower/cyan_dye.json
 f94cef820774ff3fa78c3e2593946a51c37418c0 data/inspirations/recipes/building/flower/cyan_flower.json
 14b34e50bfd9f21442dec4ee81b710447cbe4842 data/inspirations/recipes/building/flower/magenta_dye.json

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/ancient_bookshelf.json b/src/generated/resources/data/inspirations/loot_tables/blocks/ancient_bookshelf.json
@@ -12,7 +12,7 @@
               "source": "block_entity"
             },
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:ancient_bookshelf"

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/blue_enlightened_bush.json b/src/generated/resources/data/inspirations/loot_tables/blocks/blue_enlightened_bush.json
@@ -8,7 +8,7 @@
           "type": "minecraft:item",
           "functions": [
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:blue_enlightened_bush"

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/bookshelf.json b/src/generated/resources/data/inspirations/loot_tables/blocks/bookshelf.json
@@ -12,7 +12,7 @@
               "source": "block_entity"
             },
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:bookshelf"

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/green_enlightened_bush.json b/src/generated/resources/data/inspirations/loot_tables/blocks/green_enlightened_bush.json
@@ -8,7 +8,7 @@
           "type": "minecraft:item",
           "functions": [
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:green_enlightened_bush"

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/rainbow_bookshelf.json b/src/generated/resources/data/inspirations/loot_tables/blocks/rainbow_bookshelf.json
@@ -12,7 +12,7 @@
               "source": "block_entity"
             },
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:rainbow_bookshelf"

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/red_enlightened_bush.json b/src/generated/resources/data/inspirations/loot_tables/blocks/red_enlightened_bush.json
@@ -8,7 +8,7 @@
           "type": "minecraft:item",
           "functions": [
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:red_enlightened_bush"

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/tomes_bookshelf.json b/src/generated/resources/data/inspirations/loot_tables/blocks/tomes_bookshelf.json
@@ -12,7 +12,7 @@
               "source": "block_entity"
             },
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:tomes_bookshelf"

diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/white_enlightened_bush.json b/src/generated/resources/data/inspirations/loot_tables/blocks/white_enlightened_bush.json
@@ -8,7 +8,7 @@
           "type": "minecraft:item",
           "functions": [
             {
-              "function": "inspirations:fill_textured_block"
+              "function": "mantle:fill_retextured_block"
             }
           ],
           "name": "inspirations:white_enlightened_bush"

diff --git a/src/generated/resources/data/inspirations/recipes/building/bookshelves/ancient.json b/src/generated/resources/data/inspirations/recipes/building/bookshelves/ancient.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -31,5 +31,5 @@
   "texture": {
     "tag": "minecraft:wooden_slabs"
   },
-  "match_first": false
+  "match_all": true
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/bookshelves/normal.json b/src/generated/resources/data/inspirations/recipes/building/bookshelves/normal.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -28,5 +28,5 @@
   "texture": {
     "tag": "minecraft:wooden_slabs"
   },
-  "match_first": false
+  "match_all": true
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/bookshelves/rainbow_grb.json b/src/generated/resources/data/inspirations/recipes/building/bookshelves/rainbow_grb.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -37,5 +37,5 @@
   "texture": {
     "tag": "minecraft:wooden_slabs"
   },
-  "match_first": false
+  "match_all": true
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/bookshelves/rainbow_rbg.json b/src/generated/resources/data/inspirations/recipes/building/bookshelves/rainbow_rbg.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -37,5 +37,5 @@
   "texture": {
     "tag": "minecraft:wooden_slabs"
   },
-  "match_first": false
+  "match_all": true
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/bookshelves/rainbow_rgb.json b/src/generated/resources/data/inspirations/recipes/building/bookshelves/rainbow_rgb.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -37,5 +37,5 @@
   "texture": {
     "tag": "minecraft:wooden_slabs"
   },
-  "match_first": false
+  "match_all": true
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/bookshelves/tomes.json b/src/generated/resources/data/inspirations/recipes/building/bookshelves/tomes.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -31,5 +31,5 @@
   "texture": {
     "tag": "minecraft:wooden_slabs"
   },
-  "match_first": false
+  "match_all": true
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/blue.json b/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/blue.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -32,5 +32,5 @@
   "texture": {
     "tag": "minecraft:leaves"
   },
-  "match_first": true
+  "match_all": false
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/green.json b/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/green.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -32,5 +32,5 @@
   "texture": {
     "tag": "minecraft:leaves"
   },
-  "match_first": true
+  "match_all": false
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/red.json b/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/red.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -32,5 +32,5 @@
   "texture": {
     "tag": "minecraft:leaves"
   },
-  "match_first": true
+  "match_all": false
 }
diff --git a/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/white.json b/src/generated/resources/data/inspirations/recipes/building/enlightened_bush/white.json
@@ -1,5 +1,5 @@
 {
-  "type": "inspirations:texture_recipe",
+  "type": "mantle:crafting_shaped_retextured",
   "conditions": [
     {
       "prop": "building_module",
@@ -28,5 +28,5 @@
   "texture": {
     "tag": "minecraft:leaves"
   },
-  "match_first": true
+  "match_all": false
 }
diff --git a/src/main/java/knightminer/inspirations/Inspirations.java b/src/main/java/knightminer/inspirations/Inspirations.java
@@ -10,6 +10,7 @@
 import knightminer.inspirations.common.network.InspirationsNetwork;
 import knightminer.inspirations.library.InspirationsRegistry;
 import knightminer.inspirations.shared.InspirationsShared;
+import knightminer.inspirations.shared.SharedClientEvents;
 import knightminer.inspirations.tools.InspirationsTools;
 import knightminer.inspirations.tweaks.InspirationsTweaks;
 import knightminer.inspirations.utility.InspirationsUtility;
@@ -83,6 +84,7 @@ public Inspirations() {
     //		pulseManager.registerPulse(new InspirationsRecipes());
 
     InspirationsNetwork.INSTANCE.setup();
+    DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> SharedClientEvents::onConstruct);
   }
 
   @SubscribeEvent