Skip to content

Commit

Permalink
Playable Music Disc
Browse files Browse the repository at this point in the history
Added Amethyst music disc to the Music Disc item tag, making it playable
Changed amethyst.ogg to mono
  • Loading branch information
EmpressAutumn committed Feb 16, 2024
1 parent 13e889d commit d2eb204
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.4 2024-02-16T01:02:43.6364491 Titanium/Model Definitions
// 1.20.4 2024-02-16T10:09:34.0889924 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
b9ab004f7892f3b08e2dfb1181cd001579110f57 assets\titanium\models\item\titanium_chestplate.json
7786475ccc60c57b0f8753a66d1c1aa91ebdf1ad assets\titanium\models\item\titanium_pickaxe.json
e6cb7cbe6e9ad09e1c77b221aa81fb6c6c281ee0 assets\titanium\models\item\titanium_shovel.json
f542e849d8f61855942377bddbcd72574245a98d assets\titanium\models\item\titanium_ore.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-02-16T01:02:43.6414626 Titanium/Block Loot Tables
// 1.20.4 2024-02-16T10:09:34.0950089 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.20.4 2024-02-16T01:02:43.64447 Titanium/Tags for minecraft:block
// 1.20.4 2024-02-16T10:09:34.0970136 Titanium/Tags for minecraft:block
40a22829dc45910fc144676bb4bd94f2ed21c46b data\minecraft\tags\blocks\mineable\pickaxe.json
40a22829dc45910fc144676bb4bd94f2ed21c46b data\minecraft\tags\blocks\needs_iron_tool.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-02-16T01:02:43.6384542 Titanium/Advancements
// 1.20.4 2024-02-16T10:09:34.0909988 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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-02-16T01:02:43.6464755 Titanium/World Gen
// 1.20.4 2024-02-16T10:09:34.0990196 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-02-16T01:02:43.6324383 Titanium/Recipes
// 1.20.4 2024-02-16T10:09:34.0849833 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// 1.20.4 2024-02-16T01:02:43.6284274 Titanium/Tags for minecraft:item
// 1.20.4 2024-02-16T10:09:34.0809715 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
49490c758ba9aaee94e1f6192fc4a2eb56bde4d8 data\fabric\tags\items\hoes.json
ab93c62885c7a9aaf84f8aa8c17a2530ea0dd93e data\fabric\tags\items\pickaxes.json
5954df4ab7bd92ee03d4f1f4fa11ed3169b247af data\minecraft\tags\items\music_discs.json
6 changes: 6 additions & 0 deletions src/main/generated/data/minecraft/tags/items/music_discs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"titanium:music_disc_amethyst"
]
}
2 changes: 1 addition & 1 deletion src/main/java/com/atom596/titanium/Titanium.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +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.sound.TitaniumSounds;
import com.atom596.titanium.world.gen.TitaniumWorldGeneration;
import net.fabricmc.api.ModInitializer;
import org.apache.logging.log4j.LogManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.tag.ItemTags;
import net.minecraft.registry.tag.TagKey;
import net.minecraft.util.Identifier;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -32,5 +33,8 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {

getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier("fabric", "swords")))
.add(TitaniumItems.TITANIUM_SWORD);

getOrCreateTagBuilder(ItemTags.MUSIC_DISCS)
.add(TitaniumItems.MUSIC_DISC_AMETHYST);
}
}
1 change: 1 addition & 0 deletions src/main/java/com/atom596/titanium/item/TitaniumItems.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.atom596.titanium.item;

import com.atom596.titanium.Titanium;
import com.atom596.titanium.sound.TitaniumSounds;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.item.*;
import net.minecraft.registry.Registries;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atom596.titanium.item;
package com.atom596.titanium.sound;

import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
Expand Down
Binary file modified src/main/resources/assets/titanium/sounds/amethyst.ogg
Binary file not shown.

0 comments on commit d2eb204

Please sign in to comment.