From cd3cbc2a959a87b6cc825b83c759f24a79374b7e Mon Sep 17 00:00:00 2001 From: Barbatosishere <584146143@qq.com> Date: Fri, 3 Jul 2026 14:16:42 +0800 Subject: [PATCH 1/3] Fix critical bugs: pack.mcmeta format, NPE on block placement, and registry order --- .../loot_tables/blocks/energy_pylon_flux.json | 19 +++++++++++++++++++ .../blocks/flux_accessor_flux.json | 19 +++++++++++++++++++ .../blocks/induction_port_flux.json | 19 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/energy_pylon_flux.json create mode 100644 versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/flux_accessor_flux.json create mode 100644 versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/induction_port_flux.json diff --git a/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/energy_pylon_flux.json b/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/energy_pylon_flux.json new file mode 100644 index 0000000..7d5196a --- /dev/null +++ b/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/energy_pylon_flux.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "more_flux_storage:energy_pylon_flux" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/flux_accessor_flux.json b/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/flux_accessor_flux.json new file mode 100644 index 0000000..9070174 --- /dev/null +++ b/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/flux_accessor_flux.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "more_flux_storage:flux_accessor_flux" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/induction_port_flux.json b/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/induction_port_flux.json new file mode 100644 index 0000000..b4f2488 --- /dev/null +++ b/versions/1.21.1/src/main/resources/data/more_flux_storage/loot_tables/blocks/induction_port_flux.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "more_flux_storage:induction_port_flux" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file From 097e735ec4b499039da31ea4e88c69a3c4ef7117 Mon Sep 17 00:00:00 2001 From: Barbatosishere <584146143@qq.com> Date: Fri, 3 Jul 2026 22:20:12 +0800 Subject: [PATCH 2/3] Fix client crash when Flux Accessor placed next to ME controller --- .../more_flux_storage/blockentity/TileFluxAccessorFlux.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/versions/1.21.1/src/main/java/com/circulation/more_flux_storage/blockentity/TileFluxAccessorFlux.java b/versions/1.21.1/src/main/java/com/circulation/more_flux_storage/blockentity/TileFluxAccessorFlux.java index b673af5..7201b4a 100644 --- a/versions/1.21.1/src/main/java/com/circulation/more_flux_storage/blockentity/TileFluxAccessorFlux.java +++ b/versions/1.21.1/src/main/java/com/circulation/more_flux_storage/blockentity/TileFluxAccessorFlux.java @@ -195,6 +195,10 @@ private void syncTransferStateForTagWrite() { private final class FluxAccessorTransferHandler extends AbstractFluxTransferHandler { private void syncBufferFromStorage() { + // Only sync on server side to avoid client crashes + if (level == null || level.isClientSide) { + return; + } IStorageService storage = getStorageService(); setBuffer(storage == null ? 0L : storage.getCachedInventory().get(FluxKey.of(EnergyType.FE))); } From 3f4639913bd5029b4479d21fc0ec8054e2f5b3d4 Mon Sep 17 00:00:00 2001 From: Barbatosishere <584146143@qq.com> Date: Fri, 3 Jul 2026 22:29:09 +0800 Subject: [PATCH 3/3] Fix pack.mcmeta format for all versions --- versions/1.12.2/src/main/resources/pack.mcmeta | 6 ++---- versions/1.20.1/src/main/resources/pack.mcmeta | 6 ++---- versions/1.21.1/src/main/resources/pack.mcmeta | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/versions/1.12.2/src/main/resources/pack.mcmeta b/versions/1.12.2/src/main/resources/pack.mcmeta index 531a377..da04c20 100644 --- a/versions/1.12.2/src/main/resources/pack.mcmeta +++ b/versions/1.12.2/src/main/resources/pack.mcmeta @@ -1,8 +1,6 @@ { "pack": { "description": "${mod_name} Resources", - "pack_format": ${ - resource_pack_format -} -} + "pack_format": ${resource_pack_format} + } } \ No newline at end of file diff --git a/versions/1.20.1/src/main/resources/pack.mcmeta b/versions/1.20.1/src/main/resources/pack.mcmeta index 531a377..da04c20 100644 --- a/versions/1.20.1/src/main/resources/pack.mcmeta +++ b/versions/1.20.1/src/main/resources/pack.mcmeta @@ -1,8 +1,6 @@ { "pack": { "description": "${mod_name} Resources", - "pack_format": ${ - resource_pack_format -} -} + "pack_format": ${resource_pack_format} + } } \ No newline at end of file diff --git a/versions/1.21.1/src/main/resources/pack.mcmeta b/versions/1.21.1/src/main/resources/pack.mcmeta index b95bcce..da04c20 100644 --- a/versions/1.21.1/src/main/resources/pack.mcmeta +++ b/versions/1.21.1/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "${mod_name} Resources", - "pack_format": " ${resource_pack_format}" + "pack_format": ${resource_pack_format} } } \ No newline at end of file