From 1b023932db44a475b28be66368aa55bd4833635c Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 18 Nov 2023 20:28:03 -0500 Subject: [PATCH] removed testrules --- elements/TestRules.mod.json | 9 ----- elements/TestRulesP.mod.json | 7 ---- heartgeodes.mcreator | 40 ------------------- .../heartgeodes/command/TestRulesCommand.java | 38 ------------------ .../procedures/TestRulesPProcedure.java | 33 --------------- 5 files changed, 127 deletions(-) delete mode 100644 elements/TestRules.mod.json delete mode 100644 elements/TestRulesP.mod.json delete mode 100644 src/main/java/net/seaswimmerthefsh/heartgeodes/command/TestRulesCommand.java delete mode 100644 src/main/java/net/seaswimmerthefsh/heartgeodes/procedures/TestRulesPProcedure.java diff --git a/elements/TestRules.mod.json b/elements/TestRules.mod.json deleted file mode 100644 index aa7a6c9..0000000 --- a/elements/TestRules.mod.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "_fv": 47, - "_type": "command", - "definition": { - "commandName": "testrules", - "permissionLevel": "4", - "argsxml": "enableTestRulesP" - } -} \ No newline at end of file diff --git a/elements/TestRulesP.mod.json b/elements/TestRulesP.mod.json deleted file mode 100644 index 6055a2f..0000000 --- a/elements/TestRulesP.mod.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "_fv": 47, - "_type": "procedure", - "definition": { - "procedurexml": "no_ext_triggerenabledKEEP_INVENTORYTRUEDO_MOB_SPAWNINGFALSEDO_DAYLIGHT_CYCLEFALSEDO_WEATHER_CYCLEFALSETest rules enabled!FALSEKEEP_INVENTORYFALSEDO_MOB_SPAWNINGTRUEDO_DAYLIGHT_CYCLETRUEDO_WEATHER_CYCLETRUETest rules disabled!FALSE" - } -} \ No newline at end of file diff --git a/heartgeodes.mcreator b/heartgeodes.mcreator index 34618bd..4c381eb 100644 --- a/heartgeodes.mcreator +++ b/heartgeodes.mcreator @@ -61,46 +61,6 @@ ] } }, - { - "name": "TestRules", - "type": "command", - "sortid": 6, - "compiles": true, - "locked_code": false, - "registry_name": "test_rules", - "metadata": { - "files": [ - "src/main/java/net/seaswimmerthefsh/heartgeodes/command/TestRulesCommand.java" - ] - } - }, - { - "name": "TestRulesP", - "type": "procedure", - "sortid": 7, - "compiles": true, - "locked_code": false, - "registry_name": "test_rules_p", - "metadata": { - "files": [ - "src/main/java/net/seaswimmerthefsh/heartgeodes/procedures/TestRulesPProcedure.java" - ], - "dependencies": [ - { - "name": "arguments", - "type": "cmdcontext" - }, - { - "name": "entity", - "type": "entity" - }, - { - "name": "world", - "type": "world" - } - ] - } - }, { "name": "LargeHeartBud", "type": "block", diff --git a/src/main/java/net/seaswimmerthefsh/heartgeodes/command/TestRulesCommand.java b/src/main/java/net/seaswimmerthefsh/heartgeodes/command/TestRulesCommand.java deleted file mode 100644 index 6170f5e..0000000 --- a/src/main/java/net/seaswimmerthefsh/heartgeodes/command/TestRulesCommand.java +++ /dev/null @@ -1,38 +0,0 @@ - -package net.seaswimmerthefsh.heartgeodes.command; - -import org.checkerframework.checker.units.qual.s; - -import net.seaswimmerthefsh.heartgeodes.procedures.TestRulesPProcedure; - -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.event.RegisterCommandsEvent; -import net.minecraftforge.common.util.FakePlayerFactory; - -import net.minecraft.world.entity.Entity; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.core.Direction; -import net.minecraft.commands.Commands; - -import com.mojang.brigadier.arguments.BoolArgumentType; - -@Mod.EventBusSubscriber -public class TestRulesCommand { - @SubscribeEvent - public static void registerCommand(RegisterCommandsEvent event) { - event.getDispatcher().register(Commands.literal("testrules").requires(s -> s.hasPermission(4)).then(Commands.argument("enable", BoolArgumentType.bool()).executes(arguments -> { - ServerLevel world = arguments.getSource().getLevel(); - double x = arguments.getSource().getPosition().x(); - double y = arguments.getSource().getPosition().y(); - double z = arguments.getSource().getPosition().z(); - Entity entity = arguments.getSource().getEntity(); - if (entity == null) - entity = FakePlayerFactory.getMinecraft(world); - Direction direction = entity.getDirection(); - - TestRulesPProcedure.execute(world, arguments, entity); - return 0; - }))); - } -} diff --git a/src/main/java/net/seaswimmerthefsh/heartgeodes/procedures/TestRulesPProcedure.java b/src/main/java/net/seaswimmerthefsh/heartgeodes/procedures/TestRulesPProcedure.java deleted file mode 100644 index 1765770..0000000 --- a/src/main/java/net/seaswimmerthefsh/heartgeodes/procedures/TestRulesPProcedure.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.seaswimmerthefsh.heartgeodes.procedures; - -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.GameRules; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.Entity; -import net.minecraft.network.chat.Component; -import net.minecraft.commands.CommandSourceStack; - -import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.arguments.BoolArgumentType; - -public class TestRulesPProcedure { - public static void execute(LevelAccessor world, CommandContext arguments, Entity entity) { - if (entity == null) - return; - if (BoolArgumentType.getBool(arguments, "enabled")) { - world.getLevelData().getGameRules().getRule(GameRules.RULE_KEEPINVENTORY).set(true, world.getServer()); - world.getLevelData().getGameRules().getRule(GameRules.RULE_DOMOBSPAWNING).set(false, world.getServer()); - world.getLevelData().getGameRules().getRule(GameRules.RULE_DAYLIGHT).set(false, world.getServer()); - world.getLevelData().getGameRules().getRule(GameRules.RULE_WEATHER_CYCLE).set(false, world.getServer()); - if (entity instanceof Player _player && !_player.level().isClientSide()) - _player.displayClientMessage(Component.literal("Test rules enabled!"), false); - } else { - world.getLevelData().getGameRules().getRule(GameRules.RULE_KEEPINVENTORY).set(false, world.getServer()); - world.getLevelData().getGameRules().getRule(GameRules.RULE_DOMOBSPAWNING).set(true, world.getServer()); - world.getLevelData().getGameRules().getRule(GameRules.RULE_DAYLIGHT).set(true, world.getServer()); - world.getLevelData().getGameRules().getRule(GameRules.RULE_WEATHER_CYCLE).set(true, world.getServer()); - if (entity instanceof Player _player && !_player.level().isClientSide()) - _player.displayClientMessage(Component.literal("Test rules disabled!"), false); - } - } -}