Skip to content

Commit e9ca3d7

Browse files
committed
Better fixes, less events
1 parent eb9a7a2 commit e9ca3d7

File tree

12 files changed

+10
-113
lines changed

12 files changed

+10
-113
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-05-30T17:23:26.208852962 Create: Numismatics/Numismatics' Advancements
1+
// 1.20.1 2024-06-01T10:15:46.973855481 Create: Numismatics/Numismatics' Advancements
22
8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json
33
645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json
44
894790d980b33b5cc24a21937c7db72bf0af1c5a data/numismatics/advancements/money_laundering.json

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-05-30T17:23:26.207789631 Create: Numismatics/Numismatics Standard Recipes
1+
// 1.20.1 2024-06-01T10:15:46.973160682 Create: Numismatics/Numismatics Standard Recipes
22
e16d9a5134c226db94bb389c44e55a8b393ca6c4 data/numismatics/recipes/crafting/brass_depositor.json
33
151c31385fcbf7283f380e25ee2c8fdacd6d5103 data/numismatics/recipes/crafting/orange_id_card.json
44
858305a3537cdcb5bb19b883e688ddb876f0473c data/numismatics/recipes/crafting/brown_id_card.json
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
// 1.20.1 2024-05-30T17:23:26.208697274 Create: Numismatics/Numismatics' Sequenced Assembly Recipes
1+
// 1.20.1 2024-06-01T10:15:46.973739917 Create: Numismatics/Numismatics' Sequenced Assembly Recipes

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 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)]
1+
// 1.20.1 2024-06-01T10:15:46.971201845 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)]
22
70c481f36a9718ac48632e6939ac6ba785be4c9e assets/numismatics/models/item/black_id_card.json
33
95ef415a564eba1d212053195d25b199427b94e3 assets/numismatics/blockstates/creative_vendor.json
44
4458283178334ae169a7cbbd1aa09067cbb99ee7 data/numismatics/tags/items/internal/dyes/green_dyes.json
@@ -38,11 +38,11 @@ a8cb82f19034a0e724e12df45c883e9cd469c210 assets/numismatics/models/item/green_ca
3838
cca7e7be961c6ed6272f19211bb17707b7934155 assets/numismatics/models/item/creative_vendor.json
3939
9fdcd12c871f136e66973a8c02be94a675a4b727 data/numismatics/tags/items/internal/dyes/yellow_dyes.json
4040
dc5c60bbbaf3a5d7bc1f9bc0c9377757dbd8de49 data/numismatics/loot_tables/blocks/bank_terminal.json
41-
1cd26e33d78f7b7f93e9d7466eae50f027b34075 assets/numismatics/lang/en_us.json
41+
52659db3242553289a2cb1268eb469a48a477f3a assets/numismatics/lang/en_us.json
4242
edd6109002439af0f15959debe4cb9cca254add8 data/minecraft/tags/blocks/mineable/pickaxe.json
4343
facbd710d107ebc9b2c6ddfa3b59a16d5f85c992 assets/numismatics/models/item/spur.json
4444
d6f017479b3cc538f73d7fb0a1e65d1742bab266 assets/numismatics/models/item/light_blue_id_card.json
45-
9f38b4224f4986b2e40be7e68c40a0c67a866561 assets/numismatics/lang/en_ud.json
45+
cbbdd36d74d48d2ff03629264e405a790dd1697f assets/numismatics/lang/en_ud.json
4646
e62db1a880d468865769307ad19f16d9b7dac7c1 data/numismatics/tags/items/internal/dyes/light_gray_dyes.json
4747
c5958ebbc2782c2611690c642713cadc59656814 assets/numismatics/models/item/light_blue_card.json
4848
9e6e50d40e3688ae681107e60ac5ff5fc22585f9 data/numismatics/loot_tables/blocks/andesite_depositor.json

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"block.numismatics.creative_vendor": "Creative Vendor",
2525
"block.numismatics.creative_vendor.tooltip": "CREATIVE VENDOR",
2626
"block.numismatics.creative_vendor.tooltip.summary": "_Creative_ version of the vendor, once configured will never fill up or run out of stock.",
27-
"block.numismatics.trusted_block.attempt_break": "Hold <numismatics replace on client> to break this block",
27+
"block.numismatics.trusted_block.attempt_break": "Hold %1$s to break this block",
2828
"block.numismatics.vendor": "Vendor",
2929
"block.numismatics.vendor.tooltip": "VENDOR",
3030
"block.numismatics.vendor.tooltip.mode": "Mode",

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

-39
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static boolean onBlockBreak(LevelAccessor level, BlockPos pos, BlockState
6363
}
6464

6565
if (state.getBlock() instanceof TrustedBlock trustedBlock && !player.isCrouching() && trustedBlock.isTrusted(player, level, pos)) {
66-
player.displayClientMessage(Components.translatable("block.numismatics.trusted_block.attempt_break")
66+
player.displayClientMessage(Components.translatable("block.numismatics.trusted_block.attempt_break", Components.keybind("key.sneak"))
6767
.withStyle(ChatFormatting.DARK_RED), true);
6868
}
6969

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
"gui.numismatics.vendor.full.named": "Vendor is full, contact %s to empty it",
2929
"gui.numismatics.vendor.no_item_in_hand": "Hold the stack of items you want to sell",
3030

31-
"block.numismatics.trusted_block.attempt_break": "Hold <numismatics replace on client> to break this block"
31+
"block.numismatics.trusted_block.attempt_break": "Hold %1$s to break this block"
3232
}

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

-28
This file was deleted.

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

-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,11 @@
1919
package dev.ithundxr.createnumismatics.fabric;
2020

2121
import dev.ithundxr.createnumismatics.NumismaticsClient;
22-
import dev.ithundxr.createnumismatics.events.ClientEvents;
23-
import dev.ithundxr.createnumismatics.events.fabric.ClientEventsFabric;
2422
import net.fabricmc.api.ClientModInitializer;
2523

2624
public class NumismaticsClientImpl implements ClientModInitializer {
2725
@Override
2826
public void onInitializeClient() {
2927
NumismaticsClient.init();
30-
ClientEventsFabric.init();
3128
}
3229
}

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

-33
This file was deleted.

0 commit comments

Comments
 (0)