[NOJANG] New GameRules API to access game rules in mods and fix paper command issues with LuckPerms

This commit is contained in:
2025-03-09 17:13:18 +02:00
parent 770f214dcf
commit fdbadd6696
61 changed files with 1545 additions and 94 deletions

View File

@@ -0,0 +1,32 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/world/level/BridgedGameRules.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/world/level/BridgedGameRules.java
@@ -10,7 +10,7 @@
// Wrapped Mojang Rules for convenience
public static final WrappedBooleanKey RULE_DOFIRETICK = WrappedBooleanKey.wrap(GameRules.RULE_DOFIRETICK);
- public static final WrappedBooleanKey RULE_ALLOWFIRETICKAWAYFROMPLAYERS = WrappedBooleanKey.wrap(GameRules.RULE_ALLOWFIRETICKAWAYFROMPLAYERS);
+ public static final WrappedBooleanKey RULE_ALLOWFIRETICKAWAYFROMPLAYERS = WrappedBooleanKey.wrap(null);
public static final WrappedBooleanKey RULE_MOBGRIEFING = WrappedBooleanKey.wrap(GameRules.RULE_MOBGRIEFING);
public static final WrappedBooleanKey RULE_KEEPINVENTORY = WrappedBooleanKey.wrap(GameRules.RULE_KEEPINVENTORY);
public static final WrappedBooleanKey RULE_DOMOBSPAWNING = WrappedBooleanKey.wrap(GameRules.RULE_DOMOBSPAWNING);
@@ -63,13 +63,19 @@
public static final WrappedBooleanKey RULE_ENDER_PEARLS_VANISH_ON_DEATH = WrappedBooleanKey.wrap(GameRules.RULE_ENDER_PEARLS_VANISH_ON_DEATH);
public static final WrappedIntegerKey RULE_MINECART_MAX_SPEED = WrappedIntegerKey.wrap(GameRules.RULE_MINECART_MAX_SPEED);
public static final WrappedIntegerKey RULE_SPAWN_CHUNK_RADIUS = WrappedIntegerKey.wrap(GameRules.RULE_SPAWN_CHUNK_RADIUS);
- public static final WrappedBooleanKey RULE_TNT_EXPLODES = WrappedBooleanKey.wrap(GameRules.RULE_TNT_EXPLODES);
+ public static final WrappedBooleanKey RULE_TNT_EXPLODES = WrappedBooleanKey.wrap(null);
public boolean getBoolean(WrappedBooleanKey key) {
+ if (key.toMojang() == null)
+ return false;
+
return internal.getBoolean(key.toMojang());
}
public int getInt(WrappedIntegerKey key) {
+ if (key.toMojang() == null)
+ return 0;
+
return internal.getInt(key.toMojang());
}

View File

@@ -1,11 +1,11 @@
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,6 +14,6 @@
@@ -14,6 +14,5 @@
}
rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/)
-//include 'Paper'
-
+include("Common", "Fabric", "NeoForge")
+include 'Paper'