bHaptics integration

.github/workflows/publish-on-release.yml

@@ -78,7 +78,7 @@ jobs:
             done < ./fabric/$2
           }
           parse_forge () {
-            unzip -o -j "$1" "META-INF/mods.toml" -d ./forge
+            unzip -o -j "$1" "META-INF/$2" -d ./forge
             minecraftDep=false
             minecraftIdReg='modId\s+=\s+"minecraft"'
             versionRangeReg='versionRange\s+=\s+"(.+?)"'
@@ -91,7 +91,7 @@ jobs:
                 echo "${BASH_REMATCH[0]}"
                 echo "${BASH_REMATCH[1]}"
               fi
-            done < ./forge/mods.toml
+            done < ./forge/$2
           }
           file=""
           if [ -n "${{ steps.assets.outputs.FABRIC_FILE_NAME }}" ]; then
@@ -147,11 +147,11 @@ jobs:
             echo "FABRIC_MC_VERSIONS="${parsedVersion}"" >> $GITHUB_OUTPUT
           fi
           if [ -n "${{ steps.assets.outputs.FORGE_FILE_NAME }}" ]; then
-            parse_forge ${{ steps.assets.outputs.FORGE_FILE_NAME }}
+            parse_forge ${{ steps.assets.outputs.FORGE_FILE_NAME }} "mods.toml"
             echo "FORGE_MC_VERSIONS="${parsedVersion}"" >> $GITHUB_OUTPUT
           fi
           if [ -n "${{ steps.assets.outputs.NEOFORGE_FILE_NAME }}" ]; then
-            parse_forge ${{ steps.assets.outputs.NEOFORGE_FILE_NAME }}
+            parse_forge ${{ steps.assets.outputs.NEOFORGE_FILE_NAME }} "neoforge.mods.toml"
             echo "NEOFORGE_MC_VERSIONS="${parsedVersion}"" >> $GITHUB_OUTPUT
           fi
           if [ -n "${{ steps.assets.outputs.QUILT_FILE_NAME }}" ]; then

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
     id 'io.github.juuxel.loom-quiltflower' version '1.8.0' apply false
 }
 
