allow rebinding break keybind

Author: IThundxr

changelog.md

@@ -3,6 +3,9 @@ Numismatics 1.0.7
 ------------------------------------------------------
 Fixes
 - Fix coins stacked above 127 visually disappearing on the client in Brass Depositors
+
+Changes
+- Allow rebinding the break keybind using the crouch keybind (was previously shift + break key)
 ------------------------------------------------------
 Numismatics 1.0.6
 ------------------------------------------------------

common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828

@@ -1,4 +1,4 @@
-// 1.20.1	2024-04-19T18:54:51.68026008	Create: Numismatics/Numismatics' Advancements
+// 1.20.1	2024-05-30T17:23:26.208852962	Create: Numismatics/Numismatics' Advancements
 8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json
 645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json
 894790d980b33b5cc24a21937c7db72bf0af1c5a data/numismatics/advancements/money_laundering.json

common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677

@@ -1,4 +1,4 @@
-// 1.20.1	2024-04-19T18:54:51.679233321	Create: Numismatics/Numismatics Standard Recipes
+// 1.20.1	2024-05-30T17:23:26.207789631	Create: Numismatics/Numismatics Standard Recipes
 e16d9a5134c226db94bb389c44e55a8b393ca6c4 data/numismatics/recipes/crafting/brass_depositor.json
 151c31385fcbf7283f380e25ee2c8fdacd6d5103 data/numismatics/recipes/crafting/orange_id_card.json
 858305a3537cdcb5bb19b883e688ddb876f0473c data/numismatics/recipes/crafting/brown_id_card.json
@@ -16,8 +16,8 @@ b359f00206e8522f61fa06cc6bda43142f180e30 data/numismatics/recipes/crafting/lime_
 29ba720cf8ae338eec2edbd997fcb3f6a8de7cd1 data/numismatics/advancements/recipes/misc/crafting/vendor.json
 11be645cfbf1ee8721ffceb2b47d30e2923e9323 data/numismatics/advancements/recipes/misc/crafting/andesite_depositor.json
 ba04c62863e2c847ad7ac240e282c3f6ecd85d62 data/numismatics/recipes/crafting/banking_guide.json
-0000b8a2cd58843eb7cf2c0b4b7b71a07baf3652 data/numismatics/advancements/recipes/misc/crafting/magenta_card.json
 a2966bf8eb0aa54b64e4c77d1522bd6163e03a1d data/numismatics/advancements/recipes/misc/crafting/orange_id_card.json
+0000b8a2cd58843eb7cf2c0b4b7b71a07baf3652 data/numismatics/advancements/recipes/misc/crafting/magenta_card.json
 0e1680b878cfa51c04809504b3542cb6312027a1 data/numismatics/recipes/crafting/gray_id_card.json
 af8adf907389ccfa18bfa035d40108f9c5755ddd data/numismatics/recipes/crafting/white_id_card.json
 5c882ba48afb491eac809ad5fef36c5d419afd1f data/numismatics/recipes/crafting/purple_card.json

common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865

@@ -1 +1 @@
-// 1.20.1	2024-04-19T18:54:51.680063444	Create: Numismatics/Numismatics' Sequenced Assembly Recipes
+// 1.20.1	2024-05-30T17:23:26.208697274	Create: Numismatics/Numismatics' Sequenced Assembly Recipes

common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6

@@ -1,4 +1,4 @@
-// 1.20.1	2024-04-19T18:54:51.676973276	Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
+// 1.20.1	2024-05-30T17:23:26.206118089	Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
 70c481f36a9718ac48632e6939ac6ba785be4c9e assets/numismatics/models/item/black_id_card.json
 95ef415a564eba1d212053195d25b199427b94e3 assets/numismatics/blockstates/creative_vendor.json
 4458283178334ae169a7cbbd1aa09067cbb99ee7 data/numismatics/tags/items/internal/dyes/green_dyes.json
@@ -38,11 +38,11 @@ a8cb82f19034a0e724e12df45c883e9cd469c210 assets/numismatics/models/item/green_ca
 cca7e7be961c6ed6272f19211bb17707b7934155 assets/numismatics/models/item/creative_vendor.json
 9fdcd12c871f136e66973a8c02be94a675a4b727 data/numismatics/tags/items/internal/dyes/yellow_dyes.json
 dc5c60bbbaf3a5d7bc1f9bc0c9377757dbd8de49 data/numismatics/loot_tables/blocks/bank_terminal.json
