diff --git a/core b/core index af82e4a6d..e8f79f8be 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit af82e4a6d4d612ca68c95f66508c1c27121e5868 +Subproject commit e8f79f8bec7365d768b3f9fb572de02f8522b90c diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDebugScreenOverlay.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDebugScreenOverlay.java new file mode 100644 index 000000000..f591f01cd --- /dev/null +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDebugScreenOverlay.java @@ -0,0 +1,24 @@ +package com.seibel.lod.fabric.mixins; + +import com.seibel.lod.core.render.F3Screen; +import net.minecraft.client.gui.components.DebugScreenOverlay; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.List; + +@Mixin(DebugScreenOverlay.class) +public class MixinDebugScreenOverlay { + + @Inject(method = "getSystemInformation", at = @At("RETURN")) + private void addCustomF3(CallbackInfoReturnable> cir) { + List messages = cir.getReturnValue(); + + for (String i: F3Screen.f3List) { + messages.add(i); + } + } + +} diff --git a/fabric/src/main/resources/fabric.lod.mixins.json b/fabric/src/main/resources/fabric.lod.mixins.json index 6cfe56a60..16d0e8d7c 100644 --- a/fabric/src/main/resources/fabric.lod.mixins.json +++ b/fabric/src/main/resources/fabric.lod.mixins.json @@ -13,6 +13,7 @@ "MixinWorldRenderer", "MixinFogRenderer", "MixinChunkGenerator", + "MixinDebugScreenOverlay", "events.MixinClientLevel", "events.MixinMinecraft", "events.MixinBlockUpdate", diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinDebugScreenOverlay.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinDebugScreenOverlay.java new file mode 100644 index 000000000..8f88926aa --- /dev/null +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinDebugScreenOverlay.java @@ -0,0 +1,24 @@ +package com.seibel.lod.forge.mixins; + +import com.seibel.lod.core.render.F3Screen; +import net.minecraft.client.gui.components.DebugScreenOverlay; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.List; + +@Mixin(DebugScreenOverlay.class) +public class MixinDebugScreenOverlay { + + @Inject(method = "getSystemInformation", at = @At("RETURN")) + private void addCustomF3(CallbackInfoReturnable> cir) { + List messages = cir.getReturnValue(); + + for (String i: F3Screen.f3List) { + messages.add(i); + } + } + +} diff --git a/forge/src/main/resources/lod.mixins.json b/forge/src/main/resources/lod.mixins.json index 589806557..56fb0e53c 100644 --- a/forge/src/main/resources/lod.mixins.json +++ b/forge/src/main/resources/lod.mixins.json @@ -11,7 +11,8 @@ "MixinFogRenderer", "MixinChunkGenerator", "MixinLightmap", - "MixinTFChunkGenerator" + "MixinTFChunkGenerator", + "MixinDebugScreenOverlay" ], "server": [] }