From bedfa3b4d0507e0de4beb522285a18ecef80ea2a Mon Sep 17 00:00:00 2001
From: nea <romangraef@gmail.com>
Date: Mon, 6 Jun 2022 17:30:02 +0200
Subject: More morbing

---
 src/main/resources/assets/morbing/lang/en_us.json   |   6 +++++-
 .../assets/morbing/models/item/morbarrow.json       |   6 ++++++
 .../assets/morbing/models/item/morbsyringe.json     |   6 ++++++
 src/main/resources/assets/morbing/morbingskin.png   | Bin 0 -> 2938 bytes
 src/main/resources/assets/morbing/sounds.json       |   8 ++++++++
 .../assets/morbing/sounds/itsmorbingtime.ogg        | Bin 0 -> 50815 bytes
 .../assets/morbing/textures/item/morbarrow.png      | Bin 0 -> 224 bytes
 .../assets/morbing/textures/item/morbsyringe.png    | Bin 0 -> 263 bytes
 .../resources/data/morbing/recipes/morbarrow.json   |  20 ++++++++++++++++++++
 src/main/resources/morbing.mixins.json              |   2 ++
 10 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/morbing/models/item/morbarrow.json
 create mode 100644 src/main/resources/assets/morbing/models/item/morbsyringe.json
 create mode 100644 src/main/resources/assets/morbing/morbingskin.png
 create mode 100644 src/main/resources/assets/morbing/sounds.json
 create mode 100644 src/main/resources/assets/morbing/sounds/itsmorbingtime.ogg
 create mode 100644 src/main/resources/assets/morbing/textures/item/morbarrow.png
 create mode 100644 src/main/resources/assets/morbing/textures/item/morbsyringe.png
 create mode 100644 src/main/resources/data/morbing/recipes/morbarrow.json

(limited to 'src/main/resources')

diff --git a/src/main/resources/assets/morbing/lang/en_us.json b/src/main/resources/assets/morbing/lang/en_us.json
index a2326b4..492218d 100644
--- a/src/main/resources/assets/morbing/lang/en_us.json
+++ b/src/main/resources/assets/morbing/lang/en_us.json
@@ -1,3 +1,7 @@
 {
-  "effect.morbing.morbingtime": "Morbing"
+  "effect.morbing.morbingtime": "Morbing",
+  "item.morbing.morbarrow": "Empty Morbing Syringe",
+  "item.morbing.morbsyringe": "Filled Morbing Syringe",
+  "tooltip.morbing.morbyringe": "It's Morbing Time!",
+  "subtitles.morbing.itsmorbintime": "It's Morbing Time!"
 }
diff --git a/src/main/resources/assets/morbing/models/item/morbarrow.json b/src/main/resources/assets/morbing/models/item/morbarrow.json
new file mode 100644
index 0000000..afef195
--- /dev/null
+++ b/src/main/resources/assets/morbing/models/item/morbarrow.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+	"layer0": "morbing:item/morbarrow"
+  }
+}
diff --git a/src/main/resources/assets/morbing/models/item/morbsyringe.json b/src/main/resources/assets/morbing/models/item/morbsyringe.json
new file mode 100644
index 0000000..857df53
--- /dev/null
+++ b/src/main/resources/assets/morbing/models/item/morbsyringe.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+	"layer0": "morbing:item/morbsyringe"
+  }
+}
diff --git a/src/main/resources/assets/morbing/morbingskin.png b/src/main/resources/assets/morbing/morbingskin.png
new file mode 100644
index 0000000..2ed2e06
Binary files /dev/null and b/src/main/resources/assets/morbing/morbingskin.png differ
diff --git a/src/main/resources/assets/morbing/sounds.json b/src/main/resources/assets/morbing/sounds.json
new file mode 100644
index 0000000..a4a82e6
--- /dev/null
+++ b/src/main/resources/assets/morbing/sounds.json
@@ -0,0 +1,8 @@
+{
+  "itsmorbintime": {
+	"subtitle": "subtitles.morbing.itsmorbintime",
+	"sounds": [
+	  "morbing:itsmorbingtime"
+	]
+  }
+}
diff --git a/src/main/resources/assets/morbing/sounds/itsmorbingtime.ogg b/src/main/resources/assets/morbing/sounds/itsmorbingtime.ogg
new file mode 100644
index 0000000..ed92232
Binary files /dev/null and b/src/main/resources/assets/morbing/sounds/itsmorbingtime.ogg differ
diff --git a/src/main/resources/assets/morbing/textures/item/morbarrow.png b/src/main/resources/assets/morbing/textures/item/morbarrow.png
new file mode 100644
index 0000000..dfc0a37
Binary files /dev/null and b/src/main/resources/assets/morbing/textures/item/morbarrow.png differ
diff --git a/src/main/resources/assets/morbing/textures/item/morbsyringe.png b/src/main/resources/assets/morbing/textures/item/morbsyringe.png
new file mode 100644
index 0000000..6f324d7
Binary files /dev/null and b/src/main/resources/assets/morbing/textures/item/morbsyringe.png differ
diff --git a/src/main/resources/data/morbing/recipes/morbarrow.json b/src/main/resources/data/morbing/recipes/morbarrow.json
new file mode 100644
index 0000000..8e44539
--- /dev/null
+++ b/src/main/resources/data/morbing/recipes/morbarrow.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+	" I ",
+	" G ",
+	" G "
+  ],
+  "key": {
+	"I": {
+	  "item": "minecraft:iron_ingot"
+	},
+	"G": {
+	  "tag": "c:glass_blocks"
+	}
+  },
+  "result": {
+	"item": "morbing:morbarrow",
+	"count": 16
+  }
+}
diff --git a/src/main/resources/morbing.mixins.json b/src/main/resources/morbing.mixins.json
index cdbc1ea..fd3eb43 100644
--- a/src/main/resources/morbing.mixins.json
+++ b/src/main/resources/morbing.mixins.json
@@ -3,8 +3,10 @@
   "package": "moe.nea.morbing.mixin",
   "compatibilityLevel": "JAVA_16",
   "client": [
+	"MixinAbstractClientPlayerEntity"
   ],
   "mixins": [
+	"AccessorBrewingRecipeRegistry"
   ],
   "injectors": {
 	"defaultRequire": 1
-- 
cgit