wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Worked more on immersive portals compatibility

Browse Source
This commit is contained in:
coolGi
2023-05-06 23:04:56 +09:30
parent 873187e210
commit b476da8ba4
1 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/imm_ptl_core/MixinImmersivePortalsGameRenderer.java
+38 -7
View File
@@ -1,13 +1,24 @@
package com.seibel.lod.fabric.mixins.mods.imm_ptl_core;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Vector3f;
import com.seibel.lod.common.wrappers.McObjectConverter;
import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
import com.seibel.lod.core.api.internal.ClientApi;
import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor;
import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Vec3f;
import com.seibel.lod.fabric.wrappers.modAccessor.ImmersivePortalsAccessor;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@@ -19,21 +30,41 @@ import java.util.function.Consumer;
@Mixin(MyGameRenderer.class)
public class MixinImmersivePortalsGameRenderer {
// @Unique
@Shadow public static Minecraft client;
// @Unique
// static ImmersivePortalsAccessor accessor = null;
@Inject(remap = false, method = "renderWorldNew", at = @At(value = "INVOKE", target = "Lqouteall/imm_ptl/core/render/MyGameRenderer;switchAndRenderTheWorld(Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Ljava/util/function/Consumer;IZ)V", shift = At.Shift.AFTER))
private static void injectDHLoDRendering(WorldRenderInfo worldRenderInfo, Consumer<Runnable> invokeWrapper, CallbackInfo ci) {
// TODO: Find a way to inject just before line 190 in the immersive portals code
// This current place that we are injecting into is not correct
@Inject(remap = false,
method = "switchAndRenderTheWorld",
at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V", shift = At.Shift.AFTER))
private static void injectDHLoDRendering(ClientLevel newWorld, Vec3 thisTickCameraPos, Vec3 lastTickCameraPos, Consumer<Runnable> invokeWrapper, int renderDistance, boolean doRenderHand, CallbackInfo ci) {
// TODO: Is there a better way to do this?
if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("sodium"))
return;
// TODO: Move this out of the function to not run it every frame
ImmersivePortalsAccessor accessor = null;
if (accessor == null) {
accessor = (ImmersivePortalsAccessor) ModAccessorInjector.INSTANCE.get(IImmersivePortalsAccessor.class);
}
// System.out.println(McObjectConverter.Convert(RenderSystem.getProjectionMatrix()).toString());
Mat4f modelViewMatrix = McObjectConverter.Convert(RenderSystem.getModelViewMatrix());
Mat4f projectionMatrix = McObjectConverter.Convert(client.gameRenderer.getProjectionMatrix(client.options.fov));
Vector3f vanillaLookVector = client.gameRenderer.getMainCamera().getLookVector();
// client.getCameraEntity()
// System.out.println(client.gameRenderer.getMainCamera().getLookVector());
ClientApi.INSTANCE.renderLods(
ClientLevelWrapper.getWrapper(worldRenderInfo.world),
McObjectConverter.Convert(RenderSystem.getProjectionMatrix()),
McObjectConverter.Convert(RenderSystem.getProjectionMatrix()),
ClientLevelWrapper.getWrapper(client.level),
modelViewMatrix,
projectionMatrix,
accessor.partialTicks
);
}
}
}