4gor to update repo after update aaaaaaaaaaaaaa

ANightDazingZoroark · Dec 2, 2021 · d49e3f4 · d49e3f4
1 parent 3ee70a1
commit d49e3f4
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 3 deletions.
diff --git a/behaviors/animation_controllers/player stuff.json b/behaviors/animation_controllers/player stuff.json
@@ -196,7 +196,7 @@
                 "noon": {
                     "transitions": [
                         {
-                            "mobEvents": "variable.choose_number = (math.floor(math.random(0,16))); return variable.choose_number == 0;"
+                            "mobEvents": "variable.choose_number = (math.floor(math.random(0,4))); return variable.choose_number == 0;"
                         },
                         {
                             "limbo": "variable.choose_number >= 1"

diff --git a/behaviors/animation_controllers/staff related stuff.json b/behaviors/animation_controllers/staff related stuff.json
@@ -118,7 +118,8 @@
 						}
 					],
 					"on_entry": [
-						"/function cmd.aggravating_horn"
+						"/function cmd.aggravating_horn",
+						"/playsound item.aggravating_horn_sounds @a[r=64]"
 					]
 				}
 			}

diff --git a/behaviors/items/tools/aggravating horn.json b/behaviors/items/tools/aggravating horn.json
@@ -17,7 +17,7 @@
 			},
 			"minecraft:use_duration": 6942066669420666,
 			"minecraft:icon": {
-				"texture": "placeholder"
+				"texture": "aggravating horn"
 			},
 			"minecraft:display_name": {
 				"value": "item.rift:aggravating_horn.name"

diff --git a/behaviors/recipes/crafting table/aggravating horn crafting crimson.json b/behaviors/recipes/crafting table/aggravating horn crafting crimson.json
@@ -0,0 +1,29 @@
+{
+	"format_version": "1.13.0",
+	"minecraft:recipe_shaped": {
+		"description": {
+			"identifier": "rift:aggravating_horn_crafting_crimson"
+		},
+		"tags": [
+			"crafting_table"
+		],
+		"pattern": [
+			"# #",
+			"#X#",
+			" # "
+		],
+		"key": {
+			"X": {
+				"item": "rift:parasaurolophus_horn"
+			},
+			"#": {
+				"item": "minecraft:crimson_slab"
+			}
+		},
+		"result": [
+			{
+				"item": "rift:aggravating_horn"
+			}
+		]
+	}
+}
diff --git a/behaviors/recipes/crafting table/aggravating horn crafting warped.json b/behaviors/recipes/crafting table/aggravating horn crafting warped.json
@@ -0,0 +1,29 @@
+{
+	"format_version": "1.13.0",
+	"minecraft:recipe_shaped": {
+		"description": {
+			"identifier": "rift:aggravating_horn_crafting_warped"
+		},
+		"tags": [
+			"crafting_table"
+		],
+		"pattern": [
+			"# #",
+			"#X#",
+			" # "
+		],
+		"key": {
+			"X": {
+				"item": "rift:parasaurolophus_horn"
+			},
+			"#": {
+				"item": "minecraft:warped_slab"
+			}
+		},
+		"result": [
+			{
+				"item": "rift:aggravating_horn"
+			}
+		]
+	}
+}
diff --git a/behaviors/recipes/crafting table/aggravating horn crafting.json b/behaviors/recipes/crafting table/aggravating horn crafting.json
@@ -0,0 +1,29 @@
+{
+	"format_version": "1.13.0",
+	"minecraft:recipe_shaped": {
+		"description": {
+			"identifier": "rift:aggravating_horn_crafting"
+		},
+		"tags": [
+			"crafting_table"
+		],
+		"pattern": [
+			"# #",
+			"#X#",
+			" # "
+		],
+		"key": {
+			"X": {
+				"item": "rift:parasaurolophus_horn"
+			},
+			"#": {
+				"item": "minecraft:wooden_slab"
+			}
+		},
+		"result": [
+			{
+				"item": "rift:aggravating_horn"
+			}
+		]
+	}
+}
diff --git a/behaviors/temp b/behaviors/temp
diff --git a/resources/sounds/item/aggravating horn sounds.ogg b/resources/sounds/item/aggravating horn sounds.ogg
diff --git a/resources/sounds/sound_definitions.json b/resources/sounds/sound_definitions.json
@@ -237,5 +237,11 @@
 		"sounds": [
 			"sounds/block/hammer sounds"
 		]
+	},
+	"item.aggravating_horn_sounds": {
+		"category": "neutral",
+		"sounds": [
+			"sounds/item/aggravating horn sounds"
+		]
 	}
 }
diff --git a/resources/textures/item_texture.json b/resources/textures/item_texture.json
@@ -14,6 +14,9 @@
 		"command console": {
 			"textures": "textures/items/command console"
 		},
+		"aggravating horn": {
+			"textures": "textures/items/aggravating horn"
+		},
 		"wrench": {
 			"textures": "textures/items/wrench"
 		},

diff --git a/resources/textures/items/aggravating horn.png b/resources/textures/items/aggravating horn.png