mirror of
https://github.com/GTMEGA/EndlessIDs.git
synced 2026-11-22 16:39:39 +00:00
Cleanup
This commit is contained in:
1 parent
3514f9098d
commit
0041f04d28
3 files changed
+37
-22
No files matched your search
+2
-5
@@ -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"))
|
||||
|
||||
|
||||
+29
-17
@@ -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 = "<init>(II)V", at = @At("RETURN"))
|
||||
private void fixConstructor(int par1, int par2, CallbackInfo ci) {
|
||||
this.data = new byte[par1 >> 1];
|
||||
|
||||
+6
@@ -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;"),
|
||||
|
||||
Reference in new issue
Block a user