update chain models to inherit, compatible now with 3d resource packs

Lothrazar · Jul 28, 2024 · 97056d6 · 97056d6
1 parent cd32851
commit 97056d6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 76 deletions.
diff --git a/src/main/resources/assets/cyclic/models/block/copper_chain.json b/src/main/resources/assets/cyclic/models/block/copper_chain.json
@@ -1,30 +1,8 @@
 {
-    "parent": "minecraft:block/block",
-      "render_type": "cutout_mipped",
+    "parent": "minecraft:block/chain",
+    "render_type": "cutout_mipped",
     "textures": {
         "particle": "cyclic:block/copper_chain",
         "all": "cyclic:block/copper_chain"
-    },
-    "elements": [
-        {
-            "from": [ 6.5, 0, 8 ],
-            "to": [ 9.5, 16, 8 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45},
-            "shade": false,
-            "faces": {
-                "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#all" },
-                "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#all" }
-            }
-        },
-        {
-            "from": [ 8, 0, 6.5 ],
-            "to": [ 8, 16, 9.5 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45},
-            "shade": false,
-            "faces": {
-                "west": { "uv": [ 6, 0, 3, 16 ], "texture": "#all" },
-                "east": { "uv": [ 3, 0, 6, 16 ], "texture": "#all" }
-            }
-        }
-    ]
+    }
 }
diff --git a/src/main/resources/assets/cyclic/models/block/gold_chain.json b/src/main/resources/assets/cyclic/models/block/gold_chain.json
@@ -1,30 +1,8 @@
 {
-    "parent": "minecraft:block/block",
-  "render_type": "cutout_mipped",
+    "parent": "minecraft:block/chain",
+    "render_type": "cutout_mipped",
     "textures": {
         "particle": "cyclic:block/gold_chain",
         "all": "cyclic:block/gold_chain"
-    },
-    "elements": [
-        {
-            "from": [ 6.5, 0, 8 ],
-            "to": [ 9.5, 16, 8 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45},
-            "shade": false,
-            "faces": {
-                "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#all" },
-                "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#all" }
-            }
-        },
-        {
-            "from": [ 8, 0, 6.5 ],
-            "to": [ 8, 16, 9.5 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45},
-            "shade": false,
-            "faces": {
-                "west": { "uv": [ 6, 0, 3, 16 ], "texture": "#all" },
-                "east": { "uv": [ 3, 0, 6, 16 ], "texture": "#all" }
-            }
-        }
-    ]
+    }
 }
diff --git a/src/main/resources/assets/cyclic/models/block/netherite_chain.json b/src/main/resources/assets/cyclic/models/block/netherite_chain.json
@@ -1,30 +1,8 @@
 {
-    "parent": "minecraft:block/block",
-  "render_type": "cutout_mipped",
+    "parent": "minecraft:block/chain",
+    "render_type": "cutout_mipped",
     "textures": {
         "particle": "cyclic:block/netherite_chain",
         "all": "cyclic:block/netherite_chain"
-    },
-    "elements": [
-        {
-            "from": [ 6.5, 0, 8 ],
-            "to": [ 9.5, 16, 8 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45},
-            "shade": false,
-            "faces": {
-                "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#all" },
-                "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#all" }
-            }
-        },
-        {
-            "from": [ 8, 0, 6.5 ],
-            "to": [ 8, 16, 9.5 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45},
-            "shade": false,
-            "faces": {
-                "west": { "uv": [ 6, 0, 3, 16 ], "texture": "#all" },
-                "east": { "uv": [ 3, 0, 6, 16 ], "texture": "#all" }
-            }
-        }
-    ]
+    }
 }
diff --git a/update.json b/update.json
@@ -183,7 +183,7 @@
 		,"1.20.8":"Re-added botania-api Solegnolia support. Growth enchantment now uses the same logic as Sprinkler & Terra Soil (only minecraft:crops or minecraft::saplings can grow, respect IGrowable::canUseBonemeal).  New gloom ignored config Gloom enchant (cyclic:curse) to ignore and not use these effects #2217 #2325. Fix Soundproofing block not muting Mekanism sounds #2389 (for example Precision Sawmill and others - you may need four or more soundproofing blocks for the desired effect).  New config [cyclic.blocks.soundproofing] radius = 6 to control the area.  New config under [cyclic.blocks] wireless_transfer_dimensional = true allowing transfer nodes to connect across dimensions #1913.  Balance changes made for Excavate enchant it will no longer trigger if the tool is not 'mineable' effective for example axe on dirt.  New feature for Excavate enchant #2116 it will not trigger on anything matching the block data-tag 'cyclic:ignored/excavate'.  ",
 
 		"1.20.9": " Fix tanks not getting filled from buckets\n\nMerge pull request #2400 from PocketSizedWeeb Fixes Issue #2376 solidifier client-server desync problems with fluid quantities during recipe processing\n\nMerge pull request #2387 from Apollounknowndev Fix worldgen crash and compatibility with other worldgen mods; flower worldgen has moved to new blocktags in woldgen/biome/has_flower/\n ",
