Add reaction reload command and fix a few things

hjake123 · Oct 15, 2024 · a21aeac · a21aeac
1 parent 78c8fc6
commit a21aeac
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/main/java/com/hyperlynx/reactive/alchemy/rxn/Reaction.java b/src/main/java/com/hyperlynx/reactive/alchemy/rxn/Reaction.java
@@ -68,7 +68,7 @@ public Reaction(String alias, Power... powers){
  }
 
  public MutableComponent getName(){
- return name;
+ return name.copy();
  }
 
  public Reaction setStimulus(Stimulus rxs){

diff --git a/src/main/java/com/hyperlynx/reactive/alchemy/rxn/ReactionMan.java b/src/main/java/com/hyperlynx/reactive/alchemy/rxn/ReactionMan.java
@@ -30,7 +30,6 @@ public class ReactionMan {
  private static final ReactionMap REACTIONS = new ReactionMap();
  public static ArrayList<Power> BASE_POWER_LIST = new ArrayList<>();
  public static ReactionCriteriaBuilder CRITERIA_BUILDER = new ReactionCriteriaBuilder();
- public static Map<String, MutableComponent> REACTION_NAME = new HashMap<>();
 
  public ReactionMan(){
  CRITERIA_BUILDER.add("curse_assimilation");
@@ -79,6 +78,13 @@ public List<Reaction> getReactions(){
  return REACTIONS.values().stream().toList();
  }
 
+ public List<String> getReactionAliases(){
+ if(!initialized){
+ constructReactions();
+ }
+ return REACTIONS.keySet().stream().toList();
+ }
+
  public Reaction get(String alias){
  if(!initialized){
  constructReactions();

diff --git a/src/main/java/com/hyperlynx/reactive/cmd/ReactiveCommand.java b/src/main/java/com/hyperlynx/reactive/cmd/ReactiveCommand.java
@@ -30,6 +30,9 @@
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static net.minecraft.commands.arguments.coordinates.BlockPosArgument.ERROR_NOT_LOADED;
 
 @EventBusSubscriber(modid= ReactiveMod.MODID, bus=EventBusSubscriber.Bus.GAME)
@@ -45,8 +48,11 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
  .then(Commands.literal("give_warp_bottle").then(Commands.argument("target", BlockPosArgument.blockPos())
  .executes((context) -> giveWarpBottle(context.getSource(), context.getArgument("target", WorldCoordinates.class)))))
 
- .then(Commands.literal("list_reactions")
- .executes((context) -> listReactions(context.getSource())))
+ .then(Commands.literal("reaction")
+ .then(Commands.literal("list")
+ .executes((context) -> listReactions(context.getSource())))
+ .then(Commands.literal("reload")
+ .executes((context) -> reloadReactions())))
 
  .then(Commands.literal("power")
  .then(Commands.literal("add")
@@ -72,6 +78,11 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
  dispatcher.register(command_builder);
  }
 
+ private static int reloadReactions() {
+ ReactiveMod.REACTION_MAN.reset();
+ return 1;
+ }
+
  private static int modifyPower(CommandSourceStack source, WorldCoordinates crucible_location, ResourceLocation power_location, Integer amount, boolean remove) throws CommandSyntaxException {
  BlockPos pos = crucible_location.getBlockPos(source);
  ServerLevel level = source.getLevel();
@@ -114,9 +125,11 @@ private static int listReactions(CommandSourceStack source) throws CommandSyntax
  if(!source.isPlayer()){
  throw ERROR_NO_PLAYER.create();
  }
- for(Reaction reaction : ReactiveMod.REACTION_MAN.getReactions()){
- source.sendSuccess(() -> Component.literal(reaction.getAlias() + " : " + reaction.getName().getString()), true);
- }
+ List<String> aliases = ReactiveMod.REACTION_MAN.getReactionAliases();
+ aliases.stream().sorted().forEach((alias) -> {
+ Reaction reaction = ReactiveMod.REACTION_MAN.get(alias);
+ source.sendSuccess(() -> Component.literal(alias + " : " + reaction.getName().getString()), true);
+ });
  return 1;
  }
 

diff --git a/src/main/resources/assets/reactive/lang/en_us.json b/src/main/resources/assets/reactive/lang/en_us.json
@@ -228,7 +228,7 @@
  "reaction.reactive.size_shrink_effect": "Reduction",
  "reaction.reactive.size_revert_effect": "Reduction Reversal",
  "reaction.reactive.size_revert_effect_2": "Enlargement Reversal",
- "reaction.reactive.slowfall": "Slow Falling",
+ "reaction.reactive.slowfall_effect": "Slow Falling",
  "reaction.reactive.smoke_annihilation": "Noxious Fumes",
  "reaction.reactive.soul_to_warp": "Soul to Warp Corruption",
  "reaction.reactive.verdant_consume": "Verdant-Vital Reaction",