1.19.4/main

.circleci/config.yml

@@ -118,7 +118,7 @@ jobs:
       - discord/status:
           success_message: ${DISCORD_MSG}
           success_only: true
-          webhook: ${VS2_1192_WEBHOOK}
+          webhook: ${VS2_1194_WEBHOOK}
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,7 +17,8 @@ body:
     options:
       - 1.16
       - 1.18
-      - 1.19
+      - 1.19.2
+      - 1.19.4
       - 1.20.x
   validations:
     required: true

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - '1.18.x/*'
       - '1.19.2/*'
+      - '1.19.4/*'
   pull_request:
     types: [ opened, synchronize, reopened ]
 jobs:

common/build.gradle

@@ -31,14 +31,14 @@ dependencies {
 
     //Common create compat,
     //We just use a version from a platform and hope the classes exist on both versions and mixins apply correctly
-    modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}")
-        { exclude group: 'com.github.AlphaMode', module: 'fakeconfigtoml' }
+    //modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}")
+    //    { exclude group: 'com.github.AlphaMode', module: 'fakeconfigtoml' }
     modCompileOnly("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}")
-    modCompileOnly("com.jozufozu.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version_fabric}")
+    //modCompileOnly("com.jozufozu.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version_fabric}")
 
     //implementation("io.github.fabricators_of_create.Porting-Lib:Porting-Lib:$port_lib_version+$minecraft_version")
 
-    modCompileOnly("maven.modrinth:create-big-cannons:${createbigcannons_version}")
+    //modCompileOnly("maven.modrinth:create-big-cannons:${createbigcannons_version}")
     // modCompileOnly("io.github.fabricators_of_create:Porting-Lib:${port_lib_version}+${minecraft_version}")
 
     //Bluemap fabric 1.19

common/gradle.properties

@@ -3,7 +3,7 @@ port_lib_version=2.1.1096
 port_lib_modules = accessors,base,entity,extensions,fake_players,networking,obj_loader,tags,transfer
 
 # https://modrinth.com/mod/cloth-config/version/8.3.103+fabric
-cloth_config_version = 8.3.103
+cloth_config_version = 10.1.135
 
 # https://modrinth.com/mod/sodium/versions
-sodium_version = mc1.19.2-0.4.4
+sodium_version = mc1.19.4-0.4.10

common/src/main/java/org/valkyrienskies/mod/mixin/ValkyrienCommonMixinConfigPlugin.java

@@ -7,7 +7,6 @@
 import org.spongepowered.asm.mixin.Mixins;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-import org.spongepowered.asm.service.MixinService;
 import org.valkyrienskies.mod.compat.VSRenderer;
 
 /**
@@ -73,15 +72,6 @@ public boolean shouldApplyMixin(final String s, final String mixinClassName) {
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.feature.render_pathfinding")) {
             return PATH_FINDING_DEBUG;
         }
-        if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.create.client.trackOutlines")) {
-            //interactive has its own track outline stuff so disable fixed version of VS2's track outline stuff
-            if (classExists("org.valkyrienskies.create_interactive.mixin.client.MixinTrackBlockOutline")) {
-                MixinService.getService().getLogger("mixin")
-                    .info("[VS2] found Interactive, disabling VS2's trackOutline Compat - " +
-                        mixinClassName.substring(mixinClassName.lastIndexOf(".") + 1));
-                return false;
-            }
-        }
 
         return true;
     }

common/src/main/java/org/valkyrienskies/mod/mixin/ValkyrienMixinErrorHandler.java

@@ -10,9 +10,7 @@
 public class ValkyrienMixinErrorHandler implements IMixinErrorHandler {
 
     private final Set<String> warnList = new HashSet<>(Arrays.asList(
-        "org.valkyrienskies.mod.mixin.feature.water_in_ships_entity.MixinEntity",
-        "org.valkyrienskies.mod.mixin.mod_compat.create_big_cannons.MixinAbstractCannonProjectile",
-        "org.valkyrienskies.mod.mixin.mod_compat.create_big_cannons.MixinPitchOrientedContraptionEntity"
+        "org.valkyrienskies.mod.mixin.feature.water_in_ships_entity.MixinEntity"
     ));
 
     @Override

common/src/main/java/org/valkyrienskies/mod/mixin/accessors/resource/ResourceKeyAccessor.java

@@ -1,6 +1,5 @@
 package org.valkyrienskies.mod.mixin.accessors.resource;
 
-import java.util.Map;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
@@ -10,11 +9,6 @@
 @Mixin(ResourceKey.class)
 public interface ResourceKeyAccessor {
 
-    @Accessor("VALUES")
-    static Map<String, ResourceKey<?>> getValues() {
-        throw new AssertionError();
-    }
-
     @Accessor
     ResourceLocation getRegistryName();
 

common/src/main/java/org/valkyrienskies/mod/mixin/client/MixinCamera.java

@@ -1,7 +1,5 @@
 package org.valkyrienskies.mod.mixin.client;
 
-import com.mojang.math.Quaternion;
-import com.mojang.math.Vector3f;
 import net.minecraft.client.Camera;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
@@ -16,8 +14,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.joml.Quaterniond;
 import org.joml.Quaterniondc;
+import org.joml.Quaternionf;
 import org.joml.Vector3d;
 import org.joml.Vector3dc;
+import org.joml.Vector3f;
 import org.joml.primitives.AABBi;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,7 +26,6 @@
 import org.valkyrienskies.core.api.ships.ClientShip;
 import org.valkyrienskies.core.api.ships.properties.ShipTransform;
 import org.valkyrienskies.mod.client.IVSCamera;
-import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
 import org.valkyrienskies.mod.common.world.RaycastUtilsKt;
 
 @Mixin(Camera.class)
@@ -53,7 +52,7 @@ public abstract class MixinCamera implements IVSCamera {
     private float yRot;
     @Shadow
     @Final
-    private Quaternion rotation;
+    private Quaternionf rotation;
     @Shadow
     private boolean detached;
     @Shadow
@@ -119,13 +118,13 @@ private void setRotationWithShipTransform(final float yaw, final float pitch, fi
             renderTransform.getShipCoordinatesToWorldCoordinatesRotation().mul(originalRotation, new Quaterniond());
         this.xRot = pitch;
         this.yRot = yaw;
-        VectorConversionsMCKt.set(this.rotation, newRotation);
+        this.rotation.set(newRotation);
         this.forwards.set(0.0F, 0.0F, 1.0F);
-        this.forwards.transform(this.rotation);
+        this.rotation.transform(this.forwards);
         this.up.set(0.0F, 1.0F, 0.0F);
-        this.up.transform(this.rotation);
+        this.rotation.transform(this.up);
         this.left.set(1.0F, 0.0F, 0.0F);
-        this.left.transform(this.rotation);
+        this.rotation.transform(this.left);
     }
 
     /**