-		"1.20.10": "Merge pull request #2402 from Apollounknowndev/trunk/1.20\n\nFix lime flower generation.  JEI Changes:\n\n  Merge pull request #2400:  Fixes issue \n\nSolidifier doesn't show liquid requirements #2369\nMade the JEI category for the Melter more closely match the Melter's GUI\nMoved the JEI \"Show Recipe\" area for the machines line up with the progress bar\nMoved the JEI \"Show Recipe\" area for the generators line up with the generator name\nEvery applicable JEI Category got an energy bar added to show max consumed/produced RF\nEvery applicable JEI Category got a progress bar to show how long the machine will run for\nEdited the Melter category texture to add space for energy bar\nPossibly fixed\n\n    HashMap memory leak #2383 by caching an instance of Minecraft instead of grabbing it when needed in the Packager's JEI Category\n\nDry Peat:\n\n    Fixes issue \n\n    Peat bog cannot be saturated with water-logged leaves #2399 by allowing water-logged blocks to hydrate peat\n\nSolidifier/Melter:\n\n    Fully fixes desync issue by making all of the processing server sided.\n\nCrushing Macerator:\n\n    Fixed \n\nCrushing Macerator continues to operate and void items if full #2343\nFixed\n\n    Crushing Macerator allows items to be shift-clicked into output slots #2341\n\nEvaporation Generator:\n\n    Removed tank tooltip from before it was rotated\n    Fixes \n\n    Evaporation Generator 1.19.2 #2322 by implementing a workaround since the fluid portion of FluidTagIngredient was defaulting to empty which was not allowing tagged fluids in the generator\n\nAuto Crafter:\n\n    Fixed \n\n    auto crafting machine duplicate glitch #2358 by checking input before processing\n    Fixed an issue where the preview slot wasn't updating until the machine was processing a craft\n\nWireless Transmitter:\n\n    Fixed \n\ngps card inside wireless transmitter disappearing #2403 by adding an onRemove method to the transmitter that drops the gps card"
+		"1.20.10": "Copper, Gold and Netherite chains block model now extends the vanilla reference, meaning they are compatible with any 3D chain model resource pack (such as vanillatweaks).  Merge pull request #2402 from Apollounknowndev/trunk/1.20\n\nFix lime flower generation.  JEI Changes:\n\n  Merge pull request #2400:  Fixes issue \n\nSolidifier doesn't show liquid requirements #2369\nMade the JEI category for the Melter more closely match the Melter's GUI\nMoved the JEI \"Show Recipe\" area for the machines line up with the progress bar\nMoved the JEI \"Show Recipe\" area for the generators line up with the generator name\nEvery applicable JEI Category got an energy bar added to show max consumed/produced RF\nEvery applicable JEI Category got a progress bar to show how long the machine will run for\nEdited the Melter category texture to add space for energy bar\nPossibly fixed\n\n    HashMap memory leak #2383 by caching an instance of Minecraft instead of grabbing it when needed in the Packager's JEI Category\n\nDry Peat:\n\n    Fixes issue \n\n    Peat bog cannot be saturated with water-logged leaves #2399 by allowing water-logged blocks to hydrate peat\n\nSolidifier/Melter:\n\n    Fully fixes desync issue by making all of the processing server sided.\n\nCrushing Macerator:\n\n    Fixed \n\nCrushing Macerator continues to operate and void items if full #2343\nFixed\n\n    Crushing Macerator allows items to be shift-clicked into output slots #2341\n\nEvaporation Generator:\n\n    Removed tank tooltip from before it was rotated\n    Fixes \n\n    Evaporation Generator 1.19.2 #2322 by implementing a workaround since the fluid portion of FluidTagIngredient was defaulting to empty which was not allowing tagged fluids in the generator\n\nAuto Crafter:\n\n    Fixed \n\n    auto crafting machine duplicate glitch #2358 by checking input before processing\n    Fixed an issue where the preview slot wasn't updating until the machine was processing a craft\n\nWireless Transmitter:\n\n    Fixed \n\ngps card inside wireless transmitter disappearing #2403 by adding an onRemove method to the transmitter that drops the gps card"
 
 	}
 }