sazr

build/resources/main/assets/szar/blockstates/cannabis.json

@@ -1,6 +1,5 @@
 {
   "variants": {
-    "half=lower": { "model": "szar:block/cannabis_bottom" },
-    "half=upper": { "model": "szar:block/cannabis" }
+    "": { "model": "szar:block/cannabis" }
   }
 }

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

@@ -4,9 +4,43 @@
   "item.szar.nwordpass": "N-Word Pass",
   "entity.szar.nigger": "Nigger",
   "item.szar.nigger_spawn_egg":"Nigger Spawn Egg",
+  "item.szar.gypsy_spawn_egg":"Gypsy Spawn Egg",
   "itemgroup.szar_group": "Szar",
   "block.szar.cannabis": "Cannabis",
   "item.szar.weed": "Weed",
   "effect.szar.drog": "Drog",
-  "item.szar.weed_joint": "Weed Joint"
+  "item.szar.weed_joint": "Weed Joint",
+  "item.szar.niggerite_ingot":  "Niggerite Ingot",
+  "block.szar.niggerite_block":  "Niggerite Block",
+  "item.szar.niggerite_sword":  "Niggerite Sword",
+  "item.szar.niggerite_axe":  "Niggerite Axe",
+  "item.szar.niggerite_pickaxe":  "Niggerite Pickaxe",
+  "item.szar.niggerite_shovel":  "Niggerite Shovel",
+  "item.szar.niggerite_hoe":  "Niggerite Hoe",
+  "item.szar.niggerite_chestplate":  "Niggerite Chestplate",
+  "item.szar.niggerite_leggings":  "Niggerite Leggings",
+  "item.szar.niggerite_boots":  "Niggerite Boots",
+  "item.szar.niggerite_helmet":  "Niggerite Helmet",
+  "death.attack.heart_attack": "%1$s got a heart attack",
+  "death.attack.drog_overdose": "%1$s got a drog overdose",
+  "block.szar.chemical_workbench": "Chemical Workbench",
+  "entity.minecraft.villager.drog_dealer": "Drog dealer",
+  "entity.szar.islam_terrorist": "Islam Terrorist",
+  "item.szar.terrorist_spawn_egg": "Islam Terrorist Spawn Egg",
+  "entity.szar.police": "Police Man",
+  "item.szar.police_spawn_egg": "Police Man Spawn Egg",
+  "effect.szar.arrested": "Arrested",
+  "item.szar.police_key": "Police Key",
+  "item.szar.police_handcuff": "Police Handcuff",
+  "entity.szar.gypsy": "Cigány",
+  "entity.szar.plane": "Plane",
+  "entity.szar.hitler": "Hitler",
+  "item.szar.hitler_spawn_egg":"Hitler Spawn Egg",
+  "entity.szar.nazi": "Nazi",
+  "item.szar.nazi_spawn_egg":"Nazi Spawn Egg",
+  "item.szar.bullet": "Bullet",
+  "item.szar.ak47": "AK47",
+  "entity.szar.bullet": "Bullet",
+  "death.attack.bullet": "%1$s was shot by %2$s",
+  "death.attack.bullet.player": "%1$s was shot by %2$s"
 }

build/resources/main/assets/szar/models/item/weed_join_held.json

@@ -1,29 +0,0 @@
-{
-	"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"}
-			}
-		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [90, 0, 0],
-			"translation": [-6, -1.5, 0]
-		}
-	}
-}

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

@@ -1,16 +1,32 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "szar:item/weed_joint"
-	},
-	"overrides": [
-		{
-			"predicate": { "held": 1 },
-			"model": "szar:item/weed_joint_3d"
-		},
-		{
-			"predicate": { "using": 1 },
-			"model": "szar:item/weed_joint_held"
-		}
-	]
-}
+  "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"}
+      }
+    }
+  ],
+  "overrides": [
+    {
+      "predicate": {
+        "using": 1
+      },
+      "model": "szar:item/weed_joint_held"
+    }
+  ],
+  "display": {}
+}

build/resources/main/assets/szar/models/item/weed_joint_3d.json

@@ -1,32 +0,0 @@
-{
-  "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"}
-      }
-    }
-  ],
-  "overrides": [
-    {
-      "predicate": {
-        "using": 1
-      },
-      "model": "szar:item/weed_joint_held"
-    }
-  ],
-  "display": {}
-}