diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialConfiguration.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialConfiguration.java index 034e697a5..53ea3f89e 100644 --- a/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialConfiguration.java +++ b/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialConfiguration.java @@ -186,15 +186,15 @@ public void render(PoseStack poseStack, int pMouseX, int pMouseY, float pPartial super.render(poseStack, pMouseX, pMouseY, pPartialTicks); if (this.visibleList == null) { - guiGraphics.drawCenteredString(this.minecraft.font, + drawCenteredString(poseStack, this.minecraft.font, Component.translatable("vivecraft.messages.radialmenubind.1"), this.width / 2, this.height - 50, 5635925); if (this.isShift) { - guiGraphics.drawCenteredString(this.minecraft.font, + drawCenteredString(poseStack, this.minecraft.font, Component.translatable("vivecraft.messages.radialmenubind.2"), this.width / 2, this.height - 36, 13777015); - guiGraphics.drawCenteredString(this.minecraft.font, + drawCenteredString(poseStack, this.minecraft.font, Component.translatable("vivecraft.messages.radialmenubind.3"), this.width / 2, this.height - 22, 13777015); } diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialItemsList.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialItemsList.java index 839355ea3..143b204fd 100644 --- a/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialItemsList.java +++ b/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialItemsList.java @@ -50,10 +50,10 @@ public CategoryEntry(String name) { } public void render( - GuiGraphics guiGraphics, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, + PoseStack poseStack, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks) { - guiGraphics.drawString(minecraft.font, this.labelText, (minecraft.screen.width / 2 - this.labelWidth / 2), + minecraft.font.draw(poseStack, this.labelText, (minecraft.screen.width / 2 - this.labelWidth / 2), (pTop + pHeight - 9 - 1), 6777215); } } @@ -68,7 +68,7 @@ private MappingEntry(KeyMapping key, GuiRadialConfiguration parent) { } public void render( - GuiGraphics guiGraphics, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, + PoseStack poseStack, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks) { ChatFormatting chatformatting = ChatFormatting.WHITE; @@ -77,7 +77,7 @@ public void render( chatformatting = ChatFormatting.GREEN; } - guiGraphics.drawString(minecraft.font, chatformatting + I18n.get(this.myKey.getName()), + minecraft.font.draw(poseStack, chatformatting + I18n.get(this.myKey.getName()), (minecraft.screen.width / 2 - maxListLabelWidth / 2), (pTop + pHeight / 2 - 9 / 2), 16777215); } diff --git a/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java b/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java index a8ad28f01..746733ffc 100644 --- a/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java +++ b/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java @@ -225,7 +225,7 @@ public static void drawScreen(float f, Screen screen, PoseStack poseStack) { PoseStack posestack = RenderSystem.getModelViewStack(); posestack.pushPose(); posestack.setIdentity(); - posestack.translate(0.0D, 0.0D, -11000.0D); + posestack.translate(0.0D, 0.0D, -2000.0D); RenderSystem.applyModelViewMatrix(); RenderSystem.blendFuncSeparate( diff --git a/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java b/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java index 8d87383b3..46c19197f 100644 --- a/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java +++ b/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java @@ -417,7 +417,7 @@ public abstract class MinecraftVRMixin implements MinecraftExtension { PoseStack poseStack = RenderSystem.getModelViewStack(); poseStack.pushPose(); poseStack.setIdentity(); - poseStack.translate(0.0f, 0.0f, -11000.0f); + poseStack.translate(0.0f, 0.0f, -2000.0f); RenderSystem.applyModelViewMatrix(); int x = (int) (Minecraft.getInstance().mouseHandler.xpos() * (double) Minecraft.getInstance().getWindow().getGuiScaledWidth() / (double) Minecraft.getInstance().getWindow().getScreenWidth()); diff --git a/stubs/src/main/java/net/irisshaders/iris/uniforms/CapturedRenderingState.java b/stubs/src/main/java/net/irisshaders/iris/uniforms/CapturedRenderingState.java new file mode 100644 index 000000000..5c6d23b45 --- /dev/null +++ b/stubs/src/main/java/net/irisshaders/iris/uniforms/CapturedRenderingState.java @@ -0,0 +1,10 @@ +package net.irisshaders.iris.uniforms; + +import org.joml.Matrix4f; + +public class CapturedRenderingState { + public static final CapturedRenderingState INSTANCE = new CapturedRenderingState(); + public Matrix4f getGbufferProjection() { + return null; + } +}