diff --git a/build.gradle.kts b/build.gradle.kts index 5812e55..48b204e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,6 @@ minecraft_fp { modid = "endlessids" name = "EndlessIDs" rootPkg = "$group.endlessids" - version = "1.6.14" } mixin { @@ -56,8 +55,6 @@ minecraft_fp { } repositories { - maven("https://maven.curseforge.com") - maven("https://nexus.gtnewhorizons.com/repository/public/") cursemavenEX() modrinthEX() exclusive(mavenpattern(), "com.falsepattern") @@ -69,7 +66,7 @@ dependencies { // region Our deps implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.9.0") compileOnly("it.unimi.dsi:fastutil:8.5.16") - implementationSplit("com.falsepattern:chunkapi-mc1.7.10:0.7.0-alpha-01") + implementationSplit("com.falsepattern:chunkapi-mc1.7.10:0.6.4") // endregion // region maintained mods @@ -89,7 +86,7 @@ dependencies { // endregion // region unmaintained mods - + //AbyssalCraft 1.9.1.3-FINAL compileOnly(deobfCurse("abyssalcraft-53686:2311135")) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/thermos/NibbleArrayMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/thermos/NibbleArrayMixin.java index ea95b41..3be9db9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/thermos/NibbleArrayMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/thermos/NibbleArrayMixin.java @@ -35,9 +35,9 @@ import net.minecraft.world.chunk.NibbleArray; public class NibbleArrayMixin { @Shadow - public byte[] data; // Thermos renamed 'data' - @Shadow private int depthBits; // depthBits - @Shadow private int depthBitsPlusFour; // depthBitsPlusFour + public byte[] data; // Thermos renamed 'data' + @Shadow private int depthBits; // depthBits + @Shadow private int depthBitsPlusFour; // depthBitsPlusFour @SuppressWarnings("MixinAnnotationTarget") @Shadow private int length; @@ -45,21 +45,33 @@ public class NibbleArrayMixin { @Shadow private byte trivialByte; @SuppressWarnings("MixinAnnotationTarget") @Shadow private byte trivialValue; - - @SuppressWarnings("MixinAnnotationTarget") - @Inject( - method = "detectAndProcessTrivialArray", - at = @At( - value = "FIELD", - opcode = Opcodes.PUTFIELD, - target = "Lnet/minecraft/world/chunk/NibbleArray;data:[B", - shift = At.Shift.BEFORE - ), - cancellable = true) - private void logBeforeNull(CallbackInfo ci) { - ci.cancel(); - } + /** + * @author Cardinalstar16 + * @reason Thermos compat. + * Thermos thinks it's a good idea to nullify some nibble array members if they are a + * "Trivial array". Just disable this functionality if we detect thermos. + */ + @SuppressWarnings("MixinAnnotationTarget") + @Inject( + method = "detectAndProcessTrivialArray", + at = @At( + value = "FIELD", + opcode = Opcodes.PUTFIELD, + target = "Lnet/minecraft/world/chunk/NibbleArray;data:[B", + shift = At.Shift.BEFORE + ), + cancellable = true) + private void logBeforeNull(CallbackInfo ci) { + ci.cancel(); + } + + /** + * @author Cardinalstar16 + * @reason Thermos compat. + * Thermos thinks it's a good idea to nullify some nibble array members if they are a + * "Trivial array". Just disable this functionality if we detect thermos. + */ @Inject(method = "(II)V", at = @At("RETURN")) private void fixConstructor(int par1, int par2, CallbackInfo ci) { this.data = new byte[par1 >> 1]; 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 fe840b6..d8a02c7 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 @@ -35,6 +35,12 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage; @Mixin(ExtendedBlockStorage.class) public class ExtendedBlockStorageMixin { + /** + * @author Cardinalstar16 + * @reason Id Extension + * Thermos does this already, so I just moved this into a mixin that is only loaded if thermos + * is not enabled. + */ @Redirect(method = "removeInvalidBlocks", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;getBlockByExtId(III)Lnet/minecraft/block/Block;"),