Updated to 1.3.2

Added Amethyst music disc - Currently doesn't play in jukeboxes - Needs to be added to loot - Needs work on the texture
EmpressAutumn · Feb 16, 2024 · 13e889d · 13e889d
1 parent 425fcc7
commit 13e889d
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.20.4+build.3
 loader_version=0.15.6
 
 # Mod Properties
-mod_version=1.3.1
+mod_version=1.3.2
 maven_group=com.atom596.titanium
 archives_base_name=titanium
 

diff --git a/src/main/generated/.cache/130e22669e8a615864dab95e7f6486375d972043 b/src/main/generated/.cache/130e22669e8a615864dab95e7f6486375d972043
@@ -1,12 +1,13 @@
-// 1.20.4	2024-02-06T16:47:56.9375009	Titanium/Model Definitions
+// 1.20.4	2024-02-16T01:02:43.6364491	Titanium/Model Definitions
 e0c60320e94e5d876caf5db971017c564d2b52e3 assets\titanium\blockstates\deepslate_titanium_ore.json
 b9ab004f7892f3b08e2dfb1181cd001579110f57 assets\titanium\models\item\titanium_chestplate.json
 2d1a0a57ba4b82755a917b6bac14f13f839767f3 assets\titanium\models\item\raw_titanium.json
 7786475ccc60c57b0f8753a66d1c1aa91ebdf1ad assets\titanium\models\item\titanium_pickaxe.json
-f542e849d8f61855942377bddbcd72574245a98d assets\titanium\models\item\titanium_ore.json
 e6cb7cbe6e9ad09e1c77b221aa81fb6c6c281ee0 assets\titanium\models\item\titanium_shovel.json
+f542e849d8f61855942377bddbcd72574245a98d assets\titanium\models\item\titanium_ore.json
 b111702b740c70103c3e193d53b398f65cf31641 assets\titanium\blockstates\raw_titanium_block.json
 13b448d892e18db065991245bedf98f1495faee6 assets\titanium\models\item\titanium_sword.json
+38e60fc4c6c5fe9616bf3e9ed1140d0b8102783c assets\titanium\models\item\music_disc_amethyst.json
 a0555e40980d02acc693771d2853772f9d55f840 assets\titanium\models\item\titanium_helmet.json
 ee7608d94dab7f2491a0c2490686f77dbbcf50f7 assets\titanium\blockstates\titanium_block.json
 fabc62d0f8b635dd11219f8629247b55454cee71 assets\titanium\models\item\deepslate_titanium_ore.json

diff --git a/src/main/generated/.cache/517b32aa3b70974ceff8833c3e0d8067fc37e319 b/src/main/generated/.cache/517b32aa3b70974ceff8833c3e0d8067fc37e319
@@ -1,4 +1,4 @@
-// 1.20.4	2024-02-06T16:47:56.9441315	Titanium/Block Loot Tables
+// 1.20.4	2024-02-16T01:02:43.6414626	Titanium/Block Loot Tables
 fd73ce0826e836b7e0abe4af39b85db2aca5988b data\titanium\loot_tables\blocks\deepslate_titanium_ore.json
 9ddfc49204e35d9ec5442f9f55a2da667b84215c data\titanium\loot_tables\blocks\titanium_block.json
 ecf65e601c9264c2de80be1a0a9d67f85c2744c2 data\titanium\loot_tables\blocks\raw_titanium_block.json

diff --git a/src/main/generated/.cache/65bfa0da695c72a1ede5f07ea05a47f7fb8fdb51 b/src/main/generated/.cache/65bfa0da695c72a1ede5f07ea05a47f7fb8fdb51
@@ -1,3 +1,3 @@
-// 1.20.4	2024-02-06T16:47:56.9470904	Titanium/Tags for minecraft:block
+// 1.20.4	2024-02-16T01:02:43.64447	Titanium/Tags for minecraft:block
 40a22829dc45910fc144676bb4bd94f2ed21c46b data\minecraft\tags\blocks\mineable\pickaxe.json
 40a22829dc45910fc144676bb4bd94f2ed21c46b data\minecraft\tags\blocks\needs_iron_tool.json
diff --git a/src/main/generated/.cache/89f2127b6a78ac60efe9eb6d1a02ce770428ebeb b/src/main/generated/.cache/89f2127b6a78ac60efe9eb6d1a02ce770428ebeb
@@ -1,4 +1,4 @@
-// 1.20.4	2024-02-06T16:47:56.9409825	Titanium/Advancements
+// 1.20.4	2024-02-16T01:02:43.6384542	Titanium/Advancements
 ecb8798f3abcbed913c874c0f875d6fdd85a56cc data\minecraft\advancements\titanium\titanium_armor.json
 b2a37f8191984a79b7bcf7972e9f69b29fc77923 data\minecraft\advancements\titanium\get_titanium.json
 cfa35b7f8f81e2536edf0792b980f5cbc3678881 data\minecraft\advancements\titanium\titanium_tools.json