-bb6968537ab305ee37b6268f9037a689b8c8a9c9 assets/numismatics/lang/en_us.json
+1cd26e33d78f7b7f93e9d7466eae50f027b34075 assets/numismatics/lang/en_us.json
 edd6109002439af0f15959debe4cb9cca254add8 data/minecraft/tags/blocks/mineable/pickaxe.json
 facbd710d107ebc9b2c6ddfa3b59a16d5f85c992 assets/numismatics/models/item/spur.json
 d6f017479b3cc538f73d7fb0a1e65d1742bab266 assets/numismatics/models/item/light_blue_id_card.json
-6dd2c5d0c4c607aa601fb66217f4f60a5c008489 assets/numismatics/lang/en_ud.json
+9f38b4224f4986b2e40be7e68c40a0c67a866561 assets/numismatics/lang/en_ud.json
 e62db1a880d468865769307ad19f16d9b7dac7c1 data/numismatics/tags/items/internal/dyes/light_gray_dyes.json
 c5958ebbc2782c2611690c642713cadc59656814 assets/numismatics/models/item/light_blue_card.json
 9e6e50d40e3688ae681107e60ac5ff5fc22585f9 data/numismatics/loot_tables/blocks/andesite_depositor.json

common/src/generated/resources/assets/numismatics/lang/en_ud.json

@@ -24,7 +24,7 @@
   "block.numismatics.creative_vendor": "ɹopuǝΛ ǝʌıʇɐǝɹƆ",
   "block.numismatics.creative_vendor.tooltip": "ᴚOᗡNƎΛ ƎΛI⟘ⱯƎᴚƆ",
   "block.numismatics.creative_vendor.tooltip.summary": "˙ʞɔoʇs ɟo ʇno unɹ ɹo dn ןןıɟ ɹǝʌǝu ןןıʍ pǝɹnbıɟuoɔ ǝɔuo 'ɹopuǝʌ ǝɥʇ ɟo uoısɹǝʌ ‾ǝʌıʇɐǝɹƆ‾",
-  "block.numismatics.trusted_block.attempt_break": "ʞɔoןq sıɥʇ ʞɐǝɹq oʇ ʇɟıɥs pןoH",
+  "block.numismatics.trusted_block.attempt_break": "ʞɔoןq sıɥʇ ʞɐǝɹq oʇ >ʇuǝıןɔ uo ǝɔɐןdǝɹ sɔıʇɐɯsıɯnu< pןoH",
   "block.numismatics.vendor": "ɹopuǝΛ",
   "block.numismatics.vendor.tooltip": "ᴚOᗡNƎΛ",
   "block.numismatics.vendor.tooltip.mode": "ǝpoW",

common/src/generated/resources/assets/numismatics/lang/en_us.json

@@ -24,7 +24,7 @@
   "block.numismatics.creative_vendor": "Creative Vendor",
   "block.numismatics.creative_vendor.tooltip": "CREATIVE VENDOR",
   "block.numismatics.creative_vendor.tooltip.summary": "_Creative_ version of the vendor, once configured will never fill up or run out of stock.",
-  "block.numismatics.trusted_block.attempt_break": "Hold shift to break this block",
+  "block.numismatics.trusted_block.attempt_break": "Hold <numismatics replace on client> to break this block",
   "block.numismatics.vendor": "Vendor",
   "block.numismatics.vendor.tooltip": "VENDOR",
   "block.numismatics.vendor.tooltip.mode": "Mode",

common/src/main/java/dev/ithundxr/createnumismatics/events/ClientEvents.java

