Merge remote-tracking branch 'vivecraft/Multiloader-1.20' into 1.20

# Conflicts:
#	common/src/main/java/org/vivecraft/client/utils/UpdateChecker.java

common/src/main/java/org/vivecraft/client/Xplat.java

@@ -27,6 +27,18 @@ public interface Xplat {
      * <a href="https://plugins.jetbrains.com/plugin/16210-architectury">You should also get the IntelliJ plugin to help with @ExpectPlatform.</a>
      */
 
+    enum ModLoader{
+        FABRIC("fabric"),
+        FORGE("forge"),
+        NEOFORGE("neoforge");
+
+        public final String name;
+
+        ModLoader(String name) {
+            this.name = name;
+        }
+    }
+
     @ExpectPlatform
     static boolean isModLoaded(String name) {
         return false;
@@ -43,8 +55,8 @@ static boolean isDedicatedServer() {
     }
 
     @ExpectPlatform
-    static String getModloader() {
-        return "";
+    static ModLoader getModloader() {
+        throw new AssertionError();
     }
 
     @ExpectPlatform

common/src/main/java/org/vivecraft/client/gui/settings/GuiRoomscaleSettings.java

@@ -15,7 +15,9 @@ public class GuiRoomscaleSettings extends GuiVROptionsBase {
         VRSettings.VrOptions.BOW_MODE,
         VRSettings.VrOptions.BACKPACK_SWITCH,
         VRSettings.VrOptions.ALLOW_CRAWLING,
-        VRSettings.VrOptions.REALISTIC_DISMOUNT
+        VRSettings.VrOptions.REALISTIC_DISMOUNT,
+        VRSettings.VrOptions.REALISTIC_BLOCK_INTERACT,
+        VRSettings.VrOptions.REALISTIC_ENTITY_INTERACT
     };
 
     public GuiRoomscaleSettings(Screen guiScreen) {

common/src/main/java/org/vivecraft/client/gui/settings/GuiSeatedOptions.java

@@ -14,7 +14,7 @@ public class GuiSeatedOptions extends GuiVROptionsBase {
         new VROptionEntry(VRSettings.VrOptions.WALK_UP_BLOCKS),
         new VROptionEntry(VRSettings.VrOptions.WORLD_ROTATION_INCREMENT),
         new VROptionEntry(VRSettings.VrOptions.VEHICLE_ROTATION),
-        new VROptionEntry(VRSettings.VrOptions.DUMMY),
+        new VROptionEntry(VRSettings.VrOptions.REVERSE_HANDS),
         new VROptionEntry(VRSettings.VrOptions.SEATED_FREE_MOVE, true),
         new VROptionEntry(VRSettings.VrOptions.RIGHT_CLICK_DELAY, false),
         new VROptionEntry("vivecraft.options.screen.teleport.button", (button, mousePos) -> {

common/src/main/java/org/vivecraft/client/render/HMDLayer.java

@@ -24,7 +24,7 @@ public HMDLayer(RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClie
 
     @Override
     public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, int i, AbstractClientPlayer entity, float f, float g, float h, float j, float k, float l) {
-        if (this.getParentModel() instanceof VRPlayerModel<?> vrPlayerModel) {
+        if (this.getParentModel().head.visible && this.getParentModel() instanceof VRPlayerModel<?> vrPlayerModel) {
             VRPlayersClient.RotInfo rotinfo = VRPlayersClient.getInstance().getRotationsForPlayer(entity.getUUID());
             ResourceLocation hmd;
             switch (rotinfo.hmd) {

common/src/main/java/org/vivecraft/client/render/VRPlayerRenderer.java

@@ -7,6 +7,7 @@
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
 import net.minecraft.world.phys.Vec3;
 import org.vivecraft.client.VRPlayersClient;
@@ -34,6 +35,10 @@ public VRPlayerRenderer(EntityRendererProvider.Context context, boolean slim, bo
         this.addLayer(new HMDLayer(this));
     }
 
+    public boolean hasLayerType(RenderLayer<?,?> renderLayer) {
+        return this.layers.stream().anyMatch(layer -> layer.getClass() == renderLayer.getClass());
+    }
+
     @Override
     public void render(AbstractClientPlayer entityIn, float pEntityYaw, float pPartialTicks, PoseStack matrixStackIn, MultiBufferSource pBuffer, int pPackedLight) {
 

common/src/main/java/org/vivecraft/client_vr/VRState.java

@@ -19,6 +19,7 @@
 import org.vivecraft.mod_compat_vr.ShadersHelper;
 import org.vivecraft.mod_compat_vr.optifine.OptifineHelper;
 
+import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryManagerMXBean;
 
@@ -44,7 +45,14 @@ public static void initializeVR() {
                 // TODO: move this into the init, does mean all callocs need to be done later
                 // check that the right lwjgl version is loaded that we ship the openvr part of
                 if (!Version.getVersion().startsWith("3.3.1")) {
-                    throw new RenderConfigException("VR Init Error", Component.translatable("vivecraft.messages.rendersetupfailed", I18n.get("vivecraft.messages.invalidlwjgl", Version.getVersion(), "3.3.1"), "OpenVR_LWJGL"));
+                    String suppliedJar = "";
+                    try {
+                        suppliedJar = new File(Version.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getName();
+                    } catch (Exception e) {
+                        VRSettings.logger.error("couldn't check lwjgl source:", e);
+                    }
+
+                    throw new RenderConfigException("VR Init Error", Component.translatable("vivecraft.messages.rendersetupfailed", I18n.get("vivecraft.messages.invalidlwjgl", Version.getVersion(), "3.3.1", suppliedJar), "OpenVR_LWJGL"));
                 }
 
                 dh.vr = new MCOpenVR(Minecraft.getInstance(), dh);
@@ -113,6 +121,7 @@ public static void initializeVR() {
         } catch (RenderConfigException renderConfigException) {
             vrEnabled = false;
             destroyVR(true);
+            renderConfigException.printStackTrace();
             Minecraft.getInstance().setScreen(new ErrorScreen(renderConfigException.title, renderConfigException.error));
         } catch (Throwable e) {
             vrEnabled = false;

common/src/main/java/org/vivecraft/client_vr/extensions/MinecraftExtension.java

@@ -3,4 +3,5 @@
 public interface MinecraftExtension {
 
     void vivecraft$notifyMirror(String buttonDisplayString, boolean b, int i);
+    void vivecraft$drawProfiler();
 }

common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/InteractTracker.java

@@ -186,7 +186,7 @@ public void doProcess(LocalPlayer player) {
                     }
                 }
 
-                if (!this.active[j]) {
+                if (this.dh.vrSettings.realisticEntityInteractEnabled && !this.active[j]) {
                     int k = Mth.floor(vec3.x);
                     int l = Mth.floor(vec3.y);
                     int i = Mth.floor(vec3.z);
@@ -204,7 +204,7 @@ public void doProcess(LocalPlayer player) {
                     }
                 }
 
-                if (!this.active[j]) {
+                if (this.dh.vrSettings.realisticBlockInteractEnabled && !this.active[j]) {
                     BlockPos blockpos = null;
                     blockpos = BlockPos.containing(vec3);
                     BlockState blockstate = this.mc.level.getBlockState(blockpos);

common/src/main/java/org/vivecraft/client_vr/provider/nullvr/NullVR.java

@@ -95,11 +95,11 @@ public void poll(long frameIndex) {
 
             this.updateAim();
 
-            this.controllerPose[0].M[0][3] = 0.3F;
+            this.controllerPose[0].M[0][3] = this.dh.vrSettings.reverseHands ? -0.3F : 0.3F;
             this.controllerPose[0].M[1][3] = 1.2F;
             this.controllerPose[0].M[2][3] = -0.5F;
 
-            this.controllerPose[1].M[0][3] = -0.3F;
+            this.controllerPose[1].M[0][3] =  this.dh.vrSettings.reverseHands ? 0.3F : -0.3F;
             this.controllerPose[1].M[1][3] = 1.2F;
             this.controllerPose[1].M[2][3] = -0.5F;
 

common/src/main/java/org/vivecraft/client_vr/render/VivecraftItemRendering.java

@@ -233,7 +233,7 @@ public static void applyFirstPersonItemTransforms(PoseStack pMatrixStack, Vivecr
                 rotation.mul(Axis.XP.rotationDegrees(-45.0F));
                 rotation.mul(Axis.XP.rotationDegrees((float) gunAngle));
             } else if (rendertype == VivecraftItemTransformType.Shield) {
-                boolean reverse = dh.vrSettings.reverseHands && !dh.vrSettings.seated;
+                boolean reverse = dh.vrSettings.reverseHands;
                 if (reverse) {
                     k *= -1;
                 }

common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java

@@ -83,23 +83,25 @@ public static Vec3 getControllerRenderPos(int c) {
             return dataHolder.vrPlayer.vrdata_world_render.getController(c).getPosition();
         } else {
             Vec3 out = null;
+            int mainHand = InteractionHand.MAIN_HAND.ordinal();
+            if (dataHolder.vrSettings.reverseHands) {
+                c = 1 - c;
+                mainHand = InteractionHand.OFF_HAND.ordinal();
+            }
 
             if (mc.getCameraEntity() != null && mc.level != null) {
                 Vec3 dir = dataHolder.vrPlayer.vrdata_world_render.hmd.getDirection();
                 dir = dir.yRot((float) Math.toRadians(c == 0 ? -35.0D : 35.0D));
                 dir = new Vec3(dir.x, 0.0D, dir.z);
                 dir = dir.normalize();
-                if (TelescopeTracker.isTelescope(mc.player.getUseItem())) {
-                    if (c == 0 && mc.player.getUsedItemHand() == InteractionHand.MAIN_HAND) {
-                        out = dataHolder.vrPlayer.vrdata_world_render.eye0.getPosition()
-                            .add(dataHolder.vrPlayer.vrdata_world_render.hmd.getDirection()
-                                .scale(0.2 * dataHolder.vrPlayer.vrdata_world_render.worldScale));
-                    }
-                    if (c == 1 && mc.player.getUsedItemHand() == InteractionHand.OFF_HAND) {
-                        out = dataHolder.vrPlayer.vrdata_world_render.eye1.getPosition()
-                            .add(dataHolder.vrPlayer.vrdata_world_render.hmd.getDirection()
-                                .scale(0.2 * dataHolder.vrPlayer.vrdata_world_render.worldScale));
-                    }
+                if (TelescopeTracker.isTelescope(mc.player.getUseItem()) && TelescopeTracker.isTelescope(c == mainHand ? mc.player.getMainHandItem() : mc.player.getOffhandItem())) {
+                    // move the controller in front of the eye when using the spyglass
+                    VRData.VRDevicePose eye = c == 0 ? dataHolder.vrPlayer.vrdata_world_render.eye0 :
+                                              dataHolder.vrPlayer.vrdata_world_render.eye1;
+
+                    out = eye.getPosition()
+                        .add(dataHolder.vrPlayer.vrdata_world_render.hmd.getDirection()
+                            .scale(0.2 * dataHolder.vrPlayer.vrdata_world_render.worldScale));
                 }
                 if (out == null) {
                     out = dataHolder.vrPlayer.vrdata_world_render.getEye(RenderPass.CENTER).getPosition().add(
@@ -125,11 +127,11 @@ public static void setupRenderingAtController(int controller, PoseStack matrix)
             getSmoothCameraPosition(dataHolder.currentPass, dataHolder.vrPlayer.getVRDataWorld()));
         matrix.translate(aimSource.x, aimSource.y, aimSource.z);
         float sc = dataHolder.vrPlayer.vrdata_world_render.worldScale;
-        if (mc.level != null && TelescopeTracker.isTelescope(mc.player.getUseItem())) {
+        if (dataHolder.vrSettings.seated && mc.level != null && TelescopeTracker.isTelescope(mc.player.getUseItem()) && TelescopeTracker.isTelescope(controller == 0 ? mc.player.getMainHandItem() : mc.player.getOffhandItem())) {
             matrix.mulPoseMatrix(dataHolder.vrPlayer.vrdata_world_render.hmd.getMatrix().inverted()
                 .transposed().toMCMatrix());
             MethodHolder.rotateDegXp(matrix, 90);
-            matrix.translate(controller == 0 ? 0.075 * sc : -0.075 * sc, -0.025 * sc, 0.0325 * sc);
+            matrix.translate(controller == (dataHolder.vrSettings.reverseHands ? 1 : 0) ? 0.075 * sc : -0.075 * sc, -0.025 * sc, 0.0325 * sc);
         } else {
             matrix.mulPoseMatrix(dataHolder.vrPlayer.vrdata_world_render.getController(controller)
                 .getMatrix().inverted().transposed().toMCMatrix());
@@ -229,6 +231,12 @@ public static void drawScreen(float f, Screen screen, GuiGraphics guiGraphics) {
         posestack.translate(0.0D, 0.0D, -11000.0D);
         RenderSystem.applyModelViewMatrix();
 
+        Matrix4f guiProjection = (new Matrix4f()).setOrtho(
+            0.0F, (float) (mc.getWindow().getWidth() / mc.getWindow().getGuiScale()),
+                (float) (mc.getWindow().getHeight() / mc.getWindow().getGuiScale()), 0.0F,
+                1000.0F, 21000.0F);
+        RenderSystem.setProjectionMatrix(guiProjection, VertexSorting.ORTHOGRAPHIC_Z);
+
         RenderSystem.blendFuncSeparate(
             GlStateManager.SourceFactor.SRC_ALPHA,
             GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA,

common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java

@@ -4,22 +4,34 @@
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.shaders.ProgramManager;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Blocks;
 import org.lwjgl.opengl.GL13C;
 import org.vivecraft.client.Xplat;
 import org.vivecraft.client.extensions.RenderTargetExtension;
+import org.vivecraft.client.utils.Utils;
 import org.vivecraft.client_vr.ClientDataHolderVR;
 import org.vivecraft.client_vr.extensions.GameRendererExtension;
+import org.vivecraft.client_vr.extensions.GuiExtension;
+import org.vivecraft.client_vr.extensions.MinecraftExtension;
+import org.vivecraft.client_vr.gameplay.screenhandlers.KeyboardHandler;
+import org.vivecraft.client_vr.gameplay.screenhandlers.RadialHandler;
+import org.vivecraft.client_vr.render.RenderConfigException;
 import org.vivecraft.client_vr.render.RenderPass;
 import org.vivecraft.client_vr.render.VRShaders;
 import org.vivecraft.client_vr.settings.VRSettings;
+import org.vivecraft.client_xr.render_pass.RenderPassManager;
+import org.vivecraft.client_xr.render_pass.WorldRenderPass;
 import org.vivecraft.mod_compat_vr.iris.IrisHelper;
 import org.vivecraft.mod_compat_vr.optifine.OptifineHelper;
 
+import java.util.List;
+
 public class VRPassHelper {
 
     private static final Minecraft mc = Minecraft.getInstance();
@@ -222,6 +234,136 @@ public static void renderSingleView(RenderPass eye, float partialTicks, long nan
         }
     }
 
+    public static void renderAndSubmit(boolean renderLevel, long nanoTime, float actualPartialTicks) {
+        // still rendering
+        mc.getProfiler().push("gameRenderer");
+
+        mc.getProfiler().push("VR guis");
+
+        // some mods mess with the depth mask?
+        RenderSystem.depthMask(true);
+
+        mc.getProfiler().push("gui cursor");
+        // draw cursor on Gui Layer
+        if (mc.screen != null || !mc.mouseHandler.isMouseGrabbed()) {
+            PoseStack poseStack = RenderSystem.getModelViewStack();
+            poseStack.pushPose();
+            poseStack.setIdentity();
+            poseStack.translate(0.0f, 0.0f, -11000.0f);
+            RenderSystem.applyModelViewMatrix();
+
+            int x = (int) (Minecraft.getInstance().mouseHandler.xpos() * (double) Minecraft.getInstance().getWindow().getGuiScaledWidth() / (double) Minecraft.getInstance().getWindow().getScreenWidth());
+            int y = (int) (Minecraft.getInstance().mouseHandler.ypos() * (double) Minecraft.getInstance().getWindow().getGuiScaledHeight() / (double) Minecraft.getInstance().getWindow().getScreenHeight());
+            ((GuiExtension) mc.gui).vivecraft$drawMouseMenuQuad(x, y);
+
+            poseStack.popPose();
+            RenderSystem.applyModelViewMatrix();
+        }
+
+        mc.getProfiler().popPush("fps pie");
+        // draw debug pie
+        ((MinecraftExtension) mc).vivecraft$drawProfiler();
+
+        // pop pose that we pushed before the gui
+        RenderSystem.getModelViewStack().popPose();
+        RenderSystem.applyModelViewMatrix();
+
+        // generate mipmaps
+        // TODO: does this do anything?
+        mc.mainRenderTarget.bindRead();
+        ((RenderTargetExtension) mc.mainRenderTarget).vivecraft$genMipMaps();
+        mc.mainRenderTarget.unbindRead();
+
+        mc.getProfiler().popPush("2D Keyboard");
+        GuiGraphics guiGraphics = new GuiGraphics(mc, mc.renderBuffers().bufferSource());
+        if (KeyboardHandler.Showing && !dataHolder.vrSettings.physicalKeyboard) {
+            mc.mainRenderTarget = KeyboardHandler.Framebuffer;
+            mc.mainRenderTarget.clear(Minecraft.ON_OSX);
+            mc.mainRenderTarget.bindWrite(true);
+            RenderHelper.drawScreen(actualPartialTicks, KeyboardHandler.UI, guiGraphics);
+            guiGraphics.flush();
+        }
+
+        mc.getProfiler().popPush("Radial Menu");
+        if (RadialHandler.isShowing()) {
+            mc.mainRenderTarget = RadialHandler.Framebuffer;
+            mc.mainRenderTarget.clear(Minecraft.ON_OSX);
+            mc.mainRenderTarget.bindWrite(true);
+            RenderHelper.drawScreen(actualPartialTicks, RadialHandler.UI, guiGraphics);
+            guiGraphics.flush();
+        }
+        mc.getProfiler().pop();
+        checkGLError("post 2d ");
+
+        // done with guis
+        mc.getProfiler().pop();
+
+        // render the different vr passes
+        List<RenderPass> list = dataHolder.vrRenderer.getRenderPasses();
+        dataHolder.isFirstPass = true;
+        for (RenderPass renderpass : list) {
+            dataHolder.currentPass = renderpass;
+
+            switch (renderpass) {
+                case LEFT, RIGHT -> RenderPassManager.setWorldRenderPass(WorldRenderPass.stereoXR);
+                case CENTER -> RenderPassManager.setWorldRenderPass(WorldRenderPass.center);
+                case THIRD -> RenderPassManager.setWorldRenderPass(WorldRenderPass.mixedReality);
+                case SCOPEL -> RenderPassManager.setWorldRenderPass(WorldRenderPass.leftTelescope);
+                case SCOPER -> RenderPassManager.setWorldRenderPass(WorldRenderPass.rightTelescope);
+                case CAMERA -> RenderPassManager.setWorldRenderPass(WorldRenderPass.camera);
+            }
+
+            mc.getProfiler().push("Eye:" + dataHolder.currentPass);
+            mc.getProfiler().push("setup");
+            mc.mainRenderTarget.bindWrite(true);
+            mc.getProfiler().pop();
+            VRPassHelper.renderSingleView(renderpass, actualPartialTicks, nanoTime, renderLevel);
+            mc.getProfiler().pop();
+
+            if (dataHolder.grabScreenShot) {
+                boolean flag;
+
+                if (list.contains(RenderPass.CAMERA)) {
+                    flag = renderpass == RenderPass.CAMERA;
+                } else if (list.contains(RenderPass.CENTER)) {
+                    flag = renderpass == RenderPass.CENTER;
+                } else {
+                    flag = dataHolder.vrSettings.displayMirrorLeftEye ?
+                           renderpass == RenderPass.LEFT :
+                           renderpass == RenderPass.RIGHT;
+                }
+
+                if (flag) {
+                    RenderTarget rendertarget = mc.mainRenderTarget;
+
+                    if (renderpass == RenderPass.CAMERA) {
+                        rendertarget = dataHolder.vrRenderer.cameraFramebuffer;
+                    }
+
+                    mc.mainRenderTarget.unbindWrite();
+                    Utils.takeScreenshot(rendertarget);
+                    mc.getWindow().updateDisplay();
+                    dataHolder.grabScreenShot = false;
+                }
+            }
+
+            dataHolder.isFirstPass = false;
+        }
+        // now we are done with rendering
+        mc.getProfiler().pop();
+
+        dataHolder.vrPlayer.postRender(actualPartialTicks);
+        mc.getProfiler().push("Display/Reproject");
+
+        try {
+            dataHolder.vrRenderer.endFrame();
+        } catch (RenderConfigException exception) {
+            VRSettings.logger.error(exception.toString());
+        }
+        mc.getProfiler().pop();
+        checkGLError("post submit ");
+    }
+
     private static void checkGLError(String string) {
         int i = GlStateManager._getError();
         if (i != 0) {