Infection command and refactoring

Author: Mallowwww

src/main/java/world/landfall/infection/ModInfections.java

@@ -10,6 +10,7 @@
 import world.landfall.infection.api.Infection;
 import world.landfall.infection.api.InfectionRegistry;
 import world.landfall.infection.api.InfectionStage;
+import world.landfall.infection.infections.CommonColdInfection;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,8 +21,8 @@ public class ModInfections {
     private static final DeferredRegister<InfectionStage> STAGES = DeferredRegister.create(InfectionRegistry.STAGE_REGISTRY, InfectionMod.MODID);
     public static final DeferredHolder<InfectionStage,InfectionStage> NONE_STAGE = STAGES.register("none", () -> new InfectionStage() {
         @Override
-        public Supplier<? extends InfectionStage> nextStage() {
-            return NONE_STAGE;
+        public ResourceLocation nextStage() {
+            return NONE_STAGE.getId();
         }
 
         @Override
@@ -51,15 +52,17 @@ public ResourceLocation location() {
         }
 
         @Override
-        public DeferredHolder<InfectionStage,InfectionStage> initialStage() {
-            return NONE_STAGE;
+        public ResourceLocation initialStage() {
+            return NONE_STAGE.getId();
         }
 
         @Override
         public Collection<ResourceLocation> validStages() {
             return List.of(InfectionMod.path("none"));
         }
     });
+    public static final DeferredHolder<InfectionStage, InfectionStage> COMMON_COLD_INITIAL_STAGE = STAGES.register("common_cold_initial", CommonColdInfection.CommonColdStageOne::new);
+    public static final DeferredHolder<Infection, Infection> COMMON_COLD_INFECTION = INFECTIONS.register("common_cold", CommonColdInfection::new);
     public static void register(IEventBus eventBus) {
         STAGES.register(eventBus);
         INFECTIONS.register(eventBus);

src/main/java/world/landfall/infection/api/Infection.java

@@ -7,6 +7,7 @@
 import net.neoforged.neoforge.event.tick.PlayerTickEvent;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import world.landfall.infection.InfectionMod;
+import world.landfall.infection.ModInfections;
 
 import java.util.Collection;
 import java.util.List;
@@ -22,10 +23,10 @@ public void tick(Player player) {
             return;
         currentStage.tick(player);
         if (currentStage.getTimeExisted() >= currentStage.lengthInTicks() && currentStage.lengthInTicks() >= 0)
-            currentStage = currentStage.nextStage().get();
+            currentStage = ModInfections.NONE_STAGE.get();
     }
     public void activate() {
-        currentStage = initialStage().get();
+        currentStage = InfectionRegistry.STAGE_REGISTRY.get(initialStage());
     }
     public boolean isActive() {
         return currentStage != null;
@@ -34,6 +35,6 @@ public InfectionStage getCurrentStage() {
         return currentStage;
     }
     public abstract ResourceLocation location();
-    public abstract DeferredHolder<InfectionStage,InfectionStage> initialStage();
+    public abstract ResourceLocation initialStage();
     public abstract Collection<ResourceLocation> validStages();
 }

src/main/java/world/landfall/infection/api/InfectionRegistry.java

@@ -43,11 +43,16 @@ private static void onPlayerPostTick(PlayerTickEvent.Post event) {
             throw new IllegalStateException("Error ticking infection "+infection.location().getPath()+" ! Infection is not registered.");
         }
         if (!infection.isActive()) {
-            infection.activate(); // TODO: Support infections that "gestate" for a period
             return;
         }
+        if (infection.getCurrentStage().location() == null) {
+            LOGGER.error("Error ticking infection {} ! Current stage has no location.", infection.location().getPath());
+        }
         if (infection.validStages().stream().noneMatch(infection.getCurrentStage().location()::equals)) {
-            LOGGER.error("Error ticking infection {} ! Current stage is not valid.", infection.location().getPath());
+            System.out.println(infection.validStages());
+            System.out.println(infection.getCurrentStage().location());
+            //LOGGER.error("Error ticking infection {} ! Current stage is not valid.", infection.location().getPath());
+            player.setData(ModAttachments.ACTIVE_INFECTION, ModInfections.NONE_INFECTION.get());
             return;
         }
         infection.tick(player);

src/main/java/world/landfall/infection/api/InfectionStage.java

@@ -13,7 +13,7 @@
 
 public abstract class InfectionStage {
     private int timeExisted = 0;
-    public abstract Supplier<? extends InfectionStage> nextStage();
+    public abstract ResourceLocation nextStage();
     public abstract int stageNumber();
     public abstract int lengthInTicks(); // make this negative if it does not advance to another stage
     public abstract Collection<Holder<MobEffect>> currentEffects();

src/main/java/world/landfall/infection/command/InfectionCommand.java

@@ -0,0 +1,73 @@
+package world.landfall.infection.command;
+
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.builder.ArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.commands.arguments.ResourceArgument;
+import net.minecraft.commands.arguments.selector.EntitySelector;
+import net.minecraft.commands.synchronization.ArgumentTypeInfos;
+import net.minecraft.commands.synchronization.ArgumentUtils;
+import net.minecraft.core.Holder;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.event.RegisterCommandsEvent;
+import world.landfall.infection.InfectionMod;
+import world.landfall.infection.ModAttachments;
+import world.landfall.infection.ModInfections;
+import world.landfall.infection.api.Infection;
+import world.landfall.infection.api.InfectionRegistry;
+
+@EventBusSubscriber(modid = InfectionMod.MODID)
+public class InfectionCommand {
+    @SubscribeEvent
+    public static void registerCommands(RegisterCommandsEvent event) {
+        var dispatcher = event.getDispatcher();
+        dispatcher.register(Commands.literal("infection")
+                .requires(source -> source.hasPermission(2))
+                .then(Commands.literal("infect")
+                        .then(Commands.argument("player", EntityArgument.player())
+                                .then(Commands.argument("infection", ResourceArgument.resource(event.getBuildContext(), InfectionRegistry.INFECTION_REGISTRY_KEY))
+                                        .executes(InfectionCommand::infect)
+                                )
+
+                        )
+                ).then(Commands.literal("get")
+                        .then(Commands.argument("player", EntityArgument.player())
+                                .executes(InfectionCommand::get)
+                        )
+                )
+        );
+    }
+
+    private static int get(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
+        var player = ctx.getArgument("player", EntitySelector.class).findSinglePlayer(ctx.getSource());
+        if (!player.hasData(ModAttachments.ACTIVE_INFECTION)) {
+            ctx.getSource().sendSystemMessage(Component.translatable("command.infection.get.fail"));
+            return -1;
+        }
+        var infection = player.getData(ModAttachments.ACTIVE_INFECTION);
+        ctx.getSource().sendSystemMessage(Component.translatable("command.infection.get.success",infection.location().toString()));
+        return 1;
+    }
+
+    private static int infect(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
+        var player = ctx.getArgument("player", EntitySelector.class).findSinglePlayer(ctx.getSource());
+        Holder.Reference<Infection> infectionReference = ctx.getArgument("infection", Holder.Reference.class);
+        var infection = InfectionRegistry.INFECTION_REGISTRY.get(infectionReference.key());
+        if (infection == null)
+            return -1;
+        player.setData(ModAttachments.ACTIVE_INFECTION, infection);
+        infection.activate();
+        ctx.getSource().sendSystemMessage(Component.translatable("command.infection.infect.success",infection.location().toString(), player.getName()));
+        return 1;
+    }
+
+}

src/main/java/world/landfall/infection/infections/CommonColdInfection.java

@@ -1,9 +1,15 @@
 package world.landfall.infection.infections;
 
+import net.minecraft.core.Holder;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.effect.MobEffect;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import world.landfall.infection.InfectionMod;
+import world.landfall.infection.ModInfections;
 import world.landfall.infection.api.Infection;
+import world.landfall.infection.api.InfectionRegistry;
 import world.landfall.infection.api.InfectionStage;
 
 import java.util.Collection;
@@ -18,12 +24,41 @@ public ResourceLocation location() {
     }
 
     @Override
-    public DeferredHolder<InfectionStage, InfectionStage> initialStage() {
-        return null;
+    public ResourceLocation initialStage() {
+        return ResourceLocation.parse("infection:common_cold_initial");
     }
 
     @Override
     public Collection<ResourceLocation> validStages() {
-        return List.of();
+        return List.of(ModInfections.COMMON_COLD_INITIAL_STAGE.getId());
+    }
+    public static class CommonColdStageOne extends InfectionStage {
+
+        @Override
+        public ResourceLocation nextStage() {
+            return ModInfections.NONE_STAGE.getId();
+        }
+
+        @Override
+        public int stageNumber() {
+            return 0;
+        }
+
+        @Override
+        public int lengthInTicks() {
+            return 200;
+        }
+
+        @Override
+        public Collection<Holder<MobEffect>> currentEffects() {
+            return List.of(
+                    MobEffects.WEAKNESS
+            );
+        }
+
+        @Override
+        public ResourceLocation location() {
+            return InfectionMod.path("common_cold_initial");
+        }
     }
 }

src/main/resources/assets/examplemod/lang/en_us.json

@@ -9,5 +9,8 @@
   "examplemod.configuration.items": "Item List",
   "examplemod.configuration.logDirtBlock": "Log Dirt Block",
   "examplemod.configuration.magicNumberIntroduction": "Magic Number Text",
-  "examplemod.configuration.magicNumber": "Magic Number"
+  "examplemod.configuration.magicNumber": "Magic Number",
+  "command.infection.infect.success": "Applied %s to player %s.",
+  "command.infection.get.fail": "Player does not have infection component.",
+  "command.infection.get.success": "Player has infection %s."
 }