diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy index 017618b..07cf8b4 100644 --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ def JDK = "21" -def majorMc = "1.21.6"; +def majorMc = "1.21.9"; pipeline { agent { diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot index 1e4ebea..fa2a8cc 100644 --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot @@ -1,9 +1,9 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; def JDK = "21"; -def majorMc = "25w31a"; +def majorMc = "25w35a"; def modLoaders = "fabric|quilt"; -def supportedMc = "25w31a"; +def supportedMc = "25w35a"; def reltype = "experimental"; pipeline { diff --git a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/WhitelistMixin.java b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/WhitelistMixin.java index f2e7d06..0a7522b 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/WhitelistMixin.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/WhitelistMixin.java @@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @SuppressWarnings({"unchecked", "rawtypes"}) @Mixin(StoredUserList.class) @@ -20,7 +21,7 @@ public abstract class WhitelistMixin> { @Shadow protected abstract boolean contains(K k0); @Inject(method = "add", at = @At("HEAD")) - private void injectAddEvent(V arg, CallbackInfo ci) { + private void injectAddEvent(V arg, CallbackInfoReturnable cir) { try { if (arg instanceof UserWhiteListEntry entry) { StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry; @@ -31,8 +32,8 @@ public abstract class WhitelistMixin> { } catch (Exception ignored) {} } - @Inject(method = "remove(Lnet/minecraft/server/players/StoredUserEntry;)V", at = @At("HEAD")) - private void injectRemoveEvent(V arg, CallbackInfo ci) { + @Inject(method = "remove(Lnet/minecraft/server/players/StoredUserEntry;)Z", at = @At("HEAD")) + private void injectRemoveEvent(StoredUserEntry arg, CallbackInfoReturnable cir) { try { if (arg instanceof UserWhiteListEntry entry) { StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry; diff --git a/Common/src/main/java/com/hypherionmc/craterlib/nojang/authlib/BridgedGameProfile.java b/Common/src/main/java/com/hypherionmc/craterlib/nojang/authlib/BridgedGameProfile.java index 5623102..2fd0ef1 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/authlib/BridgedGameProfile.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/authlib/BridgedGameProfile.java @@ -20,11 +20,11 @@ public class BridgedGameProfile { } public String getName() { - return internal.getName(); + return internal.name(); } public UUID getId() { - return internal.getId(); + return internal.id(); } public GameProfile toMojang() { diff --git a/gradle.properties b/gradle.properties index 16a7dc3..c743034 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,12 +10,12 @@ mod_id=craterlib mod_name=CraterLib # Shared -minecraft_version=25w31a +minecraft_version=25w35a project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.16.13 -fabric_api=0.128.2+1.21.6 +fabric_api=0.132.3+1.21.9 # Forge forge_version=50.0.6