Skip to content

Commit e86204a

Browse files
committed
fix crash
1 parent 6537f00 commit e86204a

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

build.gradle.kts

+4-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ dependencies {
3838

3939
modImplementation("com.railwayteam.railways:Steam_Rails-fabric-1.20.1:1.6.4+fabric-mc1.20.1")
4040
modImplementation("dev.ithundxr.createnumismatics:CreateNumismatics-fabric-1.20.1:1.0.6+fabric-mc1.20.1")
41-
42-
// need to fix a crash caused by this
43-
modCompileOnly("maven.modrinth:copycats:fabric.1.20.1-1.3.2") { isTransitive = false }
41+
42+
modCompileOnly("maven.modrinth:copycats:fabric.1.20.1-1.3.2")
43+
44+
modCompileOnly("maven.modrinth:appleskin:2.5.1+mc1.20")
4445
}
4546

4647
tasks.processResources {

src/main/java/dev/ithundxr/railwaystweaks/mixin/client/MultiStateCopycatModelMixin.java src/main/java/dev/ithundxr/railwaystweaks/mixin/client/compat/copycatsplus/MultiStateCopycatModelMixin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.ithundxr.railwaystweaks.mixin.client;
1+
package dev.ithundxr.railwaystweaks.mixin.client.compat.copycatsplus;
22

33
import com.copycatsplus.copycats.content.copycat.base.model.multistate.fabric.MultiStateCopycatModel;
44
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package dev.ithundxr.railwaystweaks.mixin.compat.appleskin;
2+
3+
import net.minecraft.server.level.ServerPlayer;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.Pseudo;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
import squeek.appleskin.network.SyncHandler;
10+
11+
@Pseudo
12+
@Mixin(SyncHandler.class)
13+
public class SyncHandlerMixin {
14+
@Inject(method = "onPlayerUpdate", at = @At("HEAD"), cancellable = true)
15+
private static void railwaysTweaks$fixAppleSkinCrash(ServerPlayer player, CallbackInfo ci) {
16+
if (player.connection == null)
17+
ci.cancel();
18+
}
19+
}

src/main/resources/railwaystweaks.mixins.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
"compatibilityLevel": "JAVA_17",
66
"mixins": [
77
"LivingEntityMixin",
8-
"ServerStatusPacketListenerImplMixin"
8+
"ServerStatusPacketListenerImplMixin",
9+
"compat.appleskin.SyncHandlerMixin"
910
],
1011
"client": [
1112
"client.HttpTextureMixin",
12-
"client.MultiStateCopycatModelMixin",
13-
"client.PlayerRendererMixin"
13+
"client.PlayerRendererMixin",
14+
"client.compat.copycatsplus.MultiStateCopycatModelMixin"
1415
],
1516
"injectors": {
1617
"defaultRequire": 1

0 commit comments

Comments
 (0)