1.19.2 eh somehow this doesnt work anymore

ValkyrienSkies · Nov 16, 2023 · 5f84102 · 5f84102
1 parent dc3851c
commit 5f84102
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 26 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -7,10 +7,9 @@ dependencies {
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    modApi("me.shedaniel.cloth:cloth-config:8.3.103")
-    //modApi "me.shedaniel.cloth:cloth-config-fabric:8.3.103"
+    modApi("me.shedaniel.cloth:cloth-config:${cloth_config_version}")
 
-    modCompileOnly("maven.modrinth:sodium:mc1.19.2-0.4.4")
+    modCompileOnly("maven.modrinth:sodium:${sodium_version}")
 
     // vs-core
     implementation("org.valkyrienskies.core:impl:${rootProject.vs_core_version}") {

diff --git a/common/gradle.properties b/common/gradle.properties
@@ -1,2 +1,6 @@
 port_lib_version=2.1.1096
 port_lib_modules = accessors,base,entity,extensions,fake_players,networking,obj_loader,tags,transfer
+
+cloth_config_version = 8.3.103
+
+sodium_version = mc1.19.2-0.4.4
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -37,12 +37,12 @@ dependencies {
     }
 
     // Depend on the fabric kotlin mod
-    include(modImplementation("net.fabricmc:fabric-language-kotlin:1.10.10+kotlin.1.9.10"))
-    include(modImplementation("me.shedaniel.cloth:cloth-config-fabric:6.3.81"))
+    include(modImplementation("net.fabricmc:fabric-language-kotlin:${kotlin_fabric_version}"))
+    include(modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}"))
 
-    modImplementation("maven.modrinth:sodium:mc1.19.2-0.4.4")
-    modRuntimeOnly("maven.modrinth:indium:1.0.9+mc1.19.2")
-    modImplementation("maven.modrinth:modmenu:4.2.0-beta.2")
+    modImplementation("maven.modrinth:sodium:${sodium_version}")
+    modRuntimeOnly("maven.modrinth:indium:${indium_version}")
+    modImplementation("maven.modrinth:modmenu:${modmenu_version}")
 
     // Depend on the fabric API
     modImplementation("net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}")
@@ -62,7 +62,7 @@ dependencies {
     }
 
     // CC Restitched
-    modImplementation("maven.modrinth:cc-restitched:1.101.2+1.19.1")
+    modImplementation("maven.modrinth:cc-restitched:${cc_restitched_version}")
 
     // Create compat
     modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}") {

diff --git a/fabric/gradle.properties b/fabric/gradle.properties
@@ -16,3 +16,15 @@ night_config_toml_version=3.6.3
 jsr305_version=3.0.2
 # https://modrinth.com/mod/no-indium/
 no_indium_version=1.1.0+1.19
+
+sodium_version = mc1.19.2-0.4.4
+
+cc_restitched_version = 1.101.2+1.19.1
+
+kotlin_fabric_version = 1.10.10+kotlin.1.9.10
+
+indium_version = 1.0.9+mc1.19.2
+
+modmenu_version = 4.2.0-beta.2
+
+cloth_config_version = 8.3.103
diff --git a/...in/java/org/valkyrienskies/mod/fabric/mixin/server/network/MixinServerPlayerGameMode.java b/...in/java/org/valkyrienskies/mod/fabric/mixin/server/network/MixinServerPlayerGameMode.java
@@ -1,6 +1,5 @@
 package org.valkyrienskies.mod.fabric.mixin.server.network;
 
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -11,6 +10,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 import org.valkyrienskies.mod.common.config.VSGameConfig;
 import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
@@ -28,7 +28,7 @@ public class MixinServerPlayerGameMode {
     /**
      * Includes ships in server-side distance check when player breaks a block.
      */
-    @ModifyExpressionValue(
+    @Redirect(
         method = "handleBlockBreakAction",
         at = @At(value = "INVOKE",
             target = "Lnet/minecraft/world/phys/Vec3;distanceToSqr(Lnet/minecraft/world/phys/Vec3;)D")

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -64,26 +64,24 @@ dependencies {
         transitive = false
     }
 
-    modCompileOnly("curse.maven:rubidium-574856:4024781")
+    modCompileOnly("maven.modrinth:rubidium:${rubidium_version}")
 
     // Create compat
     modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
     modImplementation("com.jozufozu.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")
     modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
 
     // CC Tweaked
-    modCompileOnly("curse.maven:cc-tweaked-282001:4061947")
+    modCompileOnly("maven.modrinth:cc-tweaked:${cc_tweaked_version}")
 
     // TIS-3d
-    modCompileOnly("curse.maven:tis3d-238603:3738437")
-    //modImplementation("curse.maven:tis3d-238603:3738437")
-    //modImplementation("curse.maven:markdownmanual-502485:3738124")
+    modCompileOnly("maven.modrinth:tis3d:${tis3d_version}")
 
     // Add Kotlin for Forge (3.12.0)
-    forgeRuntimeLibrary('curse.maven:kotlinforforge-351264:4513187')
+    forgeRuntimeLibrary("maven.modrinth:kotlin-for-forge:${kotlin_version}")
 
     // Cloth for config
-    include(modImplementation("me.shedaniel.cloth:cloth-config-forge:8.3.103"))
+    include(modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}"))
 
     // Shade vs-core
     implementation("org.valkyrienskies.core:impl:${rootProject.vs_core_version}")

diff --git a/forge/gradle.properties b/forge/gradle.properties
@@ -1,7 +1,15 @@
 loader_platform=Forge
 loom.platform=forge
 kotlin.stdlib.default.dependency=false
+#Deps
+kotlin_version = 3.12.0
+cloth_config_version = 8.3.103
+
 #Compat
 create_version = 0.5.1.e-44
 flywheel_version = 0.6.10-20
 registrate_version = MC1.19-1.1.5
+cc_tweaked_version = 1.19.2-1.101.3
+#Extra
+tis3d_version = MC1.19.2-forge-1.7.4
+rubidium_version = 0.6.2c
diff --git a/...ain/java/org/valkyrienskies/mod/forge/mixin/compat/tis3d/MixinCasingTileEntityRender.java b/...ain/java/org/valkyrienskies/mod/forge/mixin/compat/tis3d/MixinCasingTileEntityRender.java
@@ -1,6 +1,6 @@
 package org.valkyrienskies.mod.forge.mixin.compat.tis3d;
 
-import li.cil.tis3d.client.renderer.tileentity.CasingTileEntityRenderer;
+import li.cil.tis3d.client.renderer.block.entity.CasingBlockEntityRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
@@ -13,9 +13,9 @@
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
 @Pseudo
-@Mixin(CasingTileEntityRenderer.class)
+@Mixin(CasingBlockEntityRenderer.class)
 public abstract class MixinCasingTileEntityRender {
-    @ModifyVariable(remap = false, method = "isBackFace(Lnet/minecraft/core/BlockPos;Lli/cil/tis3d/api/machine/Face;)Z",
+    @ModifyVariable(remap = false, method = "isBackFace",
         at = @At("STORE"), ordinal = 0)
     private Vec3 vs$isBackFace(final Vec3 original, final BlockPos position) {
         final ClientShip ship = VSGameUtilsKt.getShipObjectManagingPos(Minecraft.getInstance().level, position);

diff --git a/forge/src/main/kotlin/org/valkyrienskies/mod/forge/common/ValkyrienSkiesModForge.kt b/forge/src/main/kotlin/org/valkyrienskies/mod/forge/common/ValkyrienSkiesModForge.kt
@@ -102,7 +102,6 @@ class ValkyrienSkiesModForge {
 
         forgeBus.addListener(::registerCommands)
         forgeBus.addListener(::tagsUpdated)
-        forgeBus.addListener(::leftClickEvent)
         forgeBus.addListener(::registerResourceManagers)
 
         ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory::class.java) {
@@ -201,10 +200,6 @@ class ValkyrienSkiesModForge {
         VSGameEvents.tagsAreLoaded.emit(Unit)
     }
 
-    private fun leftClickEvent(event: PlayerInteractEvent.LeftClickBlock){
-
-    }
-
     private fun loadComplete(event: FMLLoadCompleteEvent) {
         ValkyrienSkiesMod.TEST_CHAIR = TEST_CHAIR_REGISTRY.get()
         ValkyrienSkiesMod.TEST_HINGE = TEST_HINGE_REGISTRY.get()