diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleFactory.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleFactory.java index 0e1b309de..eb6960ce6 100644 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleFactory.java +++ b/fabric-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 createBooleanRule(boolean d * @return a boolean rule type */ public static GameRules.Type createBooleanRule(boolean defaultValue, BiConsumer changedCallback) { - return GameRulesBooleanRuleAccessor.invokeCreate(defaultValue, changedCallback); + return GameRules.BooleanValue.create(defaultValue, changedCallback); } /** diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java index c8cb65f6f..03f138f68 100644 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java +++ b/fabric-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 > GameRules.Key register(String name, GameRules.Category category, GameRules.Type type) { - return GameRulesAccessor.callRegister(name, category, type); + return GameRules.register(name, category, type); } /** @@ -58,7 +58,7 @@ public static > GameRules.Key register(String na * @throws IllegalStateException if a rule of the same name already exists */ public static > GameRules.Key register(String name, CustomGameRuleCategory category, GameRules.Type type) { - final GameRules.Key key = GameRulesAccessor.callRegister(name, GameRules.Category.MISC, type); + final GameRules.Key key = GameRules.register(name, GameRules.Category.MISC, type); ((RuleKeyExtensions) (Object) key).fabric_setCustomCategory(category); return key; } diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRuleCommandAccessor.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRuleCommandAccessor.java index c2b8b5404..c6f128c54 100644 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRuleCommandAccessor.java +++ b/fabric-game-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 > int invokeExecuteSet(CommandContext commandContext, GameRules.Key ruleKey) { - throw new AssertionError("This shouldn't happen!"); - } - - @Invoker + @Invoker("queryRule") static > int invokeExecuteQuery(CommandSourceStack serverCommandSource, GameRules.Key ruleKey) { throw new AssertionError("This shouldn't happen!"); } diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesAccessor.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesAccessor.java index 3039c1b17..d70b4edd4 100644 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesAccessor.java +++ b/fabric-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 > GameRules.Key callRegister(String name, GameRules.Category category, GameRules.Type type) { - throw new AssertionError("This shouldn't happen!"); - } - @Accessor("GAME_RULE_TYPES") static Map, GameRules.Type> getRuleTypes() { throw new AssertionError("This shouldn't happen!"); diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesBooleanRuleAccessor.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesBooleanRuleAccessor.java deleted file mode 100644 index 822ef421b..000000000 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/mixin/gamerule/GameRulesBooleanRuleAccessor.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.mixin.gamerule; - -import java.util.function.BiConsumer; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.level.GameRules; - -@Mixin(GameRules.BooleanValue.class) -public interface GameRulesBooleanRuleAccessor { - @Invoker - static GameRules.Type invokeCreate(boolean initialValue, BiConsumer changeCallback) { - throw new AssertionError("This shouldn't happen!"); - } -} 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 index 246772bb2..8e695c79a 100644 --- 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 index 2b5f59786..093874ec7 100644 --- 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'