Ql/custom lp network

src/generated/resources/assets/cosmiccore/blockstates/soul_tester.json

@@ -0,0 +1,76 @@
+{
+  "variants": {
+    "facing=east,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 90
+    },
+    "facing=east,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 90
+    },
+    "facing=east,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 90
+    },
+    "facing=east,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 90
+    },
+    "facing=north,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/soul_tester"
+    },
+    "facing=north,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/soul_tester"
+    },
+    "facing=north,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/soul_tester"
+    },
+    "facing=north,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/soul_tester"
+    },
+    "facing=south,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 180
+    },
+    "facing=south,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 180
+    },
+    "facing=south,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 180
+    },
+    "facing=south,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 180
+    },
+    "facing=west,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 270
+    },
+    "facing=west,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 270
+    },
+    "facing=west,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 270
+    },
+    "facing=west,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/soul_tester",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/cosmiccore/blockstates/star_ladder.json

@@ -1,76 +1,7 @@
 {
   "variants": {
-    "facing=east,upwards_facing=east": {
-      "gtceu:z": 270,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 90
-    },
-    "facing=east,upwards_facing=north": {
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 90
-    },
-    "facing=east,upwards_facing=south": {
-      "gtceu:z": 180,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 90
-    },
-    "facing=east,upwards_facing=west": {
-      "gtceu:z": 90,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 90
-    },
-    "facing=north,upwards_facing=east": {
-      "gtceu:z": 270,
+    "": {
       "model": "cosmiccore:block/machine/star_ladder"
-    },
-    "facing=north,upwards_facing=north": {
-      "model": "cosmiccore:block/machine/star_ladder"
-    },
-    "facing=north,upwards_facing=south": {
-      "gtceu:z": 180,
-      "model": "cosmiccore:block/machine/star_ladder"
-    },
-    "facing=north,upwards_facing=west": {
-      "gtceu:z": 90,
-      "model": "cosmiccore:block/machine/star_ladder"
-    },
-    "facing=south,upwards_facing=east": {
-      "gtceu:z": 270,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 180
-    },
-    "facing=south,upwards_facing=north": {
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 180
-    },
-    "facing=south,upwards_facing=south": {
-      "gtceu:z": 180,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 180
-    },
-    "facing=south,upwards_facing=west": {
-      "gtceu:z": 90,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 180
-    },
-    "facing=west,upwards_facing=east": {
-      "gtceu:z": 270,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 270
-    },
-    "facing=west,upwards_facing=north": {
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 270
-    },
-    "facing=west,upwards_facing=south": {
-      "gtceu:z": 180,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 270
-    },
-    "facing=west,upwards_facing=west": {
-      "gtceu:z": 90,
-      "model": "cosmiccore:block/machine/star_ladder",
-      "y": 270
     }
   }
 }

src/generated/resources/assets/cosmiccore/lang/en_ud.json

@@ -280,6 +280,7 @@
   "block.cosmiccore.somarust_casing": "buısɐƆ ʇsnɹɐɯoS",
   "block.cosmiccore.soul_muted_casing": "buısɐƆ pǝʇnW ןnoS",
   "block.cosmiccore.soul_stained_steel_aluminium_plated_casing": "buısɐƆ pǝʇɐןԀ ɯnıuıɯnןⱯ ןǝǝʇS pǝuıɐʇS ןnoS",
+  "block.cosmiccore.soul_tester": "ɹǝʇsǝ⟘ ןnoS",
   "block.cosmiccore.spirit_crucible": "ǝןqıɔnɹƆ ʇıɹıdS",
   "block.cosmiccore.star_ladder": "ɹǝppɐꞀ ɹɐʇS",
   "block.cosmiccore.star_ladder_research_hub": "qnH ɥɔɹɐǝsǝᴚ ɹǝppɐꞀ ɹɐʇS",
@@ -1383,6 +1384,7 @@
   "item.cosmiccore.simple_rebreather.tooltip": "˙sʇuǝɯuoɹıʌuǝ ㄥ§ɹıⱯ uıɥ⟘q§ uı uıɐɹp uǝbʎxo sǝɔnpǝᴚㄥ§",
   "item.cosmiccore.somatic_processing_assembly": "pɹɐoᗺ ʎןqɯǝssⱯ buıssǝɔoɹdoʇɐɯoS",
   "item.cosmiccore.soul_cut_lucid_cpu_chip": "dıɥƆ ∩ԀƆ pıɔnꞀ ʇnƆ ןnoS",
+  "item.cosmiccore.soul_reader": "ɹǝpɐǝᴚ ʞɹoʍʇǝN ןnoS",
   "item.cosmiccore.sov_blood_orb": "qɹO pooןᗺ ubıǝɹǝʌoS",
   "item.cosmiccore.space_advanced_nanomuscle_chestplate": "ǝʇɐןdʇsǝɥƆ ǝʇınS ǝɔɐdS ™ǝןɔsnWouɐN pǝɔuɐʌpⱯ",
   "item.cosmiccore.space_advanced_quarktech_chestplate": "ǝʇɐןdʇsǝɥƆ ǝʇınS ǝɔɐdS ™ɥɔǝ⟘ʞɹɐnὉ pǝɔuɐʌpⱯ",

src/generated/resources/assets/cosmiccore/lang/en_us.json

@@ -280,6 +280,7 @@
   "block.cosmiccore.somarust_casing": "Somarust Casing",
   "block.cosmiccore.soul_muted_casing": "Soul Muted Casing",
   "block.cosmiccore.soul_stained_steel_aluminium_plated_casing": "Soul Stained Steel Aluminium Plated Casing",
+  "block.cosmiccore.soul_tester": "Soul Tester",
   "block.cosmiccore.spirit_crucible": "Spirit Crucible",
   "block.cosmiccore.star_ladder": "Star Ladder",
   "block.cosmiccore.star_ladder_research_hub": "Star Ladder Research Hub",
@@ -1382,6 +1383,7 @@
   "item.cosmiccore.simple_rebreather": "Simple Rebreather",
   "item.cosmiccore.simple_rebreather.tooltip": "§7Reduces oxygen drain in §bThin Air§7 environments.",
   "item.cosmiccore.somatic_processing_assembly": "Somatoprocessing Assembly Board",
+  "item.cosmiccore.soul_reader": "Soul Network Reader",
   "item.cosmiccore.soul_cut_lucid_cpu_chip": "Soul Cut Lucid CPU Chip",
   "item.cosmiccore.sov_blood_orb": "Sovereign Blood Orb",
   "item.cosmiccore.space_advanced_nanomuscle_chestplate": "Advanced NanoMuscle™ Space Suite Chestplate",
@@ -1993,5 +1995,42 @@
   "tooltip.cosmiccore.thermia_hatch_limit": "§cTemp. Limit: %sK",
   "tooltip.gt_scythe.energy": "Energy: %s / %s EU",
   "tooltip.gt_scythe.no_energy": "§cNot enough energy.",
-  "tooltip.gt_scythe.per_hit": "Cost: %s EU / hit"
+  "tooltip.gt_scythe.per_hit": "Cost: %s EU / hit",
+  "recipe.cosmiccore.raw_soul_in": "Consumes: %s Raw souls",
+  "recipe.cosmiccore.refined_soul_in": "Consumes: %s Refined souls",
+  "recipe.cosmiccore.proud_soul_in": "Consumes: %s Proud souls",
+  "recipe.cosmiccore.greedy_soul_in": "Consumes: %s Greedy souls",
+  "recipe.cosmiccore.lustful_soul_in": "Consumes: %s Lustful souls",
+  "recipe.cosmiccore.envious_soul_in": "Consumes: %s Envious souls",
+  "recipe.cosmiccore.gluttonous_soul_in": "Consumes: %s Gluttonous souls",
+  "recipe.cosmiccore.wrathful_soul_in": "Consumes: %s Wrathful souls",
+  "recipe.cosmiccore.slothful_soul_in": "Consumes: %s Slothful souls",
+  "recipe.cosmiccore.temporal_soul_in": "Consumes: %s Temporal souls",
+  "recipe.cosmiccore.raw_soul_out": "Produces: %s Raw souls",
+  "recipe.cosmiccore.refined_soul_out": "Produces: %s Refined souls",
+  "recipe.cosmiccore.proud_soul_out": "Produces: %s Proud souls",
+  "recipe.cosmiccore.greedy_soul_out": "Produces: %s Greedy souls",
+  "recipe.cosmiccore.lustful_soul_out": "Produces: %s Lustful souls",
+  "recipe.cosmiccore.envious_soul_out": "Produces: %s Envious souls",
+  "recipe.cosmiccore.gluttonous_soul_out": "Produces: %s Gluttonous souls",
+  "recipe.cosmiccore.wrathful_soul_out": "Produces: %s Wrathful souls",
+  "recipe.cosmiccore.slothful_soul_out": "Produces: %s Slothful souls",
+  "recipe.cosmiccore.temporal_soul_out": "Produces: %s Temporal souls",
+  "gui.cosmiccore.soul.raw.name": "Raw souls",
+  "gui.cosmiccore.soul.refined.name": "Refined souls",
+  "gui.cosmiccore.soul.proud.name": "Proud souls",
+  "gui.cosmiccore.soul.greedy.name": "Greedy souls",
+  "gui.cosmiccore.soul.lustful.name": "Lustful souls",
+  "gui.cosmiccore.soul.envious.name": "Envious souls",
+  "gui.cosmiccore.soul.gluttonous.name": "Gluttonous souls",
+  "gui.cosmiccore.soul.wrathful.name": "Wrathful souls",
+  "gui.cosmiccore.soul.slothful.name": "Slothful souls",
+  "gui.cosmiccore.soul.temporal.name": "Temporal souls",
+  "gui.cosmiccore.soul.empty_network": "Network is empty",
+  "gui.cosmiccore.soul.network_contents": "--- Network Contents ---",
+  "gui.cosmiccore.soul.reset": "Soul network has been reset",
+  "gui.cosmiccore.soul.add": "Added %s %s souls to the network",
+  "gui.cosmiccore.soul.remove": "removed %s %s souls to the network",
+  "gui.cosmiccore.soul.capacity": "Capacity: %s souls",
+  "gui.cosmiccore.soul.set_tier": "the network is now tier %s"
 }

