Small fix for MixinTrackBlockOutline

.circleci/config.yml

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

.github/workflows/build-1.18.x.yml → .github/workflows/build.yml

@@ -3,6 +3,9 @@ on:
   push:
     branches:
       - '1.18.x/*'
+      - '1.19.2/*'
+      - '1.20/*'
+      - '1.20.1/*'
   pull_request:
     types: [ opened, synchronize, reopened ]
 jobs:

.gitignore

@@ -39,3 +39,4 @@ forge*changelog.txt
 
 # Files generated for Fabric
 /fabric/src/generated/
+/.architectury-transformer/debug.log

build.gradle

@@ -87,22 +87,6 @@ subprojects {
         } catch (UnknownDomainObjectException ignore) {}
 
         mavenCentral()
-        maven {
-            url "https://cursemaven.com"
-            content {
-                includeModule "curse.maven", "kotlinforforge-351264"
-            }
-        }
-        maven {
-            name = "Valkyrien Skies Internal"
-            url = project.vs_maven_url ?: 'https://maven.valkyrienskies.org'
-            if (project.vs_maven_username && project.vs_maven_password) {
-                credentials {
-                    username = project.vs_maven_username
-                    password = project.vs_maven_password
-                }
-            }
-        }
         if (!project.block_external_repositories) {
             mavenLocal()
             maven {
@@ -119,17 +103,25 @@ subprojects {
                 name = 'tterrag maven'
                 url = 'https://maven.tterrag.com/'
             }
-            maven { url = "https://api.modrinth.com/maven" } // LazyDFU, Suggestion Tweaker
+            maven { url = "https://modmaven.dev/" } // Twilight Forest
+            maven { url = "https://api.modrinth.com/maven" } // LazyDFU, Suggestion Tweaker, Create Big Cannons
             maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI
+            maven { url "https://maven.architectury.dev/" }
             maven { url = "https://mvn.devos.one/snapshots/" } // Fabric Create, Porting Lib, Forge Tags, Milk Lib
+            maven { url = "https://mvn.devos.one/releases/" }
             maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port
             maven { url = "https://maven.tterrag.com/" } // Registrate, Forge Create and Flywheel
             maven { url = "https://maven.cafeteria.dev/releases" } // Fake Player API
             maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
-            maven {
-                url = "https://maven.realrobotix.me/createbigcannons/" // Create Big Cannons
-                content {
-                    includeGroup "com.rbasamoyai"
+            maven { url = "https://jitpack.io"}
+        }
+        maven {
+            name = "Valkyrien Skies Internal"
+            url = project.vs_maven_url ?: 'https://maven.valkyrienskies.org'
+            if (project.vs_maven_username && project.vs_maven_password) {
+                credentials {
+                    username = project.vs_maven_username
+                    password = project.vs_maven_password
                 }
             }
         }

common/build.gradle

@@ -1,22 +1,21 @@
 
 dependencies {
-    annotationProcessor(implementation("com.github.LlamaLad7:MixinExtras:0.1.1"))
+    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.2.0"))
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
     // We depend on fabric loader here to use the fabric @Environment annotations
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    modApi("me.shedaniel.cloth:cloth-config:4.14.64")
+    modApi("me.shedaniel.cloth:cloth-config:${cloth_config_version}")
 
-    modCompileOnly("curse.maven:sodium-394468:3669187")
+    modCompileOnly("maven.modrinth:sodium:${sodium_version}")
 
     // vs-core
     implementation("org.valkyrienskies.core:impl:${rootProject.vs_core_version}") {
         exclude module: "netty-buffer"
         exclude module: "fastutil"
     }
-
     implementation("org.valkyrienskies.core:api:${rootProject.vs_core_version}")
     implementation("org.valkyrienskies.core:api-game:${rootProject.vs_core_version}")
     implementation("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
@@ -26,20 +25,32 @@ dependencies {
     modCompileOnly("curse.maven:ftb-teams-404468:4229138")
     modCompileOnly("curse.maven:ftb-chunks-314906:4229120")
 
-    // Weather2 1.18
-    modCompileOnly("curse.maven:weather-storms-tornadoes-237746:4426524")
+    // EMF compat
+    modCompileOnly("curse.maven:entity-model-features-844662:5696901")
+    modCompileOnly("curse.maven:entity-texture-features-fabric-568563:5697084")
+
+    // Weather2 1.20.1
+    modCompileOnly("curse.maven:weather-storms-tornadoes-237746:5244118")
 
     //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("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}")
     modCompileOnly("com.jozufozu.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version_fabric}")
-    modCompileOnly("io.github.fabricators_of_create:Porting-Lib:${port_lib_version}+${minecraft_version}")
-    modCompileOnly("com.rbasamoyai:createbigcannons-fabric-${minecraft_version}:${createbigcannons_version}")
 
-    //Bluemap fabric 1.18
-    modCompileOnly("curse.maven:bluemap-406463:4950063")
+    modCompileOnly("maven.modrinth:create-big-cannons:${createbigcannons_version}")
+
+    modCompileOnly("maven.modrinth:create-utilities:${create_utilities_version}")
+    modImplementation("teamreborn:energy:${energy_version}")
+    // modCompileOnly("io.github.fabricators_of_create:Porting-Lib:${port_lib_version}+${minecraft_version}")
+
+    //Bluemap fabric 1.20.1
+    modCompileOnly("curse.maven:bluemap-406463:5555756")
+
+    modCompileOnly("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${immptl_version}")
+    modCompileOnly("com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:${immptl_version}")
+    modCompileOnly("com.github.iPortalTeam.ImmersivePortalsMod:build:${immptl_version}")
 }
 
 architectury {

common/gradle.properties

@@ -1,2 +1,10 @@
-port_lib_version=1.2.677-beta
-port_lib_hash=cca931b
+#https://mvn.devos.one/#/snapshots/io/github/fabricators_of_create/Porting-Lib/Porting-Lib
+port_lib_version=2.1.1127+1.20
+port_lib_modules = accessors,base,entity,extensions,fake_players,networking,obj_loader,tags,transfer,models,tool_actions,client_events,brewing
+
+# https://modrinth.com/mod/cloth-config/version/8.3.103+fabric
+cloth_config_version = 11.1.106
+
+# https://modrinth.com/mod/sodium/versions
+sodium_version = mc1.20.1-0.5.8
+immptl_version=v3.3.9-mc1.20.1

common/src/main/java/org/valkyrienskies/mod/compat/FlywheelEvents.java

@@ -4,8 +4,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.WeakHashMap;
-import org.valkyrienskies.core.impl.hooks.VSEvents.ShipUnloadEventClient;
-import org.valkyrienskies.mod.mixinducks.MixinBlockEntityInstanceManagerDuck;
 
 public class FlywheelEvents {
     static {
@@ -18,11 +16,12 @@ public class FlywheelEvents {
         );
 
     private static synchronized void registerEvents() {
-        ShipUnloadEventClient.Companion.on(event -> {
-            for (final InstanceWorld instanceWorld : weakLoadedInstanceWorlds) {
-                ((MixinBlockEntityInstanceManagerDuck) instanceWorld.getBlockEntityInstanceManager()).vs$removeShipManager(event.getShip());
-            }
-        });
+        // TODO api fix
+//        ShipUnloadEventClient.Companion.on(event -> {
+//            for (final InstanceWorld instanceWorld : weakLoadedInstanceWorlds) {
+//                ((MixinBlockEntityInstanceManagerDuck) instanceWorld.getBlockEntityInstanceManager()).vs$removeShipManager(event.getShip());
+//            }
+//        });
     }
 
     public static void onInstanceWorldLoad(final InstanceWorld instanceWorld) {

common/src/main/java/org/valkyrienskies/mod/compat/SodiumCompat.java

@@ -1,19 +1,21 @@
 package org.valkyrienskies.mod.compat;
 
-import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
+import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkStatus;
+import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTrackerHolder;
+import net.minecraft.client.multiplayer.ClientLevel;
 import org.valkyrienskies.mod.mixin.ValkyrienCommonMixinConfigPlugin;
 
 public class SodiumCompat {
 
-    public static void onChunkAdded(final int x, final int z) {
+    public static void onChunkAdded(final ClientLevel level, final int x, final int z) {
         if (ValkyrienCommonMixinConfigPlugin.getVSRenderer() == VSRenderer.SODIUM) {
-            SodiumWorldRenderer.instance().onChunkAdded(x, z);
+            ChunkTrackerHolder.get(level).onChunkStatusAdded(x, z, ChunkStatus.FLAG_HAS_BLOCK_DATA);
         }
     }
 
-    public static void onChunkRemoved(final int x, final int z) {
+    public static void onChunkRemoved(final ClientLevel level, final int x, final int z) {
         if (ValkyrienCommonMixinConfigPlugin.getVSRenderer() == VSRenderer.SODIUM) {
-            SodiumWorldRenderer.instance().onChunkRemoved(x, z);
+            ChunkTrackerHolder.get(level).onChunkStatusRemoved(x, z, ChunkStatus.FLAG_HAS_BLOCK_DATA);
         }
     }
 

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

@@ -8,6 +8,7 @@
 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.LoadedMods;
 import org.valkyrienskies.mod.compat.VSRenderer;
 
 /**
@@ -58,21 +59,34 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(final String s, final String mixinClassName) {
+        final VSRenderer renderer = getVSRenderer();
+
+        if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.immersive_portals")) {
+            return LoadedMods.getImmersivePortals(); // Only load this mixin if immersive portals is present
+        }
+        if (
+            mixinClassName.equals("org.valkyrienskies.mod.mixin.client.world.MixinClientChunkCache") ||
+                mixinClassName.equals("org.valkyrienskies.mod.mixin.mod_compat.vanilla_renderer.MixinViewAreaVanilla")
+        ) {
+            return !LoadedMods.getImmersivePortals(); // Only load this if immersive portals is NOT present
+        }
+
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.sodium")) {
-            return getVSRenderer() == VSRenderer.SODIUM;
+            return renderer == VSRenderer.SODIUM;
         }
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.optifine_vanilla")) {
-            return getVSRenderer() != VSRenderer.SODIUM;
+            return renderer == VSRenderer.VANILLA || renderer == VSRenderer.OPTIFINE;
         }
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.vanilla_renderer")) {
-            return getVSRenderer() == VSRenderer.VANILLA;
+            return renderer == VSRenderer.VANILLA;
         }
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.optifine")) {
-            return getVSRenderer() == VSRenderer.OPTIFINE;
+            return renderer == VSRenderer.OPTIFINE;
         }
         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")) {
@@ -83,6 +97,13 @@ public boolean shouldApplyMixin(final String s, final String mixinClassName) {
             }
         }
 
+        // Only load this mixin when ETF is installed
+        if (mixinClassName.equals("org.valkyrienskies.mod.mixin.mod_compat.etf.MixinBlockEntity")) {
+            if (!classExists("traben.entity_texture_features.utils.ETFEntity")) {
+                return false;
+            }
+        }
+
         return true;
     }
 

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

@@ -10,7 +10,9 @@
 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.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"
     ));
 
     @Override

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

@@ -9,12 +9,14 @@
 
 @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/accessors/util/math/Matrix4fAccessor.java

@@ -1,6 +1,6 @@
 package org.valkyrienskies.mod.mixin.accessors.util.math;
 
-import com.mojang.math.Matrix4f;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 

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);
     }
 
     /**