refactor(research): rename idea chip command and overhaul research tree

Author: MrSilly07

src/main/java/com/researchcube/command/ResearchCubeCommand.java

@@ -41,6 +41,16 @@ public class ResearchCubeCommand {
         );
     };
 
+    private static final SuggestionProvider<CommandSourceStack> SUGGEST_RESEARCH_WITH_IDEA_CHIP = (context, builder) -> {
+        Collection<ResearchDefinition> all = ResearchRegistry.getAll();
+        return SharedSuggestionProvider.suggestResource(
+                all.stream()
+                        .filter(def -> def.getIdeaChip().isPresent())
+                        .map(ResearchDefinition::getId),
+                builder
+        );
+    };
+
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
         dispatcher.register(Commands.literal("researchcube")
                 .requires(src -> src.hasPermission(2))
@@ -70,11 +80,11 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
                                 .executes(ctx -> addToDrive(ctx, false))
                                 .then(Commands.argument("force", BoolArgumentType.bool())
                                         .executes(ctx -> addToDrive(ctx, BoolArgumentType.getBool(ctx, "force"))))))
-                .then(Commands.literal("giveChip")
+                .then(Commands.literal("ideaChip")
                         .then(Commands.argument("player", EntityArgument.player())
                                 .then(Commands.argument("research", ResourceLocationArgument.id())
-                                        .suggests(SUGGEST_RESEARCH)
-                                        .executes(ResearchCubeCommand::giveChip))))
+                                        .suggests(SUGGEST_RESEARCH_WITH_IDEA_CHIP)
+                                        .executes(ResearchCubeCommand::giveIdeaChip))))
                 .then(Commands.literal("help")
                         .executes(ResearchCubeCommand::help))
         );
@@ -238,7 +248,7 @@ private static int addToDrive(CommandContext<CommandSourceStack> ctx, boolean fo
         return 1;
     }
 
-    private static int giveChip(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
+    private static int giveIdeaChip(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
         ServerPlayer player = EntityArgument.getPlayer(ctx, "player");
         ResourceLocation researchId = ResourceLocationArgument.getId(ctx, "research");
         CommandSourceStack source = ctx.getSource();
@@ -283,7 +293,7 @@ private static int help(CommandContext<CommandSourceStack> ctx) {
         source.sendSuccess(() -> Component.literal("/researchcube addToDrive <research> [force]")
                 .withStyle(ChatFormatting.YELLOW)
                 .append(Component.literal(" - Add research recipes to held drive").withStyle(ChatFormatting.GRAY)), false);
-        source.sendSuccess(() -> Component.literal("/researchcube giveChip <player> <research>")
+        source.sendSuccess(() -> Component.literal("/researchcube ideaChip <player> <research>")
                 .withStyle(ChatFormatting.YELLOW)
                 .append(Component.literal(" - Give the idea chip for a research").withStyle(ChatFormatting.GRAY)), false);
         source.sendSuccess(() -> Component.literal("/researchcube help")

src/main/resources/data/researchcube/advancement/research/advanced_processor.json

@@ -0,0 +1,20 @@
+{
+  "parent": "researchcube:root",
+  "display": {
+    "icon": {
+      "id": "researchcube:cube_advanced"
+    },
+    "title": "Alloy Blending",
+    "description": "Complete the Alloy Blending research",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "criteria": {
+    "research_complete": {
+      "trigger": "researchcube:complete_research",
+      "conditions": {
+        "research_id": "researchcube:alloy_blending"
+      }
+    }
+  }
+}

src/main/resources/data/researchcube/advancement/research/alloy_blending.json

@@ -4,16 +4,16 @@
     "icon": {
       "id": "researchcube:cube_unstable"
     },
-    "title": "Fragmented Data",
-    "description": "Complete the Fragmented Data research",
+    "title": "Basic Smelting",
+    "description": "Complete the Basic Smelting research",
     "show_toast": true,
     "announce_to_chat": true
   },
   "criteria": {
     "research_complete": {
       "trigger": "researchcube:complete_research",
       "conditions": {
-        "research_id": "researchcube:fragmented_data"
+        "research_id": "researchcube:basic_smelting"
       }
     }
   }

src/main/resources/data/researchcube/advancement/research/alloy_fabrication.json

@@ -4,16 +4,16 @@
     "icon": {
       "id": "researchcube:cube_basic"
     },
-    "title": "Energy Handling",
-    "description": "Complete the Energy Handling research",
+    "title": "Copper Shaping",
+    "description": "Complete the Copper Shaping research",
     "show_toast": true,
     "announce_to_chat": true
   },
   "criteria": {
     "research_complete": {
       "trigger": "researchcube:complete_research",
       "conditions": {
-        "research_id": "researchcube:energy_handling"
+        "research_id": "researchcube:copper_shaping"
       }
     }
   }

…dvancement/research/fragmented_data.json …advancement/research/basic_smelting.jsonsrc/main/resources/data/researchcube/advancement/research/fragmented_data.json renamed to src/main/resources/data/researchcube/advancement/research/basic_smelting.json src/main/resources/data/researchcube/advancement/research/fragmented_data.json renamed to src/main/resources/data/researchcube/advancement/research/basic_smelting.json

@@ -0,0 +1,20 @@
+{
+  "parent": "researchcube:root",
+  "display": {
+    "icon": {
+      "id": "researchcube:cube_self_aware"
+    },
+    "title": "Cosmic Assembly",
+    "description": "Complete the Cosmic Assembly research",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "criteria": {
+    "research_complete": {
+      "trigger": "researchcube:complete_research",
+      "conditions": {
+        "research_id": "researchcube:cosmic_assembly"
+      }
+    }
+  }
+}

src/main/resources/data/researchcube/advancement/research/biophotonic_matrix.json

@@ -0,0 +1,20 @@
+{
+  "parent": "researchcube:root",
+  "display": {
+    "icon": {
+      "id": "researchcube:cube_precise"
+    },
+    "title": "Crystal Growing",
+    "description": "Complete the Crystal Growing research",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "criteria": {
+    "research_complete": {
+      "trigger": "researchcube:complete_research",
+      "conditions": {
+        "research_id": "researchcube:crystal_growing"
+      }
+    }
+  }
+}