src/generated/resources/assets/cosmiccore/models/block/machine/soul_tester.json

@@ -0,0 +1,90 @@
+{
+  "parent": "minecraft:block/block",
+  "loader": "gtceu:machine",
+  "machine": "cosmiccore:soul_tester",
+  "texture_overrides": {
+    "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe"
+  },
+  "variants": {
+    "is_formed=false,recipe_logic_status=idle": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=suspend": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=waiting": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=working": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=idle": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=suspend": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=waiting": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=working": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_inert_ptfe",
+          "overlay_front": "gtceu:block/multiblock/coke_oven/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/coke_oven/overlay_front_active_emissive"
+        }
+      }
+    }
+  }
+}

src/generated/resources/assets/cosmiccore/models/item/soul_reader.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "cosmiccore:item/soul_reader"
+  }
+}

src/generated/resources/assets/cosmiccore/models/item/soul_tester.json

@@ -0,0 +1,3 @@
+{
+  "parent": "cosmiccore:block/machine/soul_tester"
+}

src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java

@@ -3,12 +3,14 @@
 import com.ghostipedia.cosmiccore.api.capability.CosmicCapabilities;
 import com.ghostipedia.cosmiccore.api.item.LinkedTerminalBehavior;
 import com.ghostipedia.cosmiccore.api.pattern.CosmicPredicates;
