diff --git a/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/PaintItem.java b/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/PaintItem.java index 82e084209..ab87756b0 100644 --- a/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/PaintItem.java +++ b/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/PaintItem.java @@ -19,6 +19,7 @@ package com.craftingdead.core.world.item; import java.util.List; +import java.util.Objects; import java.util.OptionalInt; import java.util.concurrent.ThreadLocalRandom; import org.jetbrains.annotations.Nullable; @@ -69,12 +70,20 @@ public ICapabilityProvider initCapabilities(ItemStack itemStack, @Nullable Compo @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List lines, TooltipFlag flag) { + var skins = Skins.REGISTRY.get(this.skin).getAcceptedGuns(); + if (skins == null || skins.isEmpty()) { + lines.add(new TranslatableComponent("paint.no_guns") + .withStyle(ChatFormatting.GRAY)); + return; + } lines.add(new TranslatableComponent("paint.accepted_guns") .withStyle(ChatFormatting.GRAY)); - Skins.REGISTRY.get(this.skin).getAcceptedGuns().stream() + skins.stream() .map(ForgeRegistries.ITEMS::getValue) + .filter(Objects::nonNull) .map(Item::getDescription) .map(text -> text.copy().withStyle(ChatFormatting.RED)) .forEach(lines::add); } + } diff --git a/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/gun/skin/Skins.java b/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/gun/skin/Skins.java index 7e3101ddc..64a03df78 100644 --- a/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/gun/skin/Skins.java +++ b/crafting-dead-core/src/main/java/com/craftingdead/core/world/item/gun/skin/Skins.java @@ -96,25 +96,24 @@ public class Skins { static { register(VULCAN, ModItems.AK47); - register(ASMO, ModItems.AK47, ModItems.AWP, ModItems.M4A1, ModItems.P250, ModItems.P90, - ModItems.SCARL); - register(CANDY_APPLE, ModItems.AS50, ModItems.M107); - register(CYREX, ModItems.M4A1, ModItems.M9); - register(DIAMOND, ModItems.AS50, ModItems.DMR, ModItems.M107, ModItems.M4A1); + register(ASMO, ModItems.AK47, ModItems.AWP); // M4A1, P250, P90, SCAR-L + register(CANDY_APPLE); // AS50, M107 + register(CYREX); // M4A1, M9 + register(DIAMOND); // AS50, DMR, M107, M4A1 register(DRAGON, ModItems.AWP); - register(FADE, ModItems.G18, ModItems.MAC10); - register(FURY, ModItems.MINIGUN); - register(GEM, ModItems.P90); - register(INFERNO, ModItems.DESERT_EAGLE, ModItems.M4A1); - register(RUBY, ModItems.P90); - register(SCORCHED, ModItems.AWP, ModItems.DESERT_EAGLE, ModItems.DMR, ModItems.M4A1); - register(SLAUGHTER, ModItems.VECTOR); - register(UV, ModItems.MAC10); - register(HYPER_BEAST, ModItems.M4A1); - register(EMPEROR_DRAGON, ModItems.M4A1); + register(FADE); // G18, MAC-10 + register(FURY); // Minigun + register(GEM); // P90 + register(INFERNO, ModItems.DESERT_EAGLE); // M4A1 + register(RUBY); // P90 + register(SCORCHED, ModItems.AWP, ModItems.DESERT_EAGLE); // DMR, M4A1 + register(SLAUGHTER); // Vector + register(UV); // MAC-10 + register(HYPER_BEAST); // M4A1 + register(EMPEROR_DRAGON); // M4A1 register(NUCLEAR_WINTER, ModItems.DESERT_EAGLE); register(MONARCH, ModItems.AWP); - register(LOVELACE, ModItems.DESERT_EAGLE, ModItems.M4A1); + register(LOVELACE, ModItems.DESERT_EAGLE); // M4A1 } private static ResourceKey> createRegistryKey(String name) { diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/lang/en_us.json b/crafting-dead-core/src/main/resources/assets/craftingdead/lang/en_us.json index aee8f9121..8b0eb146b 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/lang/en_us.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/lang/en_us.json @@ -453,6 +453,7 @@ "clothing_item.water_breathing": "Gives water breathing ability", "clothing_item.water_speed": "Increases swimming speed", "paint.accepted_guns":"Use with:", + "paint.no_guns": "Coming soon...", "attachment_multiplier_type.damage": "Damage", "attachment_multiplier_type.accuracy": "Accuracy", diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acog_sight.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acog_sight.png index ed8d8aa3b..4097287d4 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acog_sight.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acog_sight.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acr_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acr_magazine.png index 09ec7a96f..33128a8e0 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acr_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/acr_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/ak47_30_round_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/ak47_30_round_magazine.png index 027626a8e..e22be4945 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/ak47_30_round_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/ak47_30_round_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/as50_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/as50_magazine.png index 08b6ca8f4..3aa407808 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/as50_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/as50_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/awp_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/awp_magazine.png index 2ad08a623..0b18bcd97 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/awp_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/awp_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bandage.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bandage.png index 553e19302..6fb206bc7 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bandage.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bandage.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bipod.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bipod.png index c61d45046..ba26d6180 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bipod.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/bipod.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/desert_eagle_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/desert_eagle_magazine.png index 8e91f0636..8b0826c4d 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/desert_eagle_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/desert_eagle_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/desktop.ini b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/desktop.ini deleted file mode 100644 index 4fb7e591e..000000000 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/desktop.ini +++ /dev/null @@ -1,2 +0,0 @@ -[LocalizedFileNames] -m1garand_ammunition.png=@m1garand_ammunition,0 diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/dmr_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/dmr_magazine.png index 94a223cb9..feb3e7400 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/dmr_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/dmr_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/eotech_sight.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/eotech_sight.png index 029dc216b..a427cc54a 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/eotech_sight.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/eotech_sight.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fn57_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fn57_magazine.png index 394f21020..82a093151 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fn57_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fn57_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fnfal_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fnfal_magazine.png index 6c2a2199b..581d1a4f5 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fnfal_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/fnfal_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g18_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g18_magazine.png index 1c9e419a7..22c998fc9 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g18_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g18_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g36c_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g36c_magazine.png index 8ff84d471..23e25dd46 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g36c_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/g36c_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hk417_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hk417_magazine.png index 994d5b789..7dda8ca29 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hk417_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hk417_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hp_scope.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hp_scope.png index c5d6fe3e6..5c8555965 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hp_scope.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/hp_scope.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/lp_scope.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/lp_scope.png index 93173d3f8..cd38ec4f8 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/lp_scope.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/lp_scope.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m107_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m107_magazine.png index 708817668..466b5e4d9 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m107_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m107_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m1911_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m1911_magazine.png index 51b507839..aedd7e3c1 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m1911_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m1911_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m240b_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m240b_magazine.png index 4c2c650fb..bad81c00f 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m240b_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m240b_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m9_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m9_magazine.png index 219d75920..181565b54 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m9_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/m9_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_extended_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_extended_magazine.png index 29982e7a5..e79c080f8 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_extended_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_extended_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_magazine.png index 87e3f59a1..894ff5b1a 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mac10_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/magnum_ammunition.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/magnum_ammunition.png index dc1cb65c9..8de8728f2 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/magnum_ammunition.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/magnum_ammunition.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/minigun_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/minigun_magazine.png index 12e723332..e98185c7f 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/minigun_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/minigun_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mk48mod_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mk48mod_magazine.png index e401d577c..62f24cf1a 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mk48mod_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mk48mod_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mossberg_shells.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mossberg_shells.png index 147e8acc1..055ff7344 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mossberg_shells.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mossberg_shells.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_21_round_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_21_round_magazine.png index 317f316a2..3c0de246b 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_21_round_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_21_round_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_35_round_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_35_round_magazine.png index 26c73c103..a08511076 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_35_round_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mp5a5_35_round_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mpt55_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mpt55_magazine.png index 896f0c6ed..de47f11de 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mpt55_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/mpt55_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p250_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p250_magazine.png index 1eb089443..2b22f6836 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p250_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p250_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p90_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p90_magazine.png index 711f19d91..fd0adcd1e 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p90_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/p90_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/red_dot_sight.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/red_dot_sight.png index 34fb1d516..d2a8f1ed9 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/red_dot_sight.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/red_dot_sight.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_drum_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_drum_magazine.png index 1556b9d97..d23940fe9 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_drum_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_drum_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_magazine.png index 3c8a1edaf..b5279a553 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/rpk_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/sporter22_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/sporter22_magazine.png index 6bfe13e23..32d95590e 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/sporter22_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/sporter22_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_20_round_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_20_round_magazine.png index 8b99b6b33..5f4cc10b9 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_20_round_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_20_round_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_30_round_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_30_round_magazine.png index 85e65d4a3..65caf9b7d 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_30_round_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_30_round_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_box_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_box_magazine.png index 5b87d666c..90d317396 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_box_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_box_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_drum_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_drum_magazine.png index 99995cf1d..9ac8f66a2 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_drum_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/stanag_drum_magazine.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/suppressor.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/suppressor.png index e103d6084..8996c07d2 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/suppressor.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/suppressor.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/tactical_grip.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/tactical_grip.png index 559e776ba..8481f9575 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/tactical_grip.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/tactical_grip.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/taser_cartridge.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/taser_cartridge.png index adece0f69..c09ec202f 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/taser_cartridge.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/taser_cartridge.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/trench_gun_shells.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/trench_gun_shells.png index e5ddc43ef..ae0096dae 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/trench_gun_shells.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/trench_gun_shells.png differ diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/vector_magazine.png b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/vector_magazine.png index 1b8414ce1..c7c050862 100644 Binary files a/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/vector_magazine.png and b/crafting-dead-core/src/main/resources/assets/craftingdead/textures/item/vector_magazine.png differ diff --git a/crafting-dead-survival/src/main/java/com/craftingdead/survival/ServerConfig.java b/crafting-dead-survival/src/main/java/com/craftingdead/survival/ServerConfig.java index 80350c679..daab80eda 100644 --- a/crafting-dead-survival/src/main/java/com/craftingdead/survival/ServerConfig.java +++ b/crafting-dead-survival/src/main/java/com/craftingdead/survival/ServerConfig.java @@ -30,7 +30,6 @@ public class ServerConfig { public final ForgeConfigSpec.BooleanValue allowSupplyDropBreak; public final ForgeConfigSpec.IntValue supplyDropDuration; - public final ForgeConfigSpec.BooleanValue showSubtitles; // ================================================================================ // Loot Values @@ -256,11 +255,6 @@ public ServerConfig(ForgeConfigSpec.Builder builder) { .translation("options.craftingdeadsurvival.server.supply_drop_duration") .comment("Duration in seconds before a Supply Drop disappears from the world") .defineInRange("supplyDropDuration", 1200, 1, Integer.MAX_VALUE); - - this.showSubtitles = builder - .translation("options.craftingdeadsurvival.server.show_subtitles") - .comment("If true, allow the subtitles overlay to render for players") - .define("showSubtitles", true); } builder.pop(); diff --git a/crafting-dead-survival/src/main/java/com/craftingdead/survival/mixin/SubtitleOverlayMixin.java b/crafting-dead-survival/src/main/java/com/craftingdead/survival/mixin/SubtitleOverlayMixin.java index ea5f7302a..0dce30493 100644 --- a/crafting-dead-survival/src/main/java/com/craftingdead/survival/mixin/SubtitleOverlayMixin.java +++ b/crafting-dead-survival/src/main/java/com/craftingdead/survival/mixin/SubtitleOverlayMixin.java @@ -18,7 +18,6 @@ package com.craftingdead.survival.mixin; -import com.craftingdead.survival.CraftingDeadSurvival; import net.minecraft.client.gui.components.SubtitleOverlay; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -30,8 +29,8 @@ public class SubtitleOverlayMixin { @Inject(method = "render", at = @At("HEAD"), cancellable = true) private void disableSoundTextRendering(CallbackInfo ci) { - if (!CraftingDeadSurvival.serverConfig.showSubtitles.get()) { - ci.cancel(); - } +// if (!CraftingDeadSurvival.serverConfig.showSubtitles.get()) { +// ci.cancel(); +// } } -} +} \ No newline at end of file diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_beans.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_beans.png index a006b394d..b478a01d1 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_beans.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_beans.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_corned_beef.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_corned_beef.png index 3dfd7d3a6..736ae1bce 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_corned_beef.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_corned_beef.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_custard.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_custard.png index a7edd13fb..2946eccb1 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_custard.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_custard.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_dog_food.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_dog_food.png index 173fc02a5..916a19eab 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_dog_food.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_dog_food.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pasta.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pasta.png index b3b2c5348..6d9b1952e 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pasta.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pasta.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_peaches.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_peaches.png index e48458360..f756cbddf 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_peaches.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_peaches.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pickles.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pickles.png index db46ac973..f205200a8 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pickles.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_pickles.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_sweetcorn.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_sweetcorn.png index 592424306..7ebf09a24 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_sweetcorn.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_sweetcorn.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tomato_soup.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tomato_soup.png index 5e6bbb26a..71a99ad56 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tomato_soup.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tomato_soup.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tuna.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tuna.png index dd1d95fa1..5e65c2ecc 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tuna.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/canned_tuna.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/cereal.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/cereal.png index 18416a513..fa991e474 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/cereal.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/cereal.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/emerald_cereal.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/emerald_cereal.png index 4f8a23513..88d230b8b 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/emerald_cereal.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/emerald_cereal.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_milk_carton.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_milk_carton.png index 99a3963fd..0f25ba86b 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_milk_carton.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_milk_carton.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_water_bottle.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_water_bottle.png index 74b9031f0..a6e813ad9 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_water_bottle.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/empty_water_bottle.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/flake_cereal.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/flake_cereal.png index 4df60da92..c8bd71f35 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/flake_cereal.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/flake_cereal.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/medical_drop_radio.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/medical_drop_radio.png index 0b75bfdbb..e5e138f0f 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/medical_drop_radio.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/medical_drop_radio.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/military_drop_radio.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/military_drop_radio.png index 0a823381a..cc5fe6822 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/military_drop_radio.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/military_drop_radio.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/milk_carton.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/milk_carton.png index d68ecd702..39d515c80 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/milk_carton.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/milk_carton.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/nutty_cereal.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/nutty_cereal.png index 5d5aa8994..aa21429d0 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/nutty_cereal.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/nutty_cereal.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_beans.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_beans.png index 2aa8af98c..610ddb6bc 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_beans.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_beans.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_corned_beef.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_corned_beef.png index 316b978b1..99bae362c 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_corned_beef.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_corned_beef.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_custard.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_custard.png index 1e8e5922b..1e1fdd49c 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_custard.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_custard.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_dog_food.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_dog_food.png index bddebe14a..54452af7d 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_dog_food.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_dog_food.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pasta.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pasta.png index 622acc074..fce7e5e2c 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pasta.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pasta.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_peaches.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_peaches.png index ce6a71cc7..c1399fd7f 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_peaches.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_peaches.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pickles.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pickles.png index 31f896b03..558cb178f 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pickles.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_pickles.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_sweetcorn.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_sweetcorn.png index b738418f4..58e50c797 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_sweetcorn.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_sweetcorn.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tomato_soup.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tomato_soup.png index 0c9ace407..8d6c962f3 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tomato_soup.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tomato_soup.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tuna.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tuna.png index 63044bbc8..0a1c1d5ca 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tuna.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/open_canned_tuna.png differ diff --git a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/water_bottle.png b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/water_bottle.png index b29a09550..3432e406f 100644 Binary files a/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/water_bottle.png and b/crafting-dead-survival/src/main/resources/assets/craftingdeadsurvival/textures/item/water_bottle.png differ