diff --git a/src/main/generated/.cache/9da30a99369c7e8c68716a98fd12271ee4da4d59 b/src/main/generated/.cache/9da30a99369c7e8c68716a98fd12271ee4da4d59
@@ -1,4 +1,4 @@
-// 1.20.4	2024-02-06T16:47:56.9497408	Titanium/World Gen
+// 1.20.4	2024-02-16T01:02:43.6464755	Titanium/World Gen
 31a3c735f941c808dd8915d27e9f8340a70c606b data\titanium\worldgen\configured_feature\titanium_ore.json
 8d75cadfd54d93e9504231ada137c960200b7ac0 data\titanium\worldgen\configured_feature\end_titanium_ore.json
 3d92d749954790a861e3fc4d734a5617fa7d030a data\titanium\worldgen\placed_feature\titanium_ore_placed.json

diff --git a/src/main/generated/.cache/ed130a9d2fc861ab1cf43e733b1c2beffb974a94 b/src/main/generated/.cache/ed130a9d2fc861ab1cf43e733b1c2beffb974a94
@@ -1,4 +1,4 @@
-// 1.20.4	2024-02-06T16:47:56.9334905	Titanium/Recipes
+// 1.20.4	2024-02-16T01:02:43.6324383	Titanium/Recipes
 f8a16a50c8ef3d1b70a0befe2781046dea651c41 data\titanium\recipes\titanium_ingot.json
 8db0f204262bd86cd7905c7d52705381a8dfa78c data\titanium\recipes\titanium_ingot_from_blasting_end_titanium_ore.json
 200e84c3f8001cbf640d369f4b12a1f53c465655 data\titanium\recipes\titanium_ingot_from_smelting_titanium_ore.json

diff --git a/src/main/generated/.cache/fc0e456a828b0d3ff0de7c436f29639954b07e94 b/src/main/generated/.cache/fc0e456a828b0d3ff0de7c436f29639954b07e94
@@ -1,4 +1,4 @@
-// 1.20.4	2024-02-06T16:47:56.928477	Titanium/Tags for minecraft:item
+// 1.20.4	2024-02-16T01:02:43.6284274	Titanium/Tags for minecraft:item
 2a186cdc91b83a46ade5894dc10cd043cef0c7cc data\fabric\tags\items\swords.json
 758fc896a1c5fb6a5ca958cef5066c539ebc193f data\fabric\tags\items\axes.json
 89b0efee69794169293c204cbbf104952bcc8544 data\fabric\tags\items\shovels.json

diff --git a/src/main/generated/assets/titanium/models/item/music_disc_amethyst.json b/src/main/generated/assets/titanium/models/item/music_disc_amethyst.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "titanium:item/music_disc_amethyst"
+  }
+}
diff --git a/src/main/java/com/atom596/titanium/Titanium.java b/src/main/java/com/atom596/titanium/Titanium.java
@@ -3,6 +3,7 @@
 import com.atom596.titanium.block.TitaniumBlocks;
 import com.atom596.titanium.item.TitaniumItemGroup;
 import com.atom596.titanium.item.TitaniumItems;
+import com.atom596.titanium.item.TitaniumSounds;
 import com.atom596.titanium.world.gen.TitaniumWorldGeneration;
 import net.fabricmc.api.ModInitializer;
 import org.apache.logging.log4j.LogManager;
