diff --git a/gradle.properties b/gradle.properties index 33a9e6f..b7fd245 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.3.16 +mod_version=26.3.16.1 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc b/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc index 59fbbc5..50adbf0 100644 --- a/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc +++ b/src/main/generated/.cache/0dcec3edc46b99b91b10474633480b6842e700fc @@ -1,3 +1,3 @@ -// 1.20.1 2026-03-12T15:35:10.4101688 szar/World Gen +// 1.20.1 2026-03-16T18:04:06.196888 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 1e5219f..c246a63 100644 --- a/src/main/generated/.cache/79d6404f7b0803346bb38c848032926817f10037 +++ b/src/main/generated/.cache/79d6404f7b0803346bb38c848032926817f10037 @@ -1,2 +1,2 @@ -// 1.20.1 2026-03-12T15:35:10.4111575 szar/Tags for minecraft:point_of_interest_type +// 1.20.1 2026-03-16T18:04:06.197868 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 3bc64ec..cf4574d 100644 --- a/src/main/generated/.cache/e8da7d0da6535b734ad1b062d141fd76f701db77 +++ b/src/main/generated/.cache/e8da7d0da6535b734ad1b062d141fd76f701db77 @@ -1,2 +1,2 @@ -// 1.20.1 2026-03-12T15:35:10.4091576 szar/Tags for minecraft:item -7121c061f919b2837a56cb20f3ca5ccd0b11976d data\minecraft\tags\items\music_discs.json +// 1.20.1 2026-03-16T18:04:06.196888 szar/Tags for minecraft:item +8a0ecda725173a6312a3e5d3a4b621cdecac4eed 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 d1b9b1b..2243dc5 100644 --- a/src/main/generated/data/minecraft/tags/items/music_discs.json +++ b/src/main/generated/data/minecraft/tags/items/music_discs.json @@ -5,6 +5,7 @@ "szar:baiter", "szar:efn", "szar:hello", - "szar:erika" + "szar:erika", + "szar:ussr" ] } \ No newline at end of file diff --git a/src/main/java/dev/tggamesyt/szar/CommunistEntity.java b/src/main/java/dev/tggamesyt/szar/CommunistEntity.java index 946b96f..66ca6e1 100644 --- a/src/main/java/dev/tggamesyt/szar/CommunistEntity.java +++ b/src/main/java/dev/tggamesyt/szar/CommunistEntity.java @@ -48,7 +48,7 @@ public class CommunistEntity extends PathAwareEntity implements Arrestable{ this.dropItem(Szar.AK47); } if (rand.nextFloat() < 0.01F) { - this.dropItem(Szar.ERIKA_DISC); + this.dropItem(Szar.USSR_DISC); } if (rand.nextFloat() < 0.01F) { ItemStack book = new ItemStack(Items.WRITTEN_BOOK); diff --git a/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java b/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java index d0df137..bfcb84f 100644 --- a/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java +++ b/src/main/java/dev/tggamesyt/szar/ModItemTagProvider.java @@ -20,5 +20,6 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.EFN_DISK); getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.HELLO_DISC); getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.ERIKA_DISC); + getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.USSR_DISC); } } \ 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 c747268..19c4195 100644 --- a/src/main/java/dev/tggamesyt/szar/Szar.java +++ b/src/main/java/dev/tggamesyt/szar/Szar.java @@ -392,6 +392,7 @@ public class Szar implements ModInitializer { entries.add(Szar.FIRTANA); entries.add(Szar.HELLO_DISC); entries.add(Szar.ERIKA_DISC); + entries.add(Szar.USSR_DISC); // nsfw entries.add(Szar.FASZITEM); entries.add(Szar.CNDM); @@ -1612,6 +1613,13 @@ public class Szar implements ModInitializer { new Identifier(MOD_ID, "erika"), new MusicDiscItem(9, ERIKA, new Item.Settings().maxCount(1).rarity(Rarity.RARE), 180) ); + public static final SoundEvent USSR = + SoundEvent.of(new Identifier(MOD_ID, "ussr")); + public static final Item USSR_DISC = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "ussr"), + new MusicDiscItem(8, USSR, new Item.Settings().maxCount(1).rarity(Rarity.RARE), 225) + ); public static final SoundEvent HELLO = SoundEvent.of(new Identifier(MOD_ID, "firtana")); public static final Item HELLO_DISC = Registry.register( diff --git a/src/main/resources/assets/szar/lang/en_us.json b/src/main/resources/assets/szar/lang/en_us.json index 8338e8c..8ca849a 100644 --- a/src/main/resources/assets/szar/lang/en_us.json +++ b/src/main/resources/assets/szar/lang/en_us.json @@ -133,5 +133,8 @@ "entity.szar.stalin": "Stalin", "item.szar.stalin_spawn_egg":"Stalin Spawn Egg", "entity.szar.communist": "Communist", - "item.szar.communist_spawn_egg":"Communist Spawn Egg" + "item.szar.communist_spawn_egg":"Communist Spawn Egg", + + "item.szar.ussr": "Music Disc", + "item.szar.ussr.desc": "A. Alexandrov - USSR Anthem" } diff --git a/src/main/resources/assets/szar/models/item/ussr.json b/src/main/resources/assets/szar/models/item/ussr.json new file mode 100644 index 0000000..9abeabf --- /dev/null +++ b/src/main/resources/assets/szar/models/item/ussr.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/ussr" + } +} diff --git a/src/main/resources/assets/szar/sounds.json b/src/main/resources/assets/szar/sounds.json index cfdbadc..7a4d05d 100644 --- a/src/main/resources/assets/szar/sounds.json +++ b/src/main/resources/assets/szar/sounds.json @@ -194,5 +194,13 @@ "stream": true } ] + }, + "ussr": { + "sounds": [ + { + "name": "szar:ussr", + "stream": true + } + ] } } diff --git a/src/main/resources/assets/szar/sounds/ussr.ogg b/src/main/resources/assets/szar/sounds/ussr.ogg new file mode 100644 index 0000000..ca7dcb0 Binary files /dev/null and b/src/main/resources/assets/szar/sounds/ussr.ogg differ diff --git a/src/main/resources/assets/szar/textures/item/ussr.png b/src/main/resources/assets/szar/textures/item/ussr.png new file mode 100644 index 0000000..0c524cb Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/ussr.png differ