@@ -27,15 +27,18 @@ subprojects {
         mappings loom.officialMojangMappings()
         // The following line declares the yarn mappings you may select this one as well.
         // mappings "net.fabricmc:yarn:1.18.2+build.4:v2"
-        implementation("org.lwjgl:lwjgl-openvr:3.3.2")
-        implementation("org.lwjgl:lwjgl-openvr:3.3.2:natives-linux")
-        implementation("org.lwjgl:lwjgl-openvr:3.3.2:natives-macos")
-        implementation("org.lwjgl:lwjgl-openvr:3.3.2:natives-windows")
+        implementation("org.lwjgl:lwjgl-openvr:3.3.3")
+        implementation("org.lwjgl:lwjgl-openvr:3.3.3:natives-linux")
+        implementation("org.lwjgl:lwjgl-openvr:3.3.3:natives-macos")
+        implementation("org.lwjgl:lwjgl-openvr:3.3.3:natives-windows")
+
+        // bHaptics Integration
+        implementation ("com.github.bhaptics:tact-java:0.1.4")
     }
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {

common/build.gradle

@@ -15,10 +15,10 @@ dependencies {
     modApi("dev.architectury:architectury-fabric:${rootProject.architectury_version}") { exclude group: "net.fabricmc" exclude group: "net.fabricmc.fabric-api" }
 
     // for sodium compat
-    modCompileOnly "maven.modrinth:sodium:mc1.20.4-0.5.8"
+    modCompileOnly "maven.modrinth:sodium:mc1.21-0.6.0-beta.2-fabric"
 
     // for iris compat
-    modCompileOnly "maven.modrinth:iris:1.7.0+1.20.4"
+    modCompileOnly "maven.modrinth:iris:1.8.0-beta.4+1.21-fabric"
 
     // for REI compat
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:14.0.688") { exclude group: "net.fabricmc" exclude group: "net.fabricmc.fabric-api" exclude group: "dev.architectury" }
@@ -27,7 +27,7 @@ dependencies {
     modApi("com.github.Virtuoel:Pehkui:3.7.12") { exclude group: "net.fabricmc" exclude group: "net.fabricmc.fabric-api" }
 
     // other mods
-    modCompileOnly "maven.modrinth:dynamic-fps:3.4.1"
+    modCompileOnly "maven.modrinth:dynamic-fps:3.4.3"
     // modCompileOnly("com.simibubi.create:create-fabric-1.19.2:0.5.0.i-969+1.19.2")
     // modCompileOnly "maven.modrinth:lithium:mc1.20.4-0.12.1"
     // modCompileOnly "maven.modrinth:indium:1.0.30+mc1.20.4"

common/src/main/java/org/vivecraft/MixinConfig.java

@@ -6,8 +6,6 @@
 import org.spongepowered.asm.service.MixinService;
 import org.vivecraft.client.Xplat;
 import org.vivecraft.client_vr.settings.VRSettings;
-import org.vivecraft.mod_compat_vr.iris.mixin.coderbot.IrisChunkProgramOverridesMixinSodium_0_4_11;
-import org.vivecraft.mod_compat_vr.iris.mixin.coderbot.IrisChunkProgramOverridesMixinSodium_0_4_9;
 import org.vivecraft.mod_compat_vr.iris.mixin.irisshaders.IrisChunkProgramOverridesMixin;
 import org.vivecraft.mod_compat_vr.iris.mixin.irisshaders.IrisChunkProgramOverridesMixinSodium_0_5_8;
 import org.vivecraft.mod_compat_vr.iris.mixin.irisshaders.IrisChunkProgramOverridesMixinSodium_0_6;
@@ -74,9 +72,7 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
 
         String neededClass = "";
         // apply iris sodium version specific mixins only when the right class is there
-        if (mixinClassName.equals(IrisChunkProgramOverridesMixinSodium_0_4_9.class.getName())) {
-            neededClass = "me.jellysquid.mods.sodium.client.render.vertex.type.ChunkVertexType";
-        } else if (mixinClassName.equals(IrisChunkProgramOverridesMixinSodium_0_4_11.class.getName()) || mixinClassName.equals(IrisChunkProgramOverridesMixinSodium_0_5_8.class.getName())
+        if (mixinClassName.equals(IrisChunkProgramOverridesMixinSodium_0_5_8.class.getName())
         ) {
             neededClass = "me.jellysquid.mods.sodium.client.render.chunk.vertex.format.ChunkVertexType";
         } else if (mixinClassName.equals(IrisChunkProgramOverridesMixinSodium_0_6.class.getName())) {

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

@@ -180,7 +180,7 @@ public RotInfo getRotationsForPlayer(UUID uuid) {
         if (playermodelcontroller$rotinfo != null && this.vivePlayersLast.containsKey(uuid)) {
             RotInfo playermodelcontroller$rotinfo1 = this.vivePlayersLast.get(uuid);
             RotInfo playermodelcontroller$rotinfo2 = new RotInfo();
-            float f = Minecraft.getInstance().getFrameTime();
+            float f = Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(false);
             playermodelcontroller$rotinfo2.reverse = playermodelcontroller$rotinfo.reverse;
             playermodelcontroller$rotinfo2.seated = playermodelcontroller$rotinfo.seated;
             playermodelcontroller$rotinfo2.hmd = playermodelcontroller$rotinfo.hmd;

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

@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
@@ -24,12 +25,12 @@ static boolean renderFireOverlay(Player player, PoseStack mat) {
     }
 
     @ExpectPlatform
-    static void onRenderTickStart(float f) {
+    static void onRenderTickStart(DeltaTracker partialTick) {
 
     }
 
     @ExpectPlatform
-    static void onRenderTickEnd(float f) {
+    static void onRenderTickEnd(DeltaTracker partialTick) {
 
     }
 }

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

@@ -6,8 +6,6 @@
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeSpecialEffects;
@@ -102,11 +100,7 @@ static BiomeSpecialEffects getBiomeEffects(Biome biome) {
     }
 
     @ExpectPlatform
-    static double getItemEntityReach(double baseRange, ItemStack itemStack, EquipmentSlot slot) {
-        return 0;
-    }
-
-    @ExpectPlatform
-    static void addNetworkChannel(ClientPacketListener listener, ResourceLocation resourceLocation) {
+    static boolean serverAcceptsPacket(ClientPacketListener connection, ResourceLocation id) {
+        return true;
     }
 }

common/src/main/java/org/vivecraft/client/extensions/RenderTargetExtension.java

@@ -5,11 +5,7 @@
 
 public interface RenderTargetExtension {
 
-    default void vivecraft$blitToScreen(int i, int viewWidth, int viewHeight, int j, boolean b, float f, float g, boolean c) {
-        vivecraft$blitToScreen(null, i, viewWidth, viewHeight, j, b, f, g, c);
-    }
-
-    void vivecraft$blitToScreen(ShaderInstance instance, int i, int viewWidth, int viewHeight, int j, boolean b, float f, float g, boolean c);
+    void vivecraft$blitToScreen(int i, int viewWidth, int viewHeight, int j, boolean b, float f, float g, boolean c);
 
     default void vivecraft$genMipMaps() {
         GL30.glGenerateMipmap(3553);

common/src/main/java/org/vivecraft/client/gui/screens/ErrorScreen.java

@@ -37,9 +37,7 @@ protected void init() {
 
     @Override
     public void render(@NotNull GuiGraphics guiGraphics, int i, int j, float f) {
-        this.renderBackground(guiGraphics, i, j, f);
-        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
-
         super.render(guiGraphics, i, j, f);
+        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
     }
 }

common/src/main/java/org/vivecraft/client/gui/screens/GarbageCollectorScreen.java

@@ -67,9 +67,8 @@ protected void init() {
 
     @Override
     public void render(@NotNull GuiGraphics guiGraphics, int i, int j, float f) {
-        this.renderBackground(guiGraphics, i, j, f);
-        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
         super.render(guiGraphics, i, j, f);
+        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
     }
 
     @Override

common/src/main/java/org/vivecraft/client/gui/screens/UpdateScreen.java

@@ -45,9 +45,8 @@ protected void init() {
 
     @Override
     public void render(@NotNull GuiGraphics guiGraphics, int i, int j, float f) {
-        this.renderBackground(guiGraphics, i, j, f);
-        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
         super.render(guiGraphics, i, j, f);
+        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
     }
 
     @Override

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

@@ -40,11 +40,6 @@ public void onClose() {
         this.minecraft.setScreen(lastScreen);
     }
 
-    @Override
-    public void renderBackground(GuiGraphics guiGraphics, int i, int j, float f) {
-        this.renderDirtBackground(guiGraphics);
-    }
-
     @Override
     public void render(GuiGraphics guiGraphics, int i, int j, float f) {
         if (reinit) {

common/src/main/java/org/vivecraft/client/network/ClientNetworking.java

@@ -83,14 +83,15 @@ public static void resetServerSettings() {
     }
 
     public static void sendVersionInfo() {
-        //Minecraft.getInstance().getConnection().send(new ServerboundCustomPayloadPacket(new ChannelRegisterPacket(CommonNetworkHelper.CHANNEL.toString())));
-        Xplat.addNetworkChannel(Minecraft.getInstance().getConnection(), CommonNetworkHelper.CHANNEL);
         // send version string, with currently running
-        Minecraft.getInstance().getConnection().send(getVivecraftClientPacket(CommonNetworkHelper.PacketDiscriminators.VERSION,
-            (CommonDataHolder.getInstance().versionIdentifier + (VRState.vrRunning ? " VR" : " NONVR")
-                + "\n" + CommonNetworkHelper.MAX_SUPPORTED_NETWORK_VERSION
-                + "\n" + CommonNetworkHelper.MIN_SUPPORTED_NETWORK_VERSION
-            ).getBytes(Charsets.UTF_8)));
+        ClientPacketListener con = Minecraft.getInstance().getConnection();
+        if (con != null && Xplat.serverAcceptsPacket(con, CommonNetworkHelper.CHANNEL)) {
+            con.send(getVivecraftClientPacket(CommonNetworkHelper.PacketDiscriminators.VERSION,
+                (CommonDataHolder.getInstance().versionIdentifier + (VRState.vrRunning ? " VR" : " NONVR")
+                    + "\n" + CommonNetworkHelper.MAX_SUPPORTED_NETWORK_VERSION
+                    + "\n" + CommonNetworkHelper.MIN_SUPPORTED_NETWORK_VERSION
+                ).getBytes(Charsets.UTF_8)));
+        }
     }
 
     public static void sendVRPlayerPositions(VRPlayer vrPlayer) {
@@ -255,7 +256,7 @@ public static void handlePacket(CommonNetworkHelper.PacketDiscriminators packetI
 
                     while (buffer.readableBytes() > 0) {
                         String s12 = buffer.readUtf(16384);
-                        Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(s12));
+                        Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(s12));
 
                         // if the block is not there AIR is returned
                         if (block != Blocks.AIR) {

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

@@ -14,9 +14,9 @@
 
 public class HMDLayer extends RenderLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
 
-    ResourceLocation DIAMOND_HMD = new ResourceLocation("vivecraft:textures/diamond_hmd.png");
-    ResourceLocation GOLD_HMD = new ResourceLocation("vivecraft:textures/gold_hmd.png");
-    ResourceLocation BLACK_HMD = new ResourceLocation("vivecraft:textures/black_hmd.png");
+    ResourceLocation DIAMOND_HMD = ResourceLocation.parse("vivecraft:textures/diamond_hmd.png");
+    ResourceLocation GOLD_HMD = ResourceLocation.parse("vivecraft:textures/gold_hmd.png");
+    ResourceLocation BLACK_HMD = ResourceLocation.parse("vivecraft:textures/black_hmd.png");
 
     public HMDLayer(RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> renderLayerParent) {
         super(renderLayerParent);

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

@@ -17,9 +17,8 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.phys.Vec3;
 import org.vivecraft.client.VRPlayersClient;
-import org.vivecraft.client.Xplat;
+import org.vivecraft.client_vr.utils.ScaleHelper;
 import org.vivecraft.mod_compat_vr.optifine.OptifineHelper;
-import org.vivecraft.mod_compat_vr.pehkui.PehkuiHelper;
 import org.vivecraft.mod_compat_vr.sodium.SodiumHelper;
 
 public class VRPlayerModel_WithArms<T extends LivingEntity> extends VRPlayerModel<T> {
@@ -157,13 +156,11 @@ public void setupAnim(T pEntity, float pLimbSwing, float pLimbSwingAmount, float
             this.leftShoulder.y += 3.2F;
         }
 
-        Vec3 vec3 = rotinfo.leftArmPos;
-        Vec3 vec32 = rotinfo.rightArmPos;
-        if (Xplat.isModLoaded("pehkui")) {
-            // remove pehkui scale from that, since the whole entity is scaled
-            vec3 = vec3.scale(1.0F / PehkuiHelper.getPlayerScale(pEntity, Minecraft.getInstance().getFrameTime()));
-            vec32 = vec32.scale(1.0F / PehkuiHelper.getPlayerScale(pEntity, Minecraft.getInstance().getFrameTime()));
-        }
+        // remove entity scale from that
+        float scale = 1.0F / ScaleHelper.getEntityScale(pEntity, Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(false));
+        Vec3 vec3 = rotinfo.leftArmPos.scale(scale);
+        Vec3 vec32 = rotinfo.rightArmPos.scale(scale);
+
         vec3 = vec3.add(0.0D, d0, 0.0D);
         vec3 = vec3.yRot((float) (-Math.PI + d1));
         vec3 = vec3.scale(16.0F / rotinfo.heightScale);

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

@@ -74,14 +74,14 @@ public void setModelProperties(AbstractClientPlayer pClientPlayer) {
     }
 
     @Override
-    protected void setupRotations(AbstractClientPlayer pEntityLiving, PoseStack pMatrixStack, float pAgeInTicks, float pRotationYaw, float pPartialTicks) {
+    protected void setupRotations(AbstractClientPlayer pEntityLiving, PoseStack pMatrixStack, float pAgeInTicks, float pRotationYaw, float pPartialTicks, float entityScale) {
         UUID uuid = pEntityLiving.getUUID();
         if (ClientDataHolderVR.getInstance().currentPass != RenderPass.GUI && VRPlayersClient.getInstance().isTracked(uuid)) {
             VRPlayersClient.RotInfo playermodelcontroller$rotinfo = VRPlayersClient.getInstance().getRotationsForPlayer(uuid);
             pRotationYaw = (float) Math.toDegrees(playermodelcontroller$rotinfo.getBodyYawRadians());
         }
 
         //vanilla below here
-        super.setupRotations(pEntityLiving, pMatrixStack, pAgeInTicks, pRotationYaw, pPartialTicks);
+        super.setupRotations(pEntityLiving, pMatrixStack, pAgeInTicks, pRotationYaw, pPartialTicks, entityScale);
     }
 }

common/src/main/java/org/vivecraft/client/utils/Debug.java

@@ -1,9 +1,7 @@
 package org.vivecraft.client.utils;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.debug.DebugRenderer;
@@ -169,17 +167,15 @@ public void render(float partialTicks, long finishTimeNano) {
             //GlStateManager._disableLighting();
             RenderSystem.depthMask(false);
             RenderSystem.disableDepthTest();
-            Tesselator tesselator = Tesselator.getInstance();
-            BufferBuilder bufferbuilder = tesselator.getBuilder();
-            //bufferbuilder.begin(3, DefaultVertexFormat.POSITION_COLOR);
+            BufferBuilder bufferbuilder = Tesselator.getInstance().begin(VertexFormat.Mode.DEBUG_LINE_STRIP, DefaultVertexFormat.POSITION_COLOR);
 
             for (Polygon debug$polygon : this.toDraw) {
                 for (int i = 0; i < debug$polygon.vertices.length; ++i) {
                     this.renderVertex(bufferbuilder, debug$polygon.vertices[i], debug$polygon.colors[i], d0, d1, d2);
                 }
             }
 
-            tesselator.end();
+            BufferUploader.drawWithShader(bufferbuilder.buildOrThrow());
             RenderSystem.depthMask(true);
             //GlStateManager._enableLighting();
             RenderSystem.enableDepthTest();
@@ -194,7 +190,7 @@ public void clear() {
         }
 
         void renderVertex(BufferBuilder buffer, Vec3 vert, Color color, double offX, double offY, double offZ) {
-            buffer.vertex(vert.x - offX, vert.y - offY, vert.z - offZ).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
+            buffer.addVertex((float) (vert.x - offX), (float) (vert.y - offY), (float) (vert.z - offZ)).setColor(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
         }
 
         public void render(PoseStack pMatrixStack, MultiBufferSource pBuffer, double pCamX, double p_113510_, double pCamY) {

common/src/main/java/org/vivecraft/client/utils/Utils.java

@@ -260,7 +260,7 @@ public static InputStream getAssetAsStream(String name, boolean required) {
 
         try {
             try {
-                Optional<Resource> resource = Minecraft.getInstance().getResourceManager().getResource(new ResourceLocation("vivecraft", name));
+                Optional<Resource> resource = Minecraft.getInstance().getResourceManager().getResource(ResourceLocation.fromNamespaceAndPath("vivecraft", name));
                 if (resource.isPresent()) {
                     inputstream = resource.get().open();
                 }

common/src/main/java/org/vivecraft/client/utils/math/BezierCurve.java

@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.BufferUploader;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexFormat.Mode;
@@ -72,22 +73,20 @@ public void render(int vertexCount, Color c, float partialTicks) {
         double d2 = player.zOld + (player.getZ() - player.zOld) * (double) partialTicks;
         //GlStateManager._disableLighting();
         RenderSystem.depthMask(false);
-        Tesselator tesselator = Tesselator.getInstance();
-        BufferBuilder bufferbuilder = tesselator.getBuilder();
-        bufferbuilder.begin(Mode.LINES, DefaultVertexFormat.POSITION_COLOR);
+        BufferBuilder bufferbuilder = Tesselator.getInstance().begin(Mode.LINES, DefaultVertexFormat.POSITION_COLOR);
         Vec3[] avec3 = this.getLinearInterpolation(vertexCount / this.nodes.size());
 
         for (int i = 0; i < avec3.length; ++i) {
             this.renderVertex(bufferbuilder, avec3[i], c, d0, d1, d2);
         }
 
-        tesselator.end();
+        BufferUploader.drawWithShader(bufferbuilder.buildOrThrow());
         //GlStateManager._enableLighting();
         RenderSystem.depthMask(true);
     }
 
     void renderVertex(BufferBuilder buffer, Vec3 vert, Color color, double offX, double offY, double offZ) {
-        buffer.vertex(vert.x - offX, vert.y - offY, vert.z - offZ).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
+        buffer.addVertex((float) (vert.x - offX), (float) (vert.y - offY), (float) (vert.z - offZ)).setColor(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
     }
 
     public static class Node {