Merge remote-tracking branch 'remotes/origin/Multiloader-1.19' into Multiloader-1.18

fayer3 · fayer3 · commit 5d76e13ffff3 · 2024-10-21T14:30:05.000+02:00
diff --git a/common/build.gradle b/common/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     compileOnly('com.electronwill.night-config:toml:3.6.6')
 
     //LaunchPopup
-    implementation 'com.github.fayer3:LaunchPopup:master-SNAPSHOT'
+    implementation 'com.github.Vivecraft:LaunchPopup:master-SNAPSHOT'
 }
 // extract the LaunchPopup classes
 jar {
diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiVRControls.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiVRControls.java
@@ -14,11 +14,11 @@ public class GuiVRControls extends GuiVROptionsBase {
         new VROptionEntry(VRSettings.VrOptions.DUMMY, true),
         new VROptionEntry(VRSettings.VrOptions.DUMMY, true),
         new VROptionEntry(VRSettings.VrOptions.DUMMY, true),
-        new VROptionEntry(VRSettings.VrOptions.DUMMY),
-        new VROptionEntry(VRSettings.VrOptions.INGAME_BINDINGS_IN_GUI),
         new VROptionEntry(VRSettings.VrOptions.REVERSE_HANDS),
-        new VROptionEntry(VRSettings.VrOptions.RIGHT_CLICK_DELAY),
+        new VROptionEntry(VRSettings.VrOptions.INGAME_BINDINGS_IN_GUI),
         new VROptionEntry(VRSettings.VrOptions.ALLOW_ADVANCED_BINDINGS),
+        new VROptionEntry(VRSettings.VrOptions.RIGHT_CLICK_DELAY),
+        new VROptionEntry(VRSettings.VrOptions.THIRDPERSON_ITEMTRANSFORMS_CUSTOM),
         new VROptionEntry(VRSettings.VrOptions.THIRDPERSON_ITEMTRANSFORMS)
     };
 
diff --git a/common/src/main/java/org/vivecraft/client/network/ClientNetworking.java b/common/src/main/java/org/vivecraft/client/network/ClientNetworking.java
@@ -185,6 +185,10 @@ public static boolean isThirdPersonItems() {
         return ClientDataHolderVR.getInstance().vrSettings.overrides.getSetting(VRSettings.VrOptions.THIRDPERSON_ITEMTRANSFORMS).getBoolean();
     }
 
+    public static boolean isThirdPersonItemsCustom() {
+        return ClientDataHolderVR.getInstance().vrSettings.overrides.getSetting(VRSettings.VrOptions.THIRDPERSON_ITEMTRANSFORMS_CUSTOM).getBoolean();
+    }
+
     public static boolean isLimitedSurvivalTeleport() {
         return ClientDataHolderVR.getInstance().vrSettings.overrides.getSetting(VRSettings.VrOptions.LIMIT_TELEPORT).getBoolean();
     }
diff --git a/common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/BowTracker.java b/common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/BowTracker.java
@@ -103,6 +103,7 @@ public boolean isCharged() {
 
     public void reset(LocalPlayer player) {
         this.isDrawing = false;
+        this.canDraw = false;
     }
 
     public EntryPoint getEntryPoint() {
diff --git a/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java
@@ -222,6 +222,8 @@ public enum UpdateType implements OptionEnum<UpdateType> {
     public boolean ingameBindingsInGui = false;
     @SettingField(VrOptions.THIRDPERSON_ITEMTRANSFORMS)
     public boolean thirdPersonItems = false;
+    @SettingField(VrOptions.THIRDPERSON_ITEMTRANSFORMS_CUSTOM)
+    public boolean thirdPersonItemsCustom = true;
     //
 
     //Locomotion
@@ -1702,6 +1704,7 @@ String getDisplayString(String prefix, Object value) {
         AUTO_SPRINT(false, true), // Auto-sprint
         AUTO_SPRINT_THRESHOLD(true, false, 0.5f, 1f, 0.01f, 2), // Auto-sprint Threshold
         THIRDPERSON_ITEMTRANSFORMS(false, true), // 3rd person items
+        THIRDPERSON_ITEMTRANSFORMS_CUSTOM(false, true), // 3rd person items, for items with custom model data
         BOW_MODE(false, true) { // Roomscale Bow Mode
 
             @Override
@@ -2186,6 +2189,7 @@ private ServerOverrides() {
             registerSetting(VrOptions.TELEPORT_HORIZ_LIMIT, "teleportLimitHoriz", () -> vrTeleportHorizLimit);
             registerSetting(VrOptions.WORLD_SCALE, "worldScale", () -> worldScale);
             registerSetting(VrOptions.THIRDPERSON_ITEMTRANSFORMS, "thirdPersonItems", () -> thirdPersonItems);
+            registerSetting(VrOptions.THIRDPERSON_ITEMTRANSFORMS_CUSTOM, "thirdPersonItemsCustom", () -> thirdPersonItemsCustom);
         }
 
         private void registerSetting(VrOptions option, String networkName, Supplier<Object> originalValue) {
diff --git a/common/src/main/java/org/vivecraft/mixin/client/blaze3d/RenderTargetMixin.java b/common/src/main/java/org/vivecraft/mixin/client/blaze3d/RenderTargetMixin.java
@@ -18,8 +18,6 @@
 import org.vivecraft.client_vr.settings.VRSettings;
 import org.vivecraft.client_xr.render_pass.RenderPassType;
 
-import java.util.Arrays;
-
 @Mixin(RenderTarget.class)
 public abstract class RenderTargetMixin implements RenderTargetExtension {
 
@@ -121,11 +119,11 @@ public String toString() {
         if (RenderPassType.isWorldOnly()) {
             if (!this.vivecraft$loggedSizeError && (this.width != Minecraft.getInstance().getMainRenderTarget().width || this.height != Minecraft.getInstance().getMainRenderTarget().height)) {
                 // log a limited StackTrace to find the cause, we don't need to spam the log with full StackTraces
-                VRSettings.logger.error("Vivecraft: Mismatched RenderTarget size detected, viewport size change was blocked. MainTarget size: {}x{}, RenderTarget size: {}x{}. RenderPass: {}, Stacktrace: {}",
+                VRSettings.logger.error("Vivecraft: Mismatched RenderTarget size detected, viewport size change was blocked. MainTarget size: {}x{}, RenderTarget size: {}x{}. RenderPass: {}, Stacktrace:",
                     Minecraft.getInstance().getMainRenderTarget().width,
                     Minecraft.getInstance().getMainRenderTarget().height,
                     this.width, this.height, ClientDataHolderVR.getInstance().currentPass,
-                    String.join("\n", Arrays.stream(Thread.currentThread().getStackTrace(), 2, 12).map(Object::toString).toArray(String[]::new)));
+                    new RuntimeException());
                 this.vivecraft$loggedSizeError = true;
             }
             return false;
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
@@ -427,14 +427,18 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {
         return constant;
     }
 
-    @Inject(at = @At("HEAD"), method = "resizeDisplay")
+    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getMainRenderTarget()Lcom/mojang/blaze3d/pipeline/RenderTarget;"), method = "resizeDisplay")
     void vivecraft$restoreVanillaState(CallbackInfo ci) {
         if (VRState.vrInitialized) {
             // restore vanilla post chains before the resize, or it will resize the wrong ones
             if (levelRenderer != null) {
                 ((LevelRendererExtension) levelRenderer).vivecraft$restoreVanillaPostChains();
             }
-            RenderPassManager.setVanillaRenderPass();
+            if (VRState.vrRunning) {
+                RenderPassManager.setGUIRenderPass();
+            } else {
+                RenderPassManager.setVanillaRenderPass();
+            }
         }
     }
 
diff --git a/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/ItemInHandRendererVRMixin.java b/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/ItemInHandRendererVRMixin.java
@@ -121,7 +121,16 @@ public abstract class ItemInHandRendererVRMixin implements ItemInHandRendererExt
             }
 
             ItemTransforms.TransformType transformType;
-            if ((ClientNetworking.isThirdPersonItems() && !(BowTracker.isBow(pStack) && dh.bowTracker.isActive((LocalPlayer) pPlayer))) || dh.climbTracker.isClaws(pStack)) {
+
+            // third person transforms for custom model data items, but not spear, shield and crossbow
+            boolean hasCMD = pStack.hasTag() && pStack.getTag().getInt("CustomModelData") != 0 &&
+                rendertype != VivecraftItemRendering.VivecraftItemTransformType.Crossbow &&
+                rendertype != VivecraftItemRendering.VivecraftItemTransformType.Spear &&
+                rendertype != VivecraftItemRendering.VivecraftItemTransformType.Shield;
+
+            boolean isBow = BowTracker.isBow(pStack) && dh.bowTracker.isActive((LocalPlayer) pPlayer);
+
+            if (((ClientNetworking.isThirdPersonItems() || (hasCMD && ClientNetworking.isThirdPersonItemsCustom())) && !isBow) || dh.climbTracker.isClaws(pStack)) {
                 useLeftHandModelinLeftHand = true; //test
                 VivecraftItemRendering.applyThirdPersonItemTransforms(pMatrixStack, rendertype, mainHand, pPlayer, pEquippedProgress, pPartialTicks, pStack, pHand);
                 transformType = mainHand ? ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND : (useLeftHandModelinLeftHand ? ItemTransforms.TransformType.THIRD_PERSON_LEFT_HAND : ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
diff --git a/common/src/main/java/org/vivecraft/server/ServerNetworking.java b/common/src/main/java/org/vivecraft/server/ServerNetworking.java
@@ -143,6 +143,17 @@ public static void handlePacket(CommonNetworkHelper.PacketDiscriminators packetI
                     packetConsumer.accept(getVivecraftServerPacket(CommonNetworkHelper.PacketDiscriminators.SETTING_OVERRIDE, array));
                 }
 
+                if (ServerConfig.forceThirdPersonItemsCustom.get()) {
+                    FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
+                    byteBuf.writeUtf("thirdPersonItemsCustom");
+                    byteBuf.writeUtf("" + true);
+
+                    byte[] array = new byte[byteBuf.readableBytes()];
+                    byteBuf.readBytes(array);
+                    byteBuf.release();
+                    packetConsumer.accept(getVivecraftServerPacket(CommonNetworkHelper.PacketDiscriminators.SETTING_OVERRIDE, array));
+                }
+
                 if (ServerConfig.crawlingEnabled.get()) {
                     packetConsumer.accept(getVivecraftServerPacket(CommonNetworkHelper.PacketDiscriminators.CRAWL, new byte[0]));
                 }
diff --git a/common/src/main/java/org/vivecraft/server/config/ServerConfig.java b/common/src/main/java/org/vivecraft/server/config/ServerConfig.java
@@ -71,6 +71,7 @@ public class ServerConfig {
     public static ConfigBuilder.DoubleValue worldscaleMin;
 
     public static ConfigBuilder.BooleanValue forceThirdPersonItems;
+    public static ConfigBuilder.BooleanValue forceThirdPersonItemsCustom;
 
     public static ConfigBuilder.BooleanValue vrSwitchingEnabled;
 
@@ -358,6 +359,10 @@ private static void fixConfig(CommentedConfig config, ConfigSpec.CorrectionListe
             .push("thirdPersonItems")
             .comment("Forces players to use the raw item position setting")
             .define(false);
+        forceThirdPersonItemsCustom = builder
+            .push("thirdPersonItemsCustom")
+            .comment("Forces players to use the raw item position setting, only for items with custom model data")
+            .define(false);
         // end settingOverrides
         builder.pop();
 
diff --git a/common/src/main/resources/assets/vivecraft/lang/de_de.json b/common/src/main/resources/assets/vivecraft/lang/de_de.json
@@ -140,6 +140,7 @@
   "vivecraft.options.LIMIT_TELEPORT": "Limitiere im Überlebensmodus",
   "vivecraft.options.REVERSE_HANDS": "Hände vertauschen",
   "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS": "Rohe Gegenstand Position",
+  "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS_CUSTOM": "Rohe Custom Gegenstand Position",
   "vivecraft.options.STENCIL_ON": "Augenschablone nutzen",
   "vivecraft.options.BCB_ON": "Körperposition Anzeigen",
   "vivecraft.options.WORLD_SCALE": "Welt Skalierung",
@@ -233,6 +234,7 @@
   "vivecraft.options.LIMIT_TELEPORT.tooltip": "Wenn aktiviert, hat der Bogen-Teleporter im Überlebensmodus Einschränkungen. Er wird nicht in der Lage sein, seitlich an Blöcken hochzuspringen, er wird Hunger verbrauchen, und er wird einen Energieriegel haben, der sich mit der Zeit wieder auffüllt.",
   "vivecraft.options.REVERSE_HANDS.tooltip": "Tauschen Sie die linke/rechte Hand als dominant.\n  An: Links dominant\n  Aus: Rechts-dominant\n\nUm die Tastenbelegung zu vertauschen, starten Sie das Spiel neu und stellen Sie sicher, dass die Standardbindungen in SteamVR ausgewählt sind.",
   "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS.tooltip": "Bestimmt wie gehaltene Gegenstände transformiert werden.\n  An: Benutzt unveränderte 3. Person transformationen.\n  Aus: Benutzt adaptierte 1. Person transformationen\n\n3. Person transformationen können besser für Mod Gegenstände funktionieren.",
+  "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS_CUSTOM.tooltip": "Bestimmt wie gehaltene Gegenstände mit 'Custom Model Data' transformiert werden.\n  An: Benutzt unveränderte 3. Person transformationen.\n  Aus: Benutzt adaptierte 1. Person transformationen",
   "vivecraft.options.STENCIL_ON.tooltip": "Bereiche des Bildschirms außerhalb des FOV ausblenden.\nVerbessert die Leistung.",
   "vivecraft.options.BCB_ON.tooltip": "Zeigt Ihre Körperposition als quadratischen Schatten auf dem Boden an.\nDies ist Ihr quadratischer Schatten Kumpel™.\nVerlieren Sie Ihren quadratischen Schatten Kumpel nicht.",
   "vivecraft.options.WORLD_SCALE.tooltip": "Skaliert den Spieler in der Welt.\nÜber eins macht Sie größer\nUnd darunter macht es sie kleiner\nUnd die, die Ihnen Ihre Mutter gibt\nmachen überhaupt nichts.",
diff --git a/common/src/main/resources/assets/vivecraft/lang/en_us.json b/common/src/main/resources/assets/vivecraft/lang/en_us.json
@@ -139,6 +139,7 @@
   "vivecraft.options.LIMIT_TELEPORT": "Limit in Survival",
   "vivecraft.options.REVERSE_HANDS": "Reverse Hands",
   "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS": "Raw Item Positions",
+  "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS_CUSTOM": "Raw Custom Item Positions",
   "vivecraft.options.STENCIL_ON": "Use Eye Stencil",
   "vivecraft.options.BCB_ON": "Show Body Position",
   "vivecraft.options.WORLD_SCALE": "World Scale",
@@ -232,6 +233,7 @@
   "vivecraft.options.LIMIT_TELEPORT.tooltip": "If enabled the arc teleporter will be have restrictions in survival mode. It will not be able to jump up the side of blocks, it will consume food, and it will have an energy bar that refills over time.",
   "vivecraft.options.REVERSE_HANDS.tooltip": "Swap left/right hands as dominant.\n  ON: Left dominant\n  OFF: Right dominant\n\nTo swap the buttons, restart the game and make sure default bindings are selected in SteamVR.",
   "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS.tooltip": "Determines how held items are transformed.\n  ON: Use thirdperson transforms unmodified\n  OFF: Use firstperson transforms customized\n\nthirdperson transforms may be better for modded items.",
+  "vivecraft.options.THIRDPERSON_ITEMTRANSFORMS_CUSTOM.tooltip": "Determines how held items with 'Custom Model Data' are transformed.\n  ON: Use thirdperson transforms unmodified\n  OFF: Use firstperson transforms customized",
   "vivecraft.options.STENCIL_ON.tooltip": "Mask out areas of the screen outside the FOV.\nImproves performance.",
   "vivecraft.options.BCB_ON.tooltip": "Shows your body position as a square shadow on the ground.\nThis is your Square Shadow Buddy™.\nDo not lose your Square Shadow Buddy.",
   "vivecraft.options.WORLD_SCALE.tooltip": "Scales the player in the world.\nAbove one makes you larger\nAnd below one makes you small\nAnd the ones that mother gives you\ndon't do anything at all.",
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.18.2
 enabled_platforms=fabric,forge
 
 archives_base_name=vivecraft
-mod_version=1.1.13
+mod_version=1.1.14
 maven_group=org.vivecraft
 
 architectury_version=4.11.93

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ dependencies {`
`47`	`47`	`compileOnly('com.electronwill.night-config:toml:3.6.6')`
`48`	`48`
`49`	`49`	`//LaunchPopup`
`50`		`- implementation 'com.github.fayer3:LaunchPopup:master-SNAPSHOT'`
	`50`	`+ implementation 'com.github.Vivecraft:LaunchPopup:master-SNAPSHOT'`
`51`	`51`	`}`
`52`	`52`	`// extract the LaunchPopup classes`
`53`	`53`	`jar {`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,10 @@ public static boolean isThirdPersonItems() {`
`185`	`185`	`return ClientDataHolderVR.getInstance().vrSettings.overrides.getSetting(VRSettings.VrOptions.THIRDPERSON_ITEMTRANSFORMS).getBoolean();`
`186`	`186`	`}`
`187`	`187`
	`188`	`+ public static boolean isThirdPersonItemsCustom() {`
	`189`	`+ return ClientDataHolderVR.getInstance().vrSettings.overrides.getSetting(VRSettings.VrOptions.THIRDPERSON_ITEMTRANSFORMS_CUSTOM).getBoolean();`
	`190`	`+ }`
	`191`	`+`
`188`	`192`	`public static boolean isLimitedSurvivalTeleport() {`
`189`	`193`	`return ClientDataHolderVR.getInstance().vrSettings.overrides.getSetting(VRSettings.VrOptions.LIMIT_TELEPORT).getBoolean();`
`190`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ public boolean isCharged() {`
`103`	`103`
`104`	`104`	`public void reset(LocalPlayer player) {`
`105`	`105`	`this.isDrawing = false;`
	`106`	`+ this.canDraw = false;`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`public EntryPoint getEntryPoint() {`
Original file line number	Diff line number	Diff line change
`@@ -427,14 +427,18 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {`
`427`	`427`	`return constant;`
`428`	`428`	`}`
`429`	`429`
`430`		`- @Inject(at = @At("HEAD"), method = "resizeDisplay")`
	`430`	`+ @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getMainRenderTarget()Lcom/mojang/blaze3d/pipeline/RenderTarget;"), method = "resizeDisplay")`
`431`	`431`	`void vivecraft$restoreVanillaState(CallbackInfo ci) {`
`432`	`432`	`if (VRState.vrInitialized) {`
`433`	`433`	`// restore vanilla post chains before the resize, or it will resize the wrong ones`
`434`	`434`	`if (levelRenderer != null) {`
`435`	`435`	`((LevelRendererExtension) levelRenderer).vivecraft$restoreVanillaPostChains();`
`436`	`436`	`}`
`437`		`- RenderPassManager.setVanillaRenderPass();`
	`437`	`+ if (VRState.vrRunning) {`
	`438`	`+ RenderPassManager.setGUIRenderPass();`
	`439`	`+ } else {`
	`440`	`+ RenderPassManager.setVanillaRenderPass();`
	`441`	`+ }`
`438`	`442`	`}`
`439`	`443`	`}`
`440`	`444`