Skip to content

Commit cfbab34

Browse files
committed
refactor: fix mixin
fix: mixin disconnect bug for atm9 fix: mixin dep in gradle
1 parent bf09135 commit cfbab34

5 files changed

Lines changed: 18 additions & 35 deletions

File tree

forge-1.18.2/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ group = Props.MOD_GROUP_ID
3232
base.archivesName.set(Props.MOD_ID)
3333
kotlin.jvmToolchain(17)
3434

35+
buildscript {
36+
repositories { maven { url = uri("https://repo.spongepowered.org/repository/maven-public/") } }
37+
dependencies { classpath("org.spongepowered:mixingradle:0.7-SNAPSHOT") }
38+
}
39+
3540
plugins {
3641
id("net.minecraftforge.gradle")
3742
id("org.spongepowered.mixin") version "0.7-SNAPSHOT"
@@ -47,8 +52,6 @@ minecraft {
4752
)
4853
}
4954

50-
sourceSets["main"].kotlin.srcDir("src/generated/kotlin")
51-
5255
mixin {
5356
add(sourceSets.main.get(), "${Props.MOD_ID}.refmap.json")
5457
config("${Props.MOD_ID}.mixins.json")

forge-1.19.2/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ group = Props.MOD_GROUP_ID
3232
base.archivesName.set(Props.MOD_ID)
3333
kotlin.jvmToolchain(17)
3434

35+
buildscript {
36+
repositories { maven { url = uri("https://repo.spongepowered.org/repository/maven-public/") } }
37+
dependencies { classpath("org.spongepowered:mixingradle:0.7-SNAPSHOT") }
38+
}
39+
3540
plugins {
3641
id("net.minecraftforge.gradle")
3742
id("org.spongepowered.mixin") version "0.7-SNAPSHOT"

forge-1.19.2/src/main/java/club/asynclab/asyncraft/asyncauth/mixin/MixinServerLoginPacketListenerImpl.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

forge-1.20.1/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ group = Props.MOD_GROUP_ID
3232
base.archivesName.set(Props.MOD_ID)
3333
kotlin.jvmToolchain(17)
3434

35+
buildscript {
36+
repositories { maven { url = uri("https://repo.spongepowered.org/repository/maven-public/") } }
37+
dependencies { classpath("org.spongepowered:mixingradle:0.7-SNAPSHOT") }
38+
}
39+
3540
plugins {
3641
id("net.minecraftforge.gradle")
3742
id("org.spongepowered.mixin") version "0.7-SNAPSHOT"

forge-1.20.1/src/main/java/club/asynclab/asyncraft/asyncauth/mixin/MixinServerLoginPacketListenerImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package club.asynclab.asyncraft.asyncauth.mixin;
22

3+
import club.asynclab.asyncraft.asyncauth.util.UtilComponent;
34
import net.minecraft.network.chat.Component;
45
import net.minecraft.server.network.ServerLoginPacketListenerImpl;
56
import org.objectweb.asm.Opcodes;
@@ -9,7 +10,7 @@
910
import org.spongepowered.asm.mixin.injection.Inject;
1011
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1112

12-
@Mixin(value = ServerLoginPacketListenerImpl.class, remap = false)
13+
@Mixin(ServerLoginPacketListenerImpl.class)
1314
public abstract class MixinServerLoginPacketListenerImpl {
1415
@Shadow
1516
private int tick;
@@ -23,7 +24,7 @@ public abstract class MixinServerLoginPacketListenerImpl {
2324
@Inject(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/server/network/ServerLoginPacketListenerImpl;tick:I", opcode = Opcodes.GETFIELD), cancellable = true)
2425
private void onTick(CallbackInfo ci) {
2526
if (MAX_TICKS_BEFORE_LOGIN != 0 && this.tick++ == MAX_TICKS_BEFORE_LOGIN) {
26-
this.disconnect(Component.translatable("multiplayer.disconnect.slow_login"));
27+
this.disconnect(UtilComponent.getTranslatableComponent("multiplayer.disconnect.slow_login"));
2728
}
2829
ci.cancel();
2930
}

0 commit comments

Comments
 (0)