some cleanup, 3d modeling stuff and terrorist plane fixes

src/main/resources/assets/szar/lang/en_us.json

@@ -77,5 +77,7 @@
   "item.szar.cndm": "Condom",
   "item.szar.latex": "Latex",
   "death.attack.fck": "%1$s got fucked too hard by %2$s",
-  "item.szar.white_liquid": "..."
+  "item.szar.white_liquid": "...",
+  "item.szar.plane": "Plane",
+  "item.szar.wheel": "Wheel"
 }

src/main/resources/assets/szar/models/item/fasz.json

@@ -1,3 +1,6 @@
 {
-  "parent": "szar:block/fasz"
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "szar:item/fasz"
+  }
 }

src/main/resources/assets/szar/models/item/fasz_in_hand.json

@@ -0,0 +1,3 @@
+{
+  "parent": "szar:block/fasz"
+}

src/main/resources/assets/szar/models/item/plane.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "szar:item/plane"
+  }
+}

src/main/resources/assets/szar/models/item/weed_joint.json

@@ -1,32 +1,6 @@
 {
-  "format_version": "1.9.0",
-  "credit": "Made with Blockbench",
+  "parent": "minecraft:item/generated",
   "textures": {
-    "0": "szar:item/joint3d",
-    "particle": "szar:item/joint3d"
-  },
-  "elements": [
-    {
-      "from": [7, 0, 7],
-      "to": [9, 12, 9],
-      "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]},
-      "faces": {
-        "north": {"uv": [0, 0, 2, 12], "texture": "#0"},
-        "east": {"uv": [2, 0, 4, 12], "texture": "#0"},
-        "south": {"uv": [4, 0, 6, 12], "texture": "#0"},
-        "west": {"uv": [6, 0, 8, 12], "texture": "#0"},
-        "up": {"uv": [10, 2, 8, 0], "texture": "#0"},
-        "down": {"uv": [10, 2, 8, 4], "texture": "#0"}
-      }
-    }
-  ],
-  "overrides": [
-    {
-      "predicate": {
-        "using": 1
-      },
-      "model": "szar:item/weed_joint_held"
-    }
-  ],
-  "display": {}
-}
+    "layer0": "szar:item/weed_joint"
+  }
+}

src/main/resources/assets/szar/models/item/weed_joint_in_hand.json

@@ -0,0 +1,23 @@
+{
+  "format_version": "1.9.0",
+  "credit": "Made with Blockbench",
+  "textures": {
+    "0": "szar:item/joint3d",
+    "particle": "szar:item/joint3d"
+  },
+  "elements": [
+    {
+      "from": [7, 0, 7],
+      "to": [9, 12, 9],
+      "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]},
+      "faces": {
+        "north": {"uv": [0, 0, 2, 12], "texture": "#0"},
+        "east": {"uv": [2, 0, 4, 12], "texture": "#0"},
+        "south": {"uv": [4, 0, 6, 12], "texture": "#0"},
+        "west": {"uv": [6, 0, 8, 12], "texture": "#0"},
+        "up": {"uv": [10, 2, 8, 0], "texture": "#0"},
+        "down": {"uv": [10, 2, 8, 4], "texture": "#0"}
+      }
+    }
+  ]
+}

src/main/resources/assets/szar/models/item/wheel.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "szar:item/wheel"
+  }
+}

src/main/resources/data/szar/recipes/baiter.json

@@ -5,11 +5,10 @@
       "tag": "minecraft:music_discs"
     },
     {
-      "item": "szar:epstein_files"
+      "item": "szar:fasz"
     }
   ],
   "result": {
-    "item": "szar:baiter",
-    "count": 1
+    "item": "szar:baiter"
   }
 }

src/main/resources/data/szar/recipes/efn.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "tag": "minecraft:music_discs"
+    },
+    {
+      "item": "szar:epstein_files"
+    }
+  ],
+  "result": {
+    "item": "szar:efn"
+  }
+}

src/main/resources/data/szar/recipes/latex.json

@@ -6,15 +6,11 @@
     "SSS"
   ],
   "key": {
-    "S": {
-      "item": "minecraft:sugar"
-    },
-    "L": {
-      "item": "minecraft:slime_ball"
-    }
+    "S": { "item": "minecraft:sugar" },
+    "L": { "item": "minecraft:slime_ball" }
   },
   "result": {
     "item": "szar:latex",
-    "count": 1
+    "count": 2
   }
-}
+}

src/main/resources/data/szar/recipes/plane.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "GBB",
+    "IFB",
+    "W W"
+  ],
+  "key": {
+    "G": { "item": "minecraft:glass" },
+    "B": { "item": "minecraft:iron_block" },
+    "I": { "item": "minecraft:iron_ingot" },
+    "F": { "item": "minecraft:furnace" },
+    "W": { "item": "szar:wheel" }
+  },
+  "result": {
+    "item": "szar:plane",
+    "count": 1
+  }
+}

src/main/resources/data/szar/recipes/wheel.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "BLB",
+    "LBL",
+    "BLB"
+  ],
+  "key": {
+    "B": { "item": "minecraft:black_dye" },
+    "L": { "item": "szar:latex" }
+  },
+  "result": {
+    "item": "szar:wheel",
+    "count": 1
+  }
+}