@@ -14,6 +15,7 @@ public class Titanium implements ModInitializer {
 
 	public void onInitialize() {
 		//LOGGER.info("Initializing Titanium...");
+		TitaniumSounds.register();
 		TitaniumItems.register();
 		TitaniumBlocks.register();
 		TitaniumItemGroup.register();

diff --git a/src/main/java/com/atom596/titanium/datagen/TitaniumModelProvider.java b/src/main/java/com/atom596/titanium/datagen/TitaniumModelProvider.java
@@ -30,6 +30,7 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
         itemModelGenerator.register(TitaniumItems.TITANIUM_BOOTS, Models.GENERATED);
         itemModelGenerator.register(TitaniumItems.RAW_TITANIUM, Models.GENERATED);
         itemModelGenerator.register(TitaniumItems.TITANIUM_INGOT, Models.GENERATED);
+        itemModelGenerator.register(TitaniumItems.MUSIC_DISC_AMETHYST, Models.GENERATED);
 
         itemModelGenerator.register(TitaniumItems.TITANIUM_SHOVEL, Models.HANDHELD);
         itemModelGenerator.register(TitaniumItems.TITANIUM_SWORD, Models.HANDHELD);

diff --git a/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java b/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java
@@ -34,6 +34,7 @@ public class TitaniumItemGroup {
                 entries.add(TitaniumItems.TITANIUM_BOOTS);
                 entries.add(TitaniumItems.RAW_TITANIUM);
                 entries.add(TitaniumItems.TITANIUM_INGOT);
+                entries.add(TitaniumItems.MUSIC_DISC_AMETHYST);
             })
             .build();
 
@@ -53,6 +54,7 @@ public static void register() {
             content.addAfter(TitaniumItems.TITANIUM_SHOVEL, TitaniumItems.TITANIUM_PICKAXE);
             content.addAfter(TitaniumItems.TITANIUM_PICKAXE, TitaniumItems.TITANIUM_AXE);
             content.addAfter(TitaniumItems.TITANIUM_AXE, TitaniumItems.TITANIUM_HOE);
+            content.addAfter(Items.MUSIC_DISC_PIGSTEP, TitaniumItems.MUSIC_DISC_AMETHYST);
         });
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register(content -> {
             content.addAfter(Items.GOLDEN_SWORD, TitaniumItems.TITANIUM_SWORD);

diff --git a/src/main/java/com/atom596/titanium/item/TitaniumItems.java b/src/main/java/com/atom596/titanium/item/TitaniumItems.java
@@ -6,6 +6,7 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.Rarity;
 
 public class TitaniumItems {
     public static final ToolItem TITANIUM_SHOVEL = new ShovelItem(TitaniumTools.INSTANCE, 1.5F, -3.0F, new FabricItemSettings());
@@ -19,6 +20,12 @@ public class TitaniumItems {
     public static final ArmorItem TITANIUM_BOOTS = new ArmorItem(TitaniumArmor.INSTANCE, ArmorItem.Type.BOOTS, new FabricItemSettings());
     public static final Item RAW_TITANIUM = new Item(new FabricItemSettings());
     public static final Item TITANIUM_INGOT = new Item(new FabricItemSettings());
+    public static final Item MUSIC_DISC_AMETHYST = new MusicDiscItem(
+            14,
+            TitaniumSounds.MUSIC_DISC_AMETHYST,
+            new FabricItemSettings().maxCount(1).rarity(Rarity.RARE),
+            144
+    );
 
     public static void register() {
         Registry.register(Registries.ITEM, new Identifier(Titanium.MOD_ID, "titanium_helmet"), TITANIUM_HELMET);
@@ -32,5 +39,6 @@ public static void register() {
         Registry.register(Registries.ITEM, new Identifier(Titanium.MOD_ID, "titanium_hoe"), TITANIUM_HOE);
         Registry.register(Registries.ITEM, new Identifier(Titanium.MOD_ID, "raw_titanium"), RAW_TITANIUM);
         Registry.register(Registries.ITEM, new Identifier(Titanium.MOD_ID, "titanium_ingot"), TITANIUM_INGOT);
+        Registry.register(Registries.ITEM, new Identifier(Titanium.MOD_ID, "music_disc_amethyst"), MUSIC_DISC_AMETHYST);
     }
 }
diff --git a/src/main/java/com/atom596/titanium/item/TitaniumSounds.java b/src/main/java/com/atom596/titanium/item/TitaniumSounds.java
@@ -0,0 +1,14 @@
+package com.atom596.titanium.item;
+
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
+
+public class TitaniumSounds {
+    public static final SoundEvent MUSIC_DISC_AMETHYST = SoundEvent.of(new Identifier("titanium:music_disc_amethyst"));
+
+    public static void register() {
+        Registry.register(Registries.SOUND_EVENT, new Identifier("titanium:music_disc_amethyst"), MUSIC_DISC_AMETHYST);
+    }
+}
diff --git a/src/main/resources/assets/titanium/lang/en_us.json b/src/main/resources/assets/titanium/lang/en_us.json
@@ -10,6 +10,8 @@
     "item.titanium.titanium_boots": "Titanium Boots",
     "item.titanium.raw_titanium": "Raw Titanium",
     "item.titanium.titanium_ingot": "Titanium Ingot",
+    "item.titanium.music_disc_amethyst": "Music Disc",
+    "item.titanium.music_disc_amethyst.desc": "DestoLynx - Amethyst",
 
     "block.titanium.titanium_ore": "Titanium Ore",
     "block.titanium.deepslate_titanium_ore": "Deepslate Titanium Ore",

diff --git a/src/main/resources/assets/titanium/sounds.json b/src/main/resources/assets/titanium/sounds.json
@@ -0,0 +1,11 @@
+{
+  "music_disc_amethyst": {
+    "category": "records",
+    "sounds": [
+      {
+        "name": "titanium:amethyst",
+        "stream": true
+      }
+    ]
+  }
+}
diff --git a/src/main/resources/assets/titanium/sounds/amethyst.ogg b/src/main/resources/assets/titanium/sounds/amethyst.ogg
diff --git a/src/main/resources/assets/titanium/textures/item/music_disc_amethyst.png b/src/main/resources/assets/titanium/textures/item/music_disc_amethyst.png