+import com.ghostipedia.cosmiccore.api.recipe.ingredient.SoulIngredient;
 import com.ghostipedia.cosmiccore.api.recipe.lookup.MapEmberIngredient;
 import com.ghostipedia.cosmiccore.api.recipe.lookup.MapSoulIngredient;
 import com.ghostipedia.cosmiccore.api.registries.CosmicRegistration;
 import com.ghostipedia.cosmiccore.client.CosmicCoreClient;
 import com.ghostipedia.cosmiccore.common.airControl.OxygenItemCap;
 import com.ghostipedia.cosmiccore.common.airControl.OxygenRules;
+import com.ghostipedia.cosmiccore.common.commands.argument.SoulTypeArgument;
 import com.ghostipedia.cosmiccore.common.data.*;
 import com.ghostipedia.cosmiccore.common.data.materials.CosmicMaterialSet;
 import com.ghostipedia.cosmiccore.common.data.materials.CosmicMaterials;
@@ -36,6 +38,8 @@
 
 import com.lowdragmc.lowdraglib.Platform;
 
+import net.minecraft.commands.synchronization.ArgumentTypeInfos;
+import net.minecraft.commands.synchronization.SingletonArgumentInfo;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -111,12 +115,14 @@ public void modifyExistingMaterials(PostMaterialEvent event) {
     @SubscribeEvent
     public void commonSetup(FMLCommonSetupEvent event) {
         event.enqueueWork(() -> {
-            MapIngredientTypeManager.registerMapIngredient(Integer.class, MapSoulIngredient::convertToMapIngredient);
+            MapIngredientTypeManager.registerMapIngredient(SoulIngredient.class, MapSoulIngredient::from);
             MapIngredientTypeManager.registerMapIngredient(Double.class, MapEmberIngredient::convertToMapIngredient);
             GridLinkables.register(CosmicItems.LINKED_TERMINAL, LinkedTerminalBehavior.handler);
             CCoreNetwork.init();
             OxygenRules.registerAirRanges();
             DimensionMobScaling.registerScaling();
+            ArgumentTypeInfos.registerByClass(SoulTypeArgument.class,
+                    SingletonArgumentInfo.contextFree(SoulTypeArgument::soulType));
         });
     }