Skip to content

Commit 2307585

Browse files
committed
integrate with the gtnhlib api
1 parent bcdea82 commit 2307585

4 files changed

Lines changed: 20 additions & 3 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dependencies {
7575

7676
compileOnly(deobf("optifine:optifine:1.7.10_hd_u_e7"))
7777

78-
compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.19:dev")
78+
compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.20:api")
7979

8080
implementation("org.joml:joml:1.10.5")
8181
implementation("it.unimi.dsi:fastutil:8.5.13")

src/main/java/com/falsepattern/falsetweaks/FalseTweaks.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
guiFactory = Tags.ROOT_PKG + ".config.FalseTweaksGuiFactory",
4343
acceptableRemoteVersions = "*",
4444
dependencies = "required-after:falsepatternlib@[1.4.2,);" +
45-
"after:neodymium@[0.3.2,);"
45+
"after:neodymium@[0.3.2,);" +
46+
"after:gtnhlib@[0.5.20,);"
4647
)
4748
public class FalseTweaks {
4849

src/main/java/com/falsepattern/falsetweaks/modules/threadedupdates/ThreadedChunkUpdateHelper.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.falsepattern.falsetweaks.modules.threadexec.ThreadedTask;
3434
import com.falsepattern.falsetweaks.modules.triangulator.ToggleableTessellatorManager;
3535
import com.google.common.base.Preconditions;
36+
import com.gtnewhorizon.gtnhlib.api.CapturingTesselator;
3637
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
3738
import cpw.mods.fml.client.event.ConfigChangedEvent;
3839
import cpw.mods.fml.common.FMLCommonHandler;
@@ -516,6 +517,16 @@ public Tessellator getThreadTessellator() {
516517
}
517518
}
518519

520+
public static class GTNHLibCompat extends ThreadedChunkUpdateHelper {
521+
@Override
522+
public Tessellator getThreadTessellator() {
523+
if (CapturingTesselator.isCapturing()) {
524+
return CapturingTesselator.getThreadTesselator();
525+
}
526+
return super.getThreadTessellator();
527+
}
528+
}
529+
519530
@RequiredArgsConstructor
520531
private static class PendingTaskUpdate {
521532
public final List<WorldRenderer> tasks;

src/main/java/com/falsepattern/falsetweaks/proxy/ClientProxy.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.falsepattern.falsetweaks.modules.triangulator.calibration.Calibration;
4040
import com.falsepattern.falsetweaks.modules.voxelizer.loading.LayerMetadataSection;
4141
import com.falsepattern.falsetweaks.modules.voxelizer.loading.LayerMetadataSerializer;
42+
import cpw.mods.fml.common.Loader;
4243
import lombok.val;
4344

4445
import net.minecraft.client.Minecraft;
@@ -104,7 +105,11 @@ public String call() {
104105
public void init(FMLInitializationEvent e) {
105106
super.init(e);
106107
if (ModuleConfig.THREADED_CHUNK_UPDATES()) {
107-
ThreadedChunkUpdateHelper.instance = new ThreadedChunkUpdateHelper();
108+
if (Loader.isModLoaded("gtnhlib")) {
109+
ThreadedChunkUpdateHelper.instance = new ThreadedChunkUpdateHelper.GTNHLibCompat();
110+
} else {
111+
ThreadedChunkUpdateHelper.instance = new ThreadedChunkUpdateHelper();
112+
}
108113
ThreadedChunkUpdateHelper.instance.init();
109114
}
110115
}

0 commit comments

Comments
 (0)