diff --git a/gradle.properties b/gradle.properties index affbd3c..d8c937c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 loader_version=0.18.3 # Mod Properties -mod_version=26.2.22.1 +mod_version=26.2.22.2 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc b/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc index 5fced18..8a7f7a5 100644 --- a/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc +++ b/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc @@ -1,3 +1,3 @@ -// 1.20.1 2026-02-13T13:11:58.9342791 szar/World Gen +// 1.20.1 2026-02-22T17:34:09.3606501 szar/World Gen 1d26b5da3b0a2ea6b23d456d1f0b82455a788ca1 data\szar\worldgen\configured_feature\uranium_ore.json 32864170bdb41310f9ee5d06f5720dfdb3badb6d data\szar\worldgen\placed_feature\uranium_ore_placed.json diff --git a/src/main/generated/.cache/79d6404f7b0803346bb38c848032926817f10037 b/src/main/generated/.cache/79d6404f7b0803346bb38c848032926817f10037 index 5aff0d6..470de3f 100644 --- a/src/main/generated/.cache/79d6404f7b0803346bb38c848032926817f10037 +++ b/src/main/generated/.cache/79d6404f7b0803346bb38c848032926817f10037 @@ -1,2 +1,2 @@ -// 1.20.1 2026-02-13T13:11:58.9352765 szar/Tags for minecraft:point_of_interest_type +// 1.20.1 2026-02-22T17:34:09.3606501 szar/Tags for minecraft:point_of_interest_type eba137b51c50a7143a3668876f41adaa1447b1d1 data\minecraft\tags\point_of_interest_type\acquirable_job_site.json diff --git a/src/main/generated/.cache/e8da7d0da6535b734ad1b062d141fd76f701db77 b/src/main/generated/.cache/e8da7d0da6535b734ad1b062d141fd76f701db77 index e6b58a5..2acc7aa 100644 --- a/src/main/generated/.cache/e8da7d0da6535b734ad1b062d141fd76f701db77 +++ b/src/main/generated/.cache/e8da7d0da6535b734ad1b062d141fd76f701db77 @@ -1,2 +1,2 @@ -// 1.20.1 2026-02-13T13:11:58.9332826 szar/Tags for minecraft:item -044a7669228ee893e38875357ee12c83cdad7ec6 data\minecraft\tags\items\music_discs.json +// 1.20.1 2026-02-22T17:34:09.3596499 szar/Tags for minecraft:item +15754f2ee2c60320aae8a09679ed422fea29a705 data\minecraft\tags\items\music_discs.json diff --git a/src/main/generated/data/minecraft/tags/items/music_discs.json b/src/main/generated/data/minecraft/tags/items/music_discs.json index 02b0cfa..ccd54f0 100644 --- a/src/main/generated/data/minecraft/tags/items/music_discs.json +++ b/src/main/generated/data/minecraft/tags/items/music_discs.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "szar:pop_tart", - "szar:baiter" + "szar:baiter", + "szar:efn" ] } \ No newline at end of file diff --git a/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java b/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java index 157342a..301b6d4 100644 --- a/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java +++ b/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java @@ -25,5 +25,6 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { protected void configure(RegistryWrapper.WrapperLookup lookup) { getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.POPTART); getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.BAITER_DISK); + getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.EFN_DISK); } } \ No newline at end of file diff --git a/src/main/java/dev/tggamesyt/szar/Szar.java b/src/main/java/dev/tggamesyt/szar/Szar.java index cc24ce2..970ff89 100644 --- a/src/main/java/dev/tggamesyt/szar/Szar.java +++ b/src/main/java/dev/tggamesyt/szar/Szar.java @@ -279,6 +279,7 @@ public class Szar implements ModInitializer { entries.add(Szar.ATOM); entries.add(Szar.BAITER_DISK); entries.add(Szar.MERL_SPAWNEGG); + entries.add(Szar.EFN_DISK); }) .build() ); @@ -866,6 +867,13 @@ public class Szar implements ModInitializer { new Identifier(MOD_ID, "baiter"), new MusicDiscItem(12, BAITER, new Item.Settings().maxCount(1).rarity(Rarity.RARE), 172) ); + public static final SoundEvent EFN = + SoundEvent.of(new Identifier(MOD_ID, "efn")); + public static final Item EFN_DISK = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "efn"), + new MusicDiscItem(11, EFN, new Item.Settings().maxCount(1).rarity(Rarity.RARE), 133) + ); public static final Item ATOM_DETONATOR = Registry.register( Registries.ITEM, new Identifier(MOD_ID, "detonator"), diff --git a/src/main/resources/assets/szar/lang/en_us.json b/src/main/resources/assets/szar/lang/en_us.json index 1070496..571a36f 100644 --- a/src/main/resources/assets/szar/lang/en_us.json +++ b/src/main/resources/assets/szar/lang/en_us.json @@ -65,6 +65,8 @@ "effect.szar.radiation": "Radiation", "item.szar.baiter": "Music Disc", "item.szar.baiter.desc": "HaVexy - Hyperabaiter Disstrack", + "item.szar.efn": "Music Disc", + "item.szar.efn.desc": "Daciva - EFN", "death.attack.radiation": "%1$s radiated away", "death.attack.radiation.player": "%1$s was lethally irradiated by %2$s", "entity.szar.merl": "Merl", diff --git a/src/main/resources/assets/szar/models/item/efn.json b/src/main/resources/assets/szar/models/item/efn.json new file mode 100644 index 0000000..0b4cf4f --- /dev/null +++ b/src/main/resources/assets/szar/models/item/efn.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/efn" + } +} diff --git a/src/main/resources/assets/szar/sounds.json b/src/main/resources/assets/szar/sounds.json index 96163cf..7dcadc3 100644 --- a/src/main/resources/assets/szar/sounds.json +++ b/src/main/resources/assets/szar/sounds.json @@ -51,6 +51,14 @@ } ] }, + "efn": { + "sounds": [ + { + "name": "szar:efn", + "stream": true + } + ] + }, "merl": { "sounds": [ { diff --git a/src/main/resources/assets/szar/sounds/efn.ogg b/src/main/resources/assets/szar/sounds/efn.ogg new file mode 100644 index 0000000..9736e5e Binary files /dev/null and b/src/main/resources/assets/szar/sounds/efn.ogg differ diff --git a/src/main/resources/assets/szar/sounds/efn_mc.ogg b/src/main/resources/assets/szar/sounds/efn_mc.ogg new file mode 100644 index 0000000..683fba8 Binary files /dev/null and b/src/main/resources/assets/szar/sounds/efn_mc.ogg differ diff --git a/src/main/resources/assets/szar/textures/item/efn.png b/src/main/resources/assets/szar/textures/item/efn.png new file mode 100644 index 0000000..09e7346 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/efn.png differ