Small tweaks + CS

NucleoidMC · Dec 7, 2024 · 082f8c7 · 082f8c7
1 parent c71d368
commit 082f8c7
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 24 deletions.
diff --git a/src/main/java/com/hugman/uhc/command/ModulesCommand.java b/src/main/java/com/hugman/uhc/command/ModulesCommand.java
@@ -34,9 +34,11 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
                         .requires(ModulesCommand::supportsModules)
                         .executes(ModulesCommand::displayModules)
                         .then(CommandManager.literal("enable")
+                                .requires(source -> source.hasPermissionLevel(2))
                                 .then(UHCModuleArgument.argumentFromDisabled("module")
                                         .executes(context -> enableModule(context, UHCModuleArgument.get(context, MODULE_ARG)))))
                         .then(CommandManager.literal("disable")
+                                .requires(source -> source.hasPermissionLevel(2))
                                 .then(UHCModuleArgument.argumentFromEnabled("module")
                                         .executes(context -> disableModule(context, UHCModuleArgument.get(context, MODULE_ARG)))))
         );

diff --git a/src/main/java/com/hugman/uhc/game/ModuleManager.java b/src/main/java/com/hugman/uhc/game/ModuleManager.java
@@ -16,7 +16,8 @@
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.text.*;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;

diff --git a/src/main/java/com/hugman/uhc/modifier/Modifier.java b/src/main/java/com/hugman/uhc/modifier/Modifier.java
@@ -3,7 +3,6 @@
 import com.hugman.uhc.game.UHCPlayerManager;
 import com.hugman.uhc.registry.UHCRegistries;
 import com.mojang.serialization.Codec;
-import net.minecraft.server.PlayerManager;
 
 public interface Modifier {
     Codec<Modifier> TYPE_CODEC = UHCRegistries.MODIFIER_TYPE.getCodec().dispatch(Modifier::getType, ModifierType::codec);

diff --git a/src/main/java/com/hugman/uhc/modifier/PermanentEffectModifier.java b/src/main/java/com/hugman/uhc/modifier/PermanentEffectModifier.java
@@ -7,7 +7,6 @@
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 public record PermanentEffectModifier(
@@ -34,7 +33,7 @@ public void enable(UHCPlayerManager playerManager) {
     }
 
     @Override
-    public void disable(UHCPlayerManager  playerManager) {
+    public void disable(UHCPlayerManager playerManager) {
         playerManager.forEachAliveParticipant(player -> player.removeStatusEffect(this.effect));
     }
 }
diff --git a/src/main/java/com/hugman/uhc/modifier/PlayerAttributeModifier.java b/src/main/java/com/hugman/uhc/modifier/PlayerAttributeModifier.java
@@ -1,14 +1,12 @@
 package com.hugman.uhc.modifier;
 
-import com.hugman.uhc.UHC;
 import com.hugman.uhc.game.UHCPlayerManager;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.attribute.EntityAttributeInstance;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 public record PlayerAttributeModifier(

diff --git a/src/main/java/com/hugman/uhc/module/ModuleEvents.java b/src/main/java/com/hugman/uhc/module/ModuleEvents.java
@@ -1,6 +1,5 @@
 package com.hugman.uhc.module;
 
-import com.hugman.uhc.game.UHCPlayerManager;
 import net.minecraft.registry.entry.RegistryEntry;
 import xyz.nucleoid.stimuli.event.StimulusEvent;
 

diff --git a/src/main/resources/data/doublerunner/plasmid/game/test.json b/src/main/resources/data/doublerunner/plasmid/game/test.json