diff --git a/build.gradle.kts b/build.gradle.kts
index d9320d6..a91e5d0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,7 @@ minecraft_fp {
mixin {
pkg = "mixin.mixins"
+ debug = true
}
core {
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockFireMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/BlockFireMixin.java
similarity index 98%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockFireMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/BlockFireMixin.java
index 75d5215..cee7087 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockFireMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/BlockFireMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/BlockMixin.java
similarity index 99%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/BlockMixin.java
index e199ea8..2465dad 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/BlockMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ExtendedBlockStorageMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ExtendedBlockStorageMixin.java
new file mode 100644
index 0000000..cc47865
--- /dev/null
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ExtendedBlockStorageMixin.java
@@ -0,0 +1,368 @@
+/*
+ * EndlessIDs
+ *
+ * Copyright (C) 2022-2025 FalsePattern, The MEGA Team
+ * All Rights Reserved
+ *
+ * The above copyright notice, this permission notice and the word "MEGA"
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, only version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
+
+import com.falsepattern.endlessids.EndlessIDs;
+import com.falsepattern.endlessids.Hooks;
+import com.falsepattern.endlessids.Tags;
+import com.falsepattern.endlessids.config.GeneralConfig;
+import com.falsepattern.endlessids.mixin.helpers.SubChunkBlockHook;
+import lombok.val;
+import lombok.var;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.chunk.NibbleArray;
+import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+
+import static com.falsepattern.endlessids.constants.ExtendedConstants.blocksPerSubChunk;
+
+@Mixin(ExtendedBlockStorage.class)
+public abstract class ExtendedBlockStorageMixin implements SubChunkBlockHook {
+ @Shadow
+ private int blockRefCount;
+ @Shadow
+ private int tickRefCount;
+
+ @Shadow
+ private byte[] blockLSBArray;
+ @Shadow
+ private NibbleArray blockMSBArray;
+ private NibbleArray b2High;
+ private byte[] b3;
+
+ @Shadow
+ private NibbleArray blockMetadataArray;
+ private NibbleArray m1High;
+ private byte[] m2;
+
+ public int eid$getID(int x, int y, int z) {
+ int index = y << 8 | z << 4 | x;
+ int id = blockLSBArray[index] & 0xFF;
+ if (blockMSBArray != null) {
+ id |= blockMSBArray.get(x, y, z) << 8;
+ if (b2High != null) {
+ id |= b2High.get(x, y, z) << 12;
+ if (b3 != null) {
+ id |= (b3[index] & 0xFF) << 16;
+ }
+ }
+ }
+ return id;
+ }
+
+ public void eid$setID(int x, int y, int z, int id) {
+ int index = y << 8 | z << 4 | x;
+ blockLSBArray[index] = (byte) (id & 0xFF);
+ if (id > 0xFF) {
+ if (blockMSBArray == null) {
+ eid$createB2Low();
+ }
+ if (id > 0xFFF) {
+ if (b2High == null) {
+ eid$createB2High();
+ }
+ if (id > 0xFFFF && b3 == null) {
+ eid$createB3();
+ }
+ }
+ }
+ if (blockMSBArray != null) {
+ blockMSBArray.set(x, y, z, (id >>> 8) & 0xF);
+ if (b2High != null) {
+ b2High.set(x, y, z, (id >>> 12) & 0xF);
+ if (b3 != null) {
+ b3[index] = (byte) ((id >>> 16) & 0xFF);
+ }
+ }
+ }
+ }
+
+ /**
+ * @author FalsePattern
+ * @reason Direct port from dumped code
+ */
+ @Overwrite
+ public Block getBlockByExtId(int x, int y, int z) {
+ return Block.getBlockById(eid$getID(x, y, z));
+ }
+
+ /**
+ * @author FalsePattern
+ * @reason Direct port from dumped code
+ */
+ @Overwrite
+ public void func_150818_a(int x, int y, int z, Block newBlock) {
+ Block oldBlock = this.getBlockByExtId(x, y, z);
+ if (oldBlock != Blocks.air) {
+ --this.blockRefCount;
+ if (oldBlock.getTickRandomly()) {
+ --this.tickRefCount;
+ }
+ }
+
+ if (newBlock != Blocks.air) {
+ ++this.blockRefCount;
+ if (newBlock.getTickRandomly()) {
+ ++this.tickRefCount;
+ }
+ }
+
+ int blockID = Hooks.getIdFromBlockWithCheck(newBlock, oldBlock);
+ eid$setID(x, y, z, blockID);
+ }
+
+ /**
+ * @author FalsePattern
+ * @reason meta ID extension
+ */
+ @Overwrite
+ public int getExtBlockMetadata(int x, int y, int z) {
+ int meta = blockMetadataArray.get(x, y, z);
+ if (m1High != null) {
+ meta |= m1High.get(x, y, z) << 4;
+ if (m2 != null) {
+ meta |= (m2[(y << 8) | (z << 4) | x] & 0xFF) << 8;
+ }
+ }
+ return meta;
+ }
+
+ /**
+ * @author FalsePattern
+ * @reason meta ID extension
+ */
+ @Overwrite
+ public void setExtBlockMetadata(int x, int y, int z, int meta) {
+ blockMetadataArray.set(x, y, z, meta & 0xF);
+ if (meta > 0xF) {
+ if (m1High == null) {
+ eid$createM1High();
+ }
+ if (meta > 0xFF && m2 == null) {
+ eid$createM2();
+ }
+ }
+ if (m1High != null) {
+ m1High.set(x, y, z, (meta >>> 4) & 0xF);
+ if (m2 != null) {
+ m2[(y << 8) | (z << 4) | x] = (byte) ((meta >>> 8) & 0xFF);
+ }
+ }
+ }
+
+ @Override
+ public int eid$getMetadata(int x, int y, int z) {
+ return getExtBlockMetadata(x, y, z);
+ }
+
+ @Override
+ public void eid$setMetadata(int x, int y, int z, int id) {
+ setExtBlockMetadata(x, y, z, id);
+ }
+
+ private UnsupportedOperationException emergencyCrash() {
+ val crashMSG = "A mod that is incompatible with " + Tags.MODNAME + " has tried to access the block array of a" +
+ " chunk like in vanilla! Crashing in fear of potential world corruption!\n" +
+ "Please report this issue on https://github.com/GTMEGA/EndlessIDs ASAP!";
+ EndlessIDs.LOG.fatal(crashMSG);
+ return new UnsupportedOperationException(crashMSG);
+ }
+
+ @Override
+ public byte[] eid$getB1() {
+ return blockLSBArray;
+ }
+
+ @Override
+ public void eid$setB1(byte[] data) {
+ blockLSBArray = data;
+ }
+
+ @Override
+ public NibbleArray eid$getB2Low() {
+ return blockMSBArray;
+ }
+
+ @Override
+ public void eid$setB2Low(NibbleArray data) {
+ blockMSBArray = data;
+ }
+
+ @Override
+ public NibbleArray eid$createB2Low() {
+ return (blockMSBArray = new NibbleArray(blocksPerSubChunk, 4));
+ }
+
+ @Override
+ public NibbleArray eid$getB2High() {
+ return b2High;
+ }
+
+ @Override
+ public void eid$setB2High(NibbleArray data) {
+ b2High = data;
+ }
+
+ @Override
+ public NibbleArray eid$createB2High() {
+ return (b2High = new NibbleArray(blocksPerSubChunk, 4));
+ }
+
+ @Override
+ public byte[] eid$getB3() {
+ return b3;
+ }
+
+ @Override
+ public void eid$setB3(byte[] data) {
+ b3 = data;
+ }
+
+ @Override
+ public byte[] eid$createB3() {
+ return b3 = new byte[blocksPerSubChunk];
+ }
+
+ @Override
+ public NibbleArray eid$getM1Low() {
+ return blockMetadataArray;
+ }
+
+ @Override
+ public void eid$setM1Low(NibbleArray m1Low) {
+ blockMetadataArray = m1Low;
+ }
+
+ @Override
+ public NibbleArray eid$getM1High() {
+ return m1High;
+ }
+
+ @Override
+ public void eid$setM1High(NibbleArray m1High) {
+ this.m1High = m1High;
+ }
+
+ @Override
+ public NibbleArray eid$createM1High() {
+ return (m1High = new NibbleArray(blocksPerSubChunk, 4));
+ }
+
+ @Override
+ public byte[] eid$getM2() {
+ return m2;
+ }
+
+ @Override
+ public void eid$setM2(byte[] m2) {
+ this.m2 = m2;
+ }
+
+ @Override
+ public byte[] eid$createM2() {
+ return (m2 = new byte[blocksPerSubChunk]);
+ }
+
+ @Override
+ public int eid$getBlockMask() {
+ if (blockMSBArray == null) {
+ return 0b00;
+ }
+ if (b2High == null) {
+ return 0b01;
+ }
+ if (b3 == null) {
+ return 0b10;
+ }
+ return 0b11;
+ }
+
+ @Override
+ public int eid$getMetadataMask() {
+ if (m1High == null) {
+ return 0b01;
+ }
+ if (m2 == null) {
+ return 0b10;
+ }
+ return 0b11;
+ }
+
+ @Inject(method = {"getBlockMSBArray", "createBlockMSBArray"},
+ at = @At("HEAD"),
+ expect = 0)
+ private void crashMSBArray(CallbackInfoReturnable cir) {
+ throw emergencyCrash();
+ }
+
+ @Inject(method = "clearMSBArray",
+ at = @At("HEAD"),
+ expect = 0)
+ private void crashMSBArray(CallbackInfo ci) {
+ throw emergencyCrash();
+ }
+
+ @Inject(method = "setBlockMSBArray",
+ at = @At("HEAD"),
+ expect = 0)
+ private void crashMSBArray(NibbleArray p_76673_1_, CallbackInfo ci) {
+ throw emergencyCrash();
+ }
+
+ @Inject(method = "setBlockLSBArray",
+ at = @At("HEAD"),
+ expect = 0)
+ private void crashLSBArray(byte[] p_76664_1_, CallbackInfo ci) {
+ throw emergencyCrash();
+ }
+
+ @Inject(method = "getBlockLSBArray",
+ at = @At("HEAD"),
+ expect = 0)
+ private void crashLSBArray(CallbackInfoReturnable cir) {
+ throw emergencyCrash();
+ }
+
+ @Inject(method = "setBlockMetadataArray",
+ at = @At("HEAD"),
+ expect = 0)
+ private void crashMetadataArray(NibbleArray p_76668_1_, CallbackInfo ci) {
+ throw emergencyCrash();
+ }
+
+ @Inject(method = "getMetadataArray",
+ at = @At("HEAD"),
+ expect = 0)
+ private void crashMetadataArray(CallbackInfoReturnable cir) {
+ throw emergencyCrash();
+ }
+}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemInWorldManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ItemInWorldManagerMixin.java
similarity index 98%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemInWorldManagerMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ItemInWorldManagerMixin.java
index daf8092..0e6690d 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemInWorldManagerMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ItemInWorldManagerMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemStackMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ItemStackMixin.java
similarity index 96%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemStackMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ItemStackMixin.java
index e806f8e..3e478b8 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemStackMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/ItemStackMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,9 +20,8 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
-import com.falsepattern.endlessids.constants.VanillaConstants;
import com.falsepattern.endlessids.util.DataUtil;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/PacketBufferMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/PacketBufferMixin.java
similarity index 99%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/PacketBufferMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/PacketBufferMixin.java
index 50ca213..0198fcb 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/PacketBufferMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/PacketBufferMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import io.netty.buffer.ByteBuf;
import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S22PacketMultiBlockChangeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/S22PacketMultiBlockChangeMixin.java
similarity index 99%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S22PacketMultiBlockChangeMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/S22PacketMultiBlockChangeMixin.java
index 023ed94..b591353 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S22PacketMultiBlockChangeMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/S22PacketMultiBlockChangeMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S24PacketBlockActionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/S24PacketBlockActionMixin.java
similarity index 98%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S24PacketBlockActionMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/S24PacketBlockActionMixin.java
index 6a63749..64e4fb5 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S24PacketBlockActionMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/S24PacketBlockActionMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/StatListMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/StatListMixin.java
similarity index 98%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/StatListMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/StatListMixin.java
index b84c93d..e9b9f49 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/StatListMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/StatListMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/WorldMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/WorldMixin.java
similarity index 98%
rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/WorldMixin.java
rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/WorldMixin.java
index 18444b9..2d3057e 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/WorldMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/common/WorldMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
+package com.falsepattern.endlessids.mixin.mixins.common.blockitem.common;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/thermos/ExtendedBlockStorageMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/thermos/ExtendedBlockStorageMixin.java
deleted file mode 100644
index cb11e12..0000000
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/thermos/ExtendedBlockStorageMixin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * EndlessIDs
- *
- * Copyright (C) 2022-2025 FalsePattern, The MEGA Team
- * All Rights Reserved
- *
- * The above copyright notice, this permission notice and the word "MEGA"
- * shall be included in all copies or substantial portions of the Software.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, only version 3 of the License.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
- */
-
-package com.falsepattern.endlessids.mixin.mixins.common.blockitem.thermos;
-
-import com.falsepattern.endlessids.config.GeneralConfig;
-import lombok.var;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-
-@Mixin(ExtendedBlockStorage.class)
-public class ExtendedBlockStorageMixin
-{
- @Redirect(method = "removeInvalidBlocks",
- at = @At(value = "INVOKE",
- target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;getBlockByExtId(III)Lnet/minecraft/block/Block;"),
- require = 1)
- private Block removeInvalidBlocks(ExtendedBlockStorage instance, int x, int y, int z) {
- var block = instance.getBlockByExtId(x, y, z);
- if (block == null && GeneralConfig.removeInvalidBlocks) {
- instance.func_150818_a(x, y, z, Blocks.air);
- block = Blocks.air;
- }
- return block;
- }
-}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ExtendedBlockStorageMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ExtendedBlockStorageMixin.java
index 4b70722..fe840b6 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ExtendedBlockStorageMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ExtendedBlockStorageMixin.java
@@ -4,7 +4,7 @@
* Copyright (C) 2022-2025 FalsePattern, The MEGA Team
* All Rights Reserved
*
- * The above copyright notice, this permission notice and the words "MEGA"
+ * The above copyright notice, this permission notice and the word "MEGA"
* shall be included in all copies or substantial portions of the Software.
*
* This program is free software: you can redistribute it and/or modify
@@ -22,347 +22,29 @@
package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla;
-import com.falsepattern.endlessids.EndlessIDs;
-import com.falsepattern.endlessids.Hooks;
-import com.falsepattern.endlessids.Tags;
import com.falsepattern.endlessids.config.GeneralConfig;
-import com.falsepattern.endlessids.mixin.helpers.SubChunkBlockHook;
-import lombok.val;
import lombok.var;
import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
-import net.minecraft.world.chunk.NibbleArray;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-import static com.falsepattern.endlessids.constants.ExtendedConstants.blocksPerSubChunk;
-
@Mixin(ExtendedBlockStorage.class)
-public abstract class ExtendedBlockStorageMixin implements SubChunkBlockHook {
- @Shadow
- private int blockRefCount;
- @Shadow
- private int tickRefCount;
-
- @Shadow
- private byte[] blockLSBArray;
- @Shadow
- private NibbleArray blockMSBArray;
- private NibbleArray b2High;
- private byte[] b3;
-
- @Shadow
- private NibbleArray blockMetadataArray;
- private NibbleArray m1High;
- private byte[] m2;
-
- public int eid$getID(int x, int y, int z) {
- int index = y << 8 | z << 4 | x;
- int id = blockLSBArray[index] & 0xFF;
- if (blockMSBArray != null) {
- id |= blockMSBArray.get(x, y, z) << 8;
- if (b2High != null) {
- id |= b2High.get(x, y, z) << 12;
- if (b3 != null) {
- id |= (b3[index] & 0xFF) << 16;
- }
- }
+public class ExtendedBlockStorageMixin
+{
+ @Redirect(method = "removeInvalidBlocks",
+ at = @At(value = "INVOKE",
+ target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;getBlockByExtId(III)Lnet/minecraft/block/Block;"),
+ require = 1)
+ private Block removeInvalidBlocks(ExtendedBlockStorage instance, int x, int y, int z) {
+ var block = instance.getBlockByExtId(x, y, z);
+ if (block == null && GeneralConfig.removeInvalidBlocks) {
+ instance.func_150818_a(x, y, z, Blocks.air);
+ block = Blocks.air;
}
- return id;
- }
-
- public void eid$setID(int x, int y, int z, int id) {
- int index = y << 8 | z << 4 | x;
- blockLSBArray[index] = (byte) (id & 0xFF);
- if (id > 0xFF) {
- if (blockMSBArray == null) {
- eid$createB2Low();
- }
- if (id > 0xFFF) {
- if (b2High == null) {
- eid$createB2High();
- }
- if (id > 0xFFFF && b3 == null) {
- eid$createB3();
- }
- }
- }
- if (blockMSBArray != null) {
- blockMSBArray.set(x, y, z, (id >>> 8) & 0xF);
- if (b2High != null) {
- b2High.set(x, y, z, (id >>> 12) & 0xF);
- if (b3 != null) {
- b3[index] = (byte) ((id >>> 16) & 0xFF);
- }
- }
- }
- }
-
- /**
- * @author FalsePattern
- * @reason Direct port from dumped code
- */
- @Overwrite
- public Block getBlockByExtId(int x, int y, int z) {
- return Block.getBlockById(eid$getID(x, y, z));
- }
-
- /**
- * @author FalsePattern
- * @reason Direct port from dumped code
- */
- @Overwrite
- public void func_150818_a(int x, int y, int z, Block newBlock) {
- Block oldBlock = this.getBlockByExtId(x, y, z);
- if (oldBlock != Blocks.air) {
- --this.blockRefCount;
- if (oldBlock.getTickRandomly()) {
- --this.tickRefCount;
- }
- }
-
- if (newBlock != Blocks.air) {
- ++this.blockRefCount;
- if (newBlock.getTickRandomly()) {
- ++this.tickRefCount;
- }
- }
-
- int blockID = Hooks.getIdFromBlockWithCheck(newBlock, oldBlock);
- eid$setID(x, y, z, blockID);
- }
-
- /**
- * @author FalsePattern
- * @reason meta ID extension
- */
- @Overwrite
- public int getExtBlockMetadata(int x, int y, int z) {
- int meta = blockMetadataArray.get(x, y, z);
- if (m1High != null) {
- meta |= m1High.get(x, y, z) << 4;
- if (m2 != null) {
- meta |= (m2[(y << 8) | (z << 4) | x] & 0xFF) << 8;
- }
- }
- return meta;
- }
-
- /**
- * @author FalsePattern
- * @reason meta ID extension
- */
- @Overwrite
- public void setExtBlockMetadata(int x, int y, int z, int meta) {
- blockMetadataArray.set(x, y, z, meta & 0xF);
- if (meta > 0xF) {
- if (m1High == null) {
- eid$createM1High();
- }
- if (meta > 0xFF && m2 == null) {
- eid$createM2();
- }
- }
- if (m1High != null) {
- m1High.set(x, y, z, (meta >>> 4) & 0xF);
- if (m2 != null) {
- m2[(y << 8) | (z << 4) | x] = (byte) ((meta >>> 8) & 0xFF);
- }
- }
- }
-
- @Override
- public int eid$getMetadata(int x, int y, int z) {
- return getExtBlockMetadata(x, y, z);
- }
-
- @Override
- public void eid$setMetadata(int x, int y, int z, int id) {
- setExtBlockMetadata(x, y, z, id);
- }
-
- private UnsupportedOperationException emergencyCrash() {
- val crashMSG = "A mod that is incompatible with " + Tags.MODNAME + " has tried to access the block array of a" +
- " chunk like in vanilla! Crashing in fear of potential world corruption!\n" +
- "Please report this issue on https://github.com/GTMEGA/EndlessIDs ASAP!";
- EndlessIDs.LOG.fatal(crashMSG);
- return new UnsupportedOperationException(crashMSG);
- }
-
- @Override
- public byte[] eid$getB1() {
- return blockLSBArray;
- }
-
- @Override
- public void eid$setB1(byte[] data) {
- blockLSBArray = data;
- }
-
- @Override
- public NibbleArray eid$getB2Low() {
- return blockMSBArray;
- }
-
- @Override
- public void eid$setB2Low(NibbleArray data) {
- blockMSBArray = data;
- }
-
- @Override
- public NibbleArray eid$createB2Low() {
- return (blockMSBArray = new NibbleArray(blocksPerSubChunk, 4));
- }
-
- @Override
- public NibbleArray eid$getB2High() {
- return b2High;
- }
-
- @Override
- public void eid$setB2High(NibbleArray data) {
- b2High = data;
- }
-
- @Override
- public NibbleArray eid$createB2High() {
- return (b2High = new NibbleArray(blocksPerSubChunk, 4));
- }
-
- @Override
- public byte[] eid$getB3() {
- return b3;
- }
-
- @Override
- public void eid$setB3(byte[] data) {
- b3 = data;
- }
-
- @Override
- public byte[] eid$createB3() {
- return b3 = new byte[blocksPerSubChunk];
- }
-
- @Override
- public NibbleArray eid$getM1Low() {
- return blockMetadataArray;
- }
-
- @Override
- public void eid$setM1Low(NibbleArray m1Low) {
- blockMetadataArray = m1Low;
- }
-
- @Override
- public NibbleArray eid$getM1High() {
- return m1High;
- }
-
- @Override
- public void eid$setM1High(NibbleArray m1High) {
- this.m1High = m1High;
- }
-
- @Override
- public NibbleArray eid$createM1High() {
- return (m1High = new NibbleArray(blocksPerSubChunk, 4));
- }
-
- @Override
- public byte[] eid$getM2() {
- return m2;
- }
-
- @Override
- public void eid$setM2(byte[] m2) {
- this.m2 = m2;
- }
-
- @Override
- public byte[] eid$createM2() {
- return (m2 = new byte[blocksPerSubChunk]);
- }
-
- @Override
- public int eid$getBlockMask() {
- if (blockMSBArray == null) {
- return 0b00;
- }
- if (b2High == null) {
- return 0b01;
- }
- if (b3 == null) {
- return 0b10;
- }
- return 0b11;
- }
-
- @Override
- public int eid$getMetadataMask() {
- if (m1High == null) {
- return 0b01;
- }
- if (m2 == null) {
- return 0b10;
- }
- return 0b11;
- }
-
- @Inject(method = {"getBlockMSBArray", "createBlockMSBArray"},
- at = @At("HEAD"),
- expect = 0)
- private void crashMSBArray(CallbackInfoReturnable cir) {
- throw emergencyCrash();
- }
-
- @Inject(method = "clearMSBArray",
- at = @At("HEAD"),
- expect = 0)
- private void crashMSBArray(CallbackInfo ci) {
- throw emergencyCrash();
- }
-
- @Inject(method = "setBlockMSBArray",
- at = @At("HEAD"),
- expect = 0)
- private void crashMSBArray(NibbleArray p_76673_1_, CallbackInfo ci) {
- throw emergencyCrash();
- }
-
- @Inject(method = "setBlockLSBArray",
- at = @At("HEAD"),
- expect = 0)
- private void crashLSBArray(byte[] p_76664_1_, CallbackInfo ci) {
- throw emergencyCrash();
- }
-
- @Inject(method = "getBlockLSBArray",
- at = @At("HEAD"),
- expect = 0)
- private void crashLSBArray(CallbackInfoReturnable cir) {
- throw emergencyCrash();
- }
-
- @Inject(method = "setBlockMetadataArray",
- at = @At("HEAD"),
- expect = 0)
- private void crashMetadataArray(NibbleArray p_76668_1_, CallbackInfo ci) {
- throw emergencyCrash();
- }
-
- @Inject(method = "getMetadataArray",
- at = @At("HEAD"),
- expect = 0)
- private void crashMetadataArray(CallbackInfoReturnable cir) {
- throw emergencyCrash();
+ return block;
}
}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
index 72e9b7e..1685114 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
@@ -419,23 +419,25 @@ public enum Mixin implements IMixins {
// region BlockItem
- BlockItem_Thermos(Phase.EARLY,
- () -> { return Ext.BlockItem.getAsBoolean() && !hasThermos(); },
- common("blockitem.thermos.ExtendedBlockStorageMixin")),
-
BlockItem_Vanilla(Phase.EARLY,
+ () -> { return Ext.BlockItem.getAsBoolean() && !hasThermos(); },
+ common("blockitem.vanilla.ExtendedBlockStorageMixin")),
+ BlockItem_Thermos(Phase.EARLY,
+ () -> { return Ext.BlockItem.getAsBoolean() && hasThermos(); },
+ common("blockitem.thermos.NibbleArrayMixin")),
+
+ BlockItem_Common(Phase.EARLY,
Ext.BlockItem,
- common("blockitem.vanilla.BlockFireMixin",
- "blockitem.vanilla.BlockMixin",
- "blockitem.vanilla.ExtendedBlockStorageMixin",
- "blockitem.vanilla.ItemInWorldManagerMixin",
- "blockitem.vanilla.ItemStackMixin",
- "blockitem.vanilla.PacketBufferMixin",
- "blockitem.vanilla.S22PacketMultiBlockChangeMixin",
- "blockitem.vanilla.S24PacketBlockActionMixin",
- "blockitem.vanilla.StatListMixin",
- "blockitem.vanilla.WorldMixin",
- "blockitem.thermos.NibbleArrayMixin"),
+ common("blockitem.common.BlockFireMixin",
+ "blockitem.common.BlockMixin",
+ "blockitem.common.ExtendedBlockStorageMixin",
+ "blockitem.common.ItemInWorldManagerMixin",
+ "blockitem.common.ItemStackMixin",
+ "blockitem.common.PacketBufferMixin",
+ "blockitem.common.S22PacketMultiBlockChangeMixin",
+ "blockitem.common.S24PacketBlockActionMixin",
+ "blockitem.common.StatListMixin",
+ "blockitem.common.WorldMixin"),
client("blockitem.vanilla.PlayerControllerMPMixin",
"blockitem.vanilla.RenderGlobalMixin")),