Merge pull request #54 from Alathra/sherman

fix: siegeengines patch

assets/minecraft/atlases/blocks.json

@@ -1 +1,161 @@
-{"sources":[{"source":"entity","prefix":"entity/","type":"directory"}]}
+{
+  "sources": [
+    {
+      "type": "directory",
+      "source": "particle",
+      "prefix": "particle/"
+    },
+    {
+      "type": "directory",
+      "source": "painting",
+      "prefix": "painting/"
+    },
+    {
+      "type": "directory",
+      "source": "mob_effect",
+      "prefix": "mob_effect/"
+    },
+    {
+      "type": "directory",
+      "source": "misc",
+      "prefix": "misc/"
+    },
+    {
+      "type": "directory",
+      "source": "map",
+      "prefix": "map/"
+    },
+    {
+      "type": "directory",
+      "source": "item",
+      "prefix": "item/"
+    },
+    {
+      "type": "directory",
+      "source": "gui",
+      "prefix": "gui/"
+    },
+    {
+      "type": "directory",
+      "source": "environment",
+      "prefix": "environment/"
+    },
+    {
+      "type": "directory",
+      "source": "entity",
+      "prefix": "entity/"
+    },
+    {
+      "type": "directory",
+      "source": "custom",
+      "prefix": "custom/"
+    },
+    {
+      "type": "directory",
+      "source": "char",
+      "prefix": "char/"
+    },
+    {
+      "type": "directory",
+      "source": "blocks",
+      "prefix": "blocks/"
+    },
+    {
+      "type": "directory",
+      "source": "block",
+      "prefix": "block/"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/anvil"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/wheel"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/wheels"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/trebuchet"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/cannonmount"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/carriage"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/navalcannon"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/swivelmount"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/swivelwheels"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:equipment/armour/helmets/swivelbody"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/anvil"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/ballista_body"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/birch_planks"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/black_concrete"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/bolt"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/dark_oak_planks"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/iron_block"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/oak_planks"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/spruce_planks"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/wheelsteel"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/wheelwood"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/ballistamount"
+    },
+    {
+      "type": "single",
+      "resource": "siegeengines:weapons/white_wool"
+    }
+  ]
+}

assets/minecraft/models/item/extras/sculk_elixir.json

@@ -0,0 +1,44 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/sculk_elixir",
+	"layer1": "minecraft:item/sculk_elixir"
+  },
+  "display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.25, 0.25, 0.5 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.25, 0.25, 0.5 ]
+        },
+		"firstperson_righthand": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.25, 0.25, 0.5 ]
+        },
+		"firstperson_lefthand": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.25, 0.25, 0.5 ]
+        },
+		"gui": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.5, 0.5, 0.5 ]
+        },
+		"fixed": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.5, 0.5, 0.5 ]
+        },
+        "ground": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.25, 0.25, 0.5 ]
+        }
+	}
+}

assets/minecraft/models/item/potion.json

@@ -70,6 +70,12 @@
         "custom_model_data": 990
       },
       "model": "minecraft:item/extras/liquid_power"
+    },
+	{
+      "predicate": {
+        "custom_model_data": 991
+      },
+      "model": "minecraft:item/extras/sculk_elixir"
     }
   ]
 }