1.18.2 fixes

Vivecraft · Feb 19, 2025 · cbe2b8c · cbe2b8c
1 parent b595f55
commit cbe2b8c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/common/src/main/java/org/vivecraft/client_vr/VRState.java b/common/src/main/java/org/vivecraft/client_vr/VRState.java
@@ -2,7 +2,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import org.apache.commons.lang3.StringUtils;
 import org.vivecraft.client.Xplat;
 import org.vivecraft.client.gui.screens.ErrorScreen;
@@ -118,7 +118,7 @@ public static void initializeVR() {
             if (exception instanceof RenderConfigException renderConfigException) {
                 setScreenAndCache(new ErrorScreen(renderConfigException.title, renderConfigException.error));
             } else {
-                setScreenAndCache(new ErrorScreen(Component.translatable("vivecraft.messages.vriniterror"),
+                setScreenAndCache(new ErrorScreen(new TranslatableComponent("vivecraft.messages.vriniterror"),
                     TextUtils.throwableToComponent(exception)));
             }
         }

diff --git a/common/src/main/java/org/vivecraft/client_vr/menuworlds/MenuWorldRenderer.java b/common/src/main/java/org/vivecraft/client_vr/menuworlds/MenuWorldRenderer.java
@@ -32,7 +32,6 @@
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;

diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/MCVR.java b/common/src/main/java/org/vivecraft/client_vr/provider/MCVR.java
@@ -1094,8 +1094,8 @@ public void processBindings() {
         // Walk up blocks
         if (MOD.keyToggleWalkUpBlocks.consumeClick()) {
             this.dh.vrSettings.walkUpBlocks = !this.dh.vrSettings.walkUpBlocks;
-            this.mc.gui.getChat().addMessage(Component.translatable("vivecraft.messages.walkupblocks",
-                Component.translatable(this.dh.vrSettings.walkUpBlocks ? LangHelper.ON_KEY : LangHelper.OFF_KEY)));
+            this.mc.gui.getChat().addMessage(new TranslatableComponent("vivecraft.messages.walkupblocks",
+                new TranslatableComponent(this.dh.vrSettings.walkUpBlocks ? LangHelper.ON_KEY : LangHelper.OFF_KEY)));
         }
 
         GuiHandler.processBindingsGui();

diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java b/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java
@@ -82,10 +82,12 @@ protected Matrix4f getProjectionMatrix(int eyeType, float nearClip, float farCli
         try (MemoryStack stack = MemoryStack.stackPush()) {
             if (eyeType == VR.EVREye_Eye_Left) {
                 return OpenVRUtil.Matrix4fFromOpenVR(
-                    VRSystem_GetProjectionMatrix(VR.EVREye_Eye_Left, nearClip, farClip, HmdMatrix44.callocStack(stack)));
+                    VRSystem_GetProjectionMatrix(VR.EVREye_Eye_Left, nearClip, farClip,
+                        HmdMatrix44.callocStack(stack)));
             } else {
                 return OpenVRUtil.Matrix4fFromOpenVR(
-                    VRSystem_GetProjectionMatrix(VR.EVREye_Eye_Right, nearClip, farClip, HmdMatrix44.callocStack(stack)));
+                    VRSystem_GetProjectionMatrix(VR.EVREye_Eye_Right, nearClip, farClip,
+                        HmdMatrix44.callocStack(stack)));
             }
         }
     }

diff --git a/forge/src/main/java/org/vivecraft/forge/event/ClientEvents.java b/forge/src/main/java/org/vivecraft/forge/event/ClientEvents.java
@@ -3,8 +3,8 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.ConfigGuiHandler;
 import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.model.ForgeModelBakery;
 import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
+import net.minecraftforge.client.model.ForgeModelBakery;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;