Port fabric-game-rule-api-v1

ThexXTURBOXx · Jun 15, 2024 · 583274e · 583274e
1 parent 29f188c
commit 583274e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 51 deletions.
diff --git a/...c-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleFactory.java b/...c-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleFactory.java
@@ -30,7 +30,6 @@
 import net.fabricmc.fabric.api.gamerule.v1.rule.EnumRule;
 import net.fabricmc.fabric.impl.gamerule.EnumRuleType;
 import net.fabricmc.fabric.impl.gamerule.rule.BoundedIntRule;
-import net.fabricmc.fabric.mixin.gamerule.GameRulesBooleanRuleAccessor;
 
 /**
  * A utility class containing factory methods to create game rule types.
@@ -69,7 +68,7 @@ public static GameRules.Type<GameRules.BooleanValue> createBooleanRule(boolean d
 	 * @return a boolean rule type
 	 */
 	public static GameRules.Type<GameRules.BooleanValue> createBooleanRule(boolean defaultValue, BiConsumer<MinecraftServer, GameRules.BooleanValue> changedCallback) {
-		return GameRulesBooleanRuleAccessor.invokeCreate(defaultValue, changedCallback);
+		return GameRules.BooleanValue.create(defaultValue, changedCallback);
 	}
 
 	/**

diff --git a/...-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java b/...-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java
@@ -44,7 +44,7 @@ private GameRuleRegistry() {
 	 * @throws IllegalStateException if a rule of the same name already exists
 	 */
 	public static <T extends GameRules.Value<T>> GameRules.Key<T> register(String name, GameRules.Category category, GameRules.Type<T> type) {
-		return GameRulesAccessor.callRegister(name, category, type);
+		return GameRules.register(name, category, type);
 	}
 
 	/**
@@ -58,7 +58,7 @@ public static <T extends GameRules.Value<T>> GameRules.Key<T> register(String na
 	 * @throws IllegalStateException if a rule of the same name already exists
 	 */
 	public static <T extends GameRules.Value<T>> GameRules.Key<T> register(String name, CustomGameRuleCategory category, GameRules.Type<T> type) {
-		final GameRules.Key<T> key = GameRulesAccessor.callRegister(name, GameRules.Category.MISC, type);
+		final GameRules.Key<T> key = GameRules.register(name, GameRules.Category.MISC, type);
 		((RuleKeyExtensions) (Object) key).fabric_setCustomCategory(category);
 		return key;
 	}

diff --git a/...rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRuleCommandAccessor.java b/...rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRuleCommandAccessor.java
@@ -16,7 +16,6 @@
 
 package net.fabricmc.fabric.mixin.gamerule;
 
-import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.commands.GameRuleCommand;
 import net.minecraft.world.level.GameRules;
@@ -25,12 +24,7 @@
 
 @Mixin(GameRuleCommand.class)
 public interface GameRuleCommandAccessor {
-	@Invoker
-	static <T extends GameRules.Value<T>> int invokeExecuteSet(CommandContext<CommandSourceStack> commandContext, GameRules.Key<T> ruleKey) {
-		throw new AssertionError("This shouldn't happen!");
-	}
-
-	@Invoker
+	@Invoker("queryRule")
 	static <T extends GameRules.Value<T>> int invokeExecuteQuery(CommandSourceStack serverCommandSource, GameRules.Key<T> ruleKey) {
 		throw new AssertionError("This shouldn't happen!");
 	}

diff --git a/...-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesAccessor.java b/...-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesAccessor.java
@@ -24,11 +24,6 @@
 
 @Mixin(GameRules.class)
 public interface GameRulesAccessor {
-	@Invoker("register")
-	static <T extends GameRules.Value<T>> GameRules.Key<T> callRegister(String name, GameRules.Category category, GameRules.Type<T> type) {
-		throw new AssertionError("This shouldn't happen!");
-	}
-
 	@Accessor("GAME_RULE_TYPES")
 	static Map<GameRules.Key<?>, GameRules.Type<?>> getRuleTypes() {
 		throw new AssertionError("This shouldn't happen!");

diff --git a/...api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesBooleanRuleAccessor.java b/...api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesBooleanRuleAccessor.java
diff --git a/fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json b/fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json
@@ -3,7 +3,7 @@
   "package": "net.fabricmc.fabric.mixin.gamerule",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "GameRulesBooleanRuleAccessor",
+
     "GameRuleCommandAccessor",
     "GameRuleCommandVisitorMixin",
     "GameRulesAccessor",

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -45,7 +45,7 @@ include("fabric-command-api-v2")
 //include 'fabric-dimensions-v1'
 //include 'fabric-entity-events-v1'
 //include 'fabric-events-interaction-v0'
-//include("fabric-game-rule-api-v1")
+include("fabric-game-rule-api-v1")
 include("fabric-gametest-api-v1")
 //include 'fabric-item-api-v1'
 //include 'fabric-item-group-api-v1'