firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[PORT] 25w35a

Browse Source
This commit is contained in:
HypherionSA
2025-08-26 22:31:53 +02:00
parent aba17260c3
commit 402fb532e0
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/Jenkinsfile.deploy
View File

@@ -1,5 +1,5 @@
def JDK = "21" def JDK = "21"
def majorMc = "1.21.6"; def majorMc = "1.21.9";
pipeline { pipeline {
agent { agent {

4
.jenkins/Jenkinsfile.snapshot
View File

@@ -1,9 +1,9 @@
def projectName = "CraterLib"; def projectName = "CraterLib";
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
def JDK = "21"; def JDK = "21";
def majorMc = "25w31a"; def majorMc = "25w35a";
def modLoaders = "fabric|quilt"; def modLoaders = "fabric|quilt";
def supportedMc = "25w31a"; def supportedMc = "25w35a";
def reltype = "experimental"; def reltype = "experimental";
pipeline { pipeline {

7
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/WhitelistMixin.java
View File

@@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "rawtypes"})
@Mixin(StoredUserList.class) @Mixin(StoredUserList.class)
@@ -20,7 +21,7 @@ public abstract class WhitelistMixin<K, V extends StoredUserEntry<K>> {
@Shadow protected abstract boolean contains(K k0); @Shadow protected abstract boolean contains(K k0);
@Inject(method = "add", at = @At("HEAD")) @Inject(method = "add", at = @At("HEAD"))
private void injectAddEvent(V arg, CallbackInfo ci) { private void injectAddEvent(V arg, CallbackInfoReturnable<Boolean> cir) {
try { try {
if (arg instanceof UserWhiteListEntry entry) { if (arg instanceof UserWhiteListEntry entry) {
StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry; StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry;
@@ -31,8 +32,8 @@ public abstract class WhitelistMixin<K, V extends StoredUserEntry<K>> {
} catch (Exception ignored) {} } catch (Exception ignored) {}
} }
@Inject(method = "remove(Lnet/minecraft/server/players/StoredUserEntry;)V", at = @At("HEAD")) @Inject(method = "remove(Lnet/minecraft/server/players/StoredUserEntry;)Z", at = @At("HEAD"))
private void injectRemoveEvent(V arg, CallbackInfo ci) { private void injectRemoveEvent(StoredUserEntry<K> arg, CallbackInfoReturnable<Boolean> cir) {
try { try {
if (arg instanceof UserWhiteListEntry entry) { if (arg instanceof UserWhiteListEntry entry) {
StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry; StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry;

4
Common/src/main/java/com/hypherionmc/craterlib/nojang/authlib/BridgedGameProfile.java
View File

@@ -20,11 +20,11 @@ public class BridgedGameProfile {
} }
public String getName() { public String getName() {
return internal.getName(); return internal.name();
} }
public UUID getId() { public UUID getId() {
return internal.getId(); return internal.id();
} }
public GameProfile toMojang() { public GameProfile toMojang() {

4
gradle.properties
View File

@@ -10,12 +10,12 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=25w31a minecraft_version=25w35a
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.16.13 fabric_loader=0.16.13
fabric_api=0.128.2+1.21.6 fabric_api=0.132.3+1.21.9
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6