From f7784aa574dd3ca05bae3ef0ff00cbdcdac4b457 Mon Sep 17 00:00:00 2001 From: anhgelus Date: Sun, 25 Aug 2024 14:36:00 +0000 Subject: feat(config): gamerule to enable/disable portals --- src/main/java/world/anhgelus/molehunt/Molehunt.java | 5 +++++ src/main/java/world/anhgelus/molehunt/config/Config.java | 12 +++++++++++- src/main/java/world/anhgelus/molehunt/mixin/NoPortals.java | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/world/anhgelus/molehunt/Molehunt.java b/src/main/java/world/anhgelus/molehunt/Molehunt.java index 52399dc..58c43f2 100644 --- a/src/main/java/world/anhgelus/molehunt/Molehunt.java +++ b/src/main/java/world/anhgelus/molehunt/Molehunt.java @@ -94,6 +94,11 @@ public class Molehunt implements ModInitializer { GameRules.Category.MISC, GameRuleFactory.createIntRule(CONFIG_FILE.getOrDefault("border_moving_starting_time_offset", 10), 0) ); + public static final GameRules.Key ENABLE_PORTALS = GameRuleRegistry.register( + MOD_ID +":enablePortals", + GameRules.Category.MISC, + GameRuleFactory.createBooleanRule(CONFIG_FILE.getOrDefault("enable_portals", false)) + ); public Game game; diff --git a/src/main/java/world/anhgelus/molehunt/config/Config.java b/src/main/java/world/anhgelus/molehunt/config/Config.java index e1c84a4..b2e45ab 100644 --- a/src/main/java/world/anhgelus/molehunt/config/Config.java +++ b/src/main/java/world/anhgelus/molehunt/config/Config.java @@ -60,6 +60,10 @@ public class Config { return server.getGameRules().getInt(Molehunt.MOVING_STARTING_TIME_OFFSET); } + public boolean arePortalsEnabled() { + return server.getGameRules().getBoolean(Molehunt.ENABLE_PORTALS); + } + public static SimpleConfig configFile(String fileName) { return SimpleConfig.of(fileName).provider(Config::defaultConfig).request(); } @@ -102,7 +106,7 @@ public class Config { show_tab = false - # World border settings : + # World border settings # Initial world size (in blocks). # Default: 200 blocks. @@ -117,6 +121,12 @@ public class Config { # If this value is greater than the game duration, borders will never move. # Default: 10 minutes. border_moving_starting_time_offset = 10 + + # Other + + # Enable portals (nether, end, end gateway) + # Default: false + enable_portals = false """; } } diff --git a/src/main/java/world/anhgelus/molehunt/mixin/NoPortals.java b/src/main/java/world/anhgelus/molehunt/mixin/NoPortals.java index 8ab8f14..96c63aa 100644 --- a/src/main/java/world/anhgelus/molehunt/mixin/NoPortals.java +++ b/src/main/java/world/anhgelus/molehunt/mixin/NoPortals.java @@ -7,11 +7,13 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import world.anhgelus.molehunt.Molehunt; @Mixin(PortalManager.class) public class NoPortals { @Inject(at = @At("HEAD"), method = "tick", cancellable = true) public void disableTick(ServerWorld world, Entity entity, boolean canUsePortals, CallbackInfoReturnable cir) { + if (Molehunt.CONFIG == null || Molehunt.CONFIG.arePortalsEnabled()) return; cir.setReturnValue(false); } } -- cgit v1.2.3