@@ -0,0 +1,39 @@
+/*
+ * Numismatics
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.ithundxr.createnumismatics.events;
+
+import dev.ithundxr.createnumismatics.annotation.event.MultiLoaderEvent;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+
+public class ClientEvents {
+    @MultiLoaderEvent
+    public static Component clientReceiveMessage(Component message, boolean overlay) {
+        String messageString = message.getString();
+        String replaceString = "<numismatics replace on client>";
+
+        if (messageString.equals("Hold " + replaceString + " to break this block") && overlay) {
+            String keyName = Minecraft.getInstance().options.keyShift.getTranslatedKeyMessage().getString();
+
+            return Component.literal(messageString.replace(replaceString, keyName)).setStyle(message.getStyle());
+        }
+
+        return message;
+    }
+}

common/src/main/java/dev/ithundxr/createnumismatics/events/CommonEvents.java

@@ -30,6 +30,8 @@
 import dev.ithundxr.createnumismatics.registry.NumismaticsPackets;
 import dev.ithundxr.createnumismatics.registry.packets.BankAccountLabelPacket;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.Options;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
@@ -60,7 +62,7 @@ public static boolean onBlockBreak(LevelAccessor level, BlockPos pos, BlockState
             mayBreak = conditionalBreak.mayBreak(level, pos, state, player);
         }
 
-        if (state.getBlock() instanceof TrustedBlock trustedBlock && !player.isShiftKeyDown() && trustedBlock.isTrusted(player, level, pos)) {
+        if (state.getBlock() instanceof TrustedBlock trustedBlock && !player.isCrouching() && trustedBlock.isTrusted(player, level, pos)) {
             player.displayClientMessage(Components.translatable("block.numismatics.trusted_block.attempt_break")
                     .withStyle(ChatFormatting.DARK_RED), true);
         }

common/src/main/resources/assets/numismatics/lang/default/interface.json

@@ -28,5 +28,5 @@
   "gui.numismatics.vendor.full.named": "Vendor is full, contact %s to empty it",
   "gui.numismatics.vendor.no_item_in_hand": "Hold the stack of items you want to sell",
 
-  "block.numismatics.trusted_block.attempt_break": "Hold shift to break this block"
+  "block.numismatics.trusted_block.attempt_break": "Hold <numismatics replace on client> to break this block"
 }

fabric/build.gradle.kts

@@ -1,3 +1,21 @@
+/*
+ * Numismatics
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import dev.ithundxr.silk.ChangelogText
 
 architectury.fabric()
@@ -13,10 +31,8 @@ loom {
             name = "Minecraft Data"
             vmArg("-Dfabric-api.datagen")
             vmArg("-Dfabric-api.datagen.output-dir=${common.file("src/generated/resources")}")
-            vmArg("-Dfabric-api.datagen.modid=railways")
+            vmArg("-Dfabric-api.datagen.modid=numismatics")
             vmArg("-Dporting_lib.datagen.existing_resources=${common.file("src/main/resources")}")
-
-            environmentVariable("DATAGEN", "TRUE")
         }
 
         getByName("client") {

fabric/src/main/java/dev/ithundxr/createnumismatics/events/fabric/ClientEventsFabric.java

@@ -0,0 +1,28 @@
+/*
+ * Numismatics
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.ithundxr.createnumismatics.events.fabric;
+
+import dev.ithundxr.createnumismatics.events.ClientEvents;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+
+public class ClientEventsFabric {
+    public static void init() {
+        ClientReceiveMessageEvents.MODIFY_GAME.register(ClientEvents::clientReceiveMessage);
+    }
+}

fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/NumismaticsClientImpl.java

@@ -19,11 +19,14 @@
 package dev.ithundxr.createnumismatics.fabric;
 
 import dev.ithundxr.createnumismatics.NumismaticsClient;
+import dev.ithundxr.createnumismatics.events.ClientEvents;
+import dev.ithundxr.createnumismatics.events.fabric.ClientEventsFabric;
 import net.fabricmc.api.ClientModInitializer;
 
 public class NumismaticsClientImpl implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         NumismaticsClient.init();
+        ClientEventsFabric.init();
     }
 }

forge/src/main/java/dev/ithundxr/createnumismatics/events/forge/ClientEventsForge.java

@@ -0,0 +1,33 @@
+/*
+ * Numismatics
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.ithundxr.createnumismatics.events.forge;
+
+import dev.ithundxr.createnumismatics.events.ClientEvents;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(Dist.CLIENT)
+public class ClientEventsForge {
+    @SubscribeEvent
+    public static void onClientSystemChat(ClientChatReceivedEvent.System event) {
+        event.setMessage(ClientEvents.clientReceiveMessage(event.getMessage(), event.isOverlay()));
+    }
+}