From fc5097e35446b38b7ec9f69baaffc7eac148a76f Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Tue, 29 Aug 2023 17:05:30 +0300 Subject: [PATCH] Improve dice, fix models and lang --- src/main/java/su/a71/new_soviet/Config.java | 5 +++++ src/main/java/su/a71/new_soviet/items/DiceItem.java | 4 +++- .../resources/assets/new_soviet/blockstates/radio.json | 8 -------- .../assets/new_soviet/blockstates/radio_receiver.json | 8 ++++++++ src/main/resources/assets/new_soviet/lang/en_us.json | 9 +++++++-- .../models/block/{radio.json => radio_receiver.json} | 0 6 files changed, 23 insertions(+), 11 deletions(-) delete mode 100644 src/main/resources/assets/new_soviet/blockstates/radio.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/radio_receiver.json rename src/main/resources/assets/new_soviet/models/block/{radio.json => radio_receiver.json} (100%) diff --git a/src/main/java/su/a71/new_soviet/Config.java b/src/main/java/su/a71/new_soviet/Config.java index 2bf1ac9..2ece446 100644 --- a/src/main/java/su/a71/new_soviet/Config.java +++ b/src/main/java/su/a71/new_soviet/Config.java @@ -4,6 +4,7 @@ import java.io.*; public class Config { private boolean invert_lamps = false; + private boolean announce_dice = false; public static Config INSTANCE; @@ -14,9 +15,13 @@ public class Config { public boolean shouldInvertLamps() { return invert_lamps; } + public boolean shouldAnnounceDice() { + return announce_dice; + } private static void generateDefault() { + NewSoviet.LOG.info("Generated config file at config/new_soviet.json"); File file = new File("config/new_soviet.json"); if(!file.getParentFile().exists()) { file.getParentFile().mkdirs(); diff --git a/src/main/java/su/a71/new_soviet/items/DiceItem.java b/src/main/java/su/a71/new_soviet/items/DiceItem.java index d5bcf22..727d953 100644 --- a/src/main/java/su/a71/new_soviet/items/DiceItem.java +++ b/src/main/java/su/a71/new_soviet/items/DiceItem.java @@ -13,6 +13,8 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import java.util.List; + +import su.a71.new_soviet.Config; import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.registration.NSE_Sounds; @@ -35,7 +37,7 @@ public class DiceItem extends Item { world.playSound((PlayerEntity)null, user.getX(), user.getY(), user.getZ(), NSE_Sounds.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); output.append(NewSoviet.RANDOM.nextBetween(1, this.getSides())).append(", "); } - user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2))); + user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2)), Config.INSTANCE.shouldAnnounceDice()); } user.increaseStat(Stats.USED.getOrCreateStat(this), itemStack.getCount()); diff --git a/src/main/resources/assets/new_soviet/blockstates/radio.json b/src/main/resources/assets/new_soviet/blockstates/radio.json deleted file mode 100644 index 0545cb2..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/radio.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "new_soviet:block/radio", "uvlock": true }, - "facing=east": { "model": "new_soviet:block/radio", "y": 90, "uvlock": false }, - "facing=south": { "model": "new_soviet:block/radio", "y": 180, "uvlock": false }, - "facing=west": { "model": "new_soviet:block/radio", "y": 270, "uvlock": false } - } -} diff --git a/src/main/resources/assets/new_soviet/blockstates/radio_receiver.json b/src/main/resources/assets/new_soviet/blockstates/radio_receiver.json new file mode 100644 index 0000000..55c7bd4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/radio_receiver.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "new_soviet:block/radio_receiver", "uvlock": true }, + "facing=east": { "model": "new_soviet:block/radio_receiver", "y": 90, "uvlock": false }, + "facing=south": { "model": "new_soviet:block/radio_receiver", "y": 180, "uvlock": false }, + "facing=west": { "model": "new_soviet:block/radio_receiver", "y": 270, "uvlock": false } + } +} diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index 79a1599..0ff90b7 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -146,7 +146,7 @@ "block.new_soviet.tv": "TV", "block.new_soviet.red_tv": "Red TV", "block.new_soviet.brown_tv": "Brown TV", - "block.new_soviet.radio": "Radio", + "block.new_soviet.radio_receiver": "Radio", "block.new_soviet.lamp": "Lamp", "block.new_soviet.ceiling_fan": "Ceiling Fan", "block.new_soviet.siren": "Siren", @@ -223,5 +223,10 @@ "block.new_soviet.black_queen": "Black Queen", "block.new_soviet.black_pawn": "Black Pawn", "block.new_soviet.handrail": "Handrail", - "subtitles.new_soviet.smoking": "Cigarette smoking" + "subtitles.new_soviet.smoking": "Cigarette smoking", + "block.new_soviet.small_white_tiles": "Small White Tiles", + "block.new_soviet.small_cracked_white_tiles": "Small Cracked White Tiles", + "block.new_soviet.glazed_white_tiles": "Glazed White Tiles", + "block.new_soviet.crackedglazed_white_tiles": "Cracked Glazed White Tiles" + } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/radio.json b/src/main/resources/assets/new_soviet/models/block/radio_receiver.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/radio.json rename to src/main/resources/assets/new_soviet/models/block/radio_receiver.json