Merge branch 'master' into raw-ores-patch

dependencies.gradle

@@ -4,11 +4,11 @@ dependencies {
     compileOnly('com.google.auto.value:auto-value-annotations:1.8.2')
     annotationProcessor('com.google.auto.value:auto-value:1.8.2')
 
-    api('com.github.GTNewHorizons:NotEnoughItems:2.5.26-GTNH:dev')
+    api('com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev')
 
     api('com.github.GTNewHorizons:DetravScannerMod:1.8.0:dev') {transitive=false}
     api('com.github.GTNewHorizons:EnderStorage:1.5.0:dev') {transitive=false}
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.160-pre:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.161:dev')
     api('com.github.GTNewHorizons:GTplusplus:1.11.57:dev')
     api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.48:dev')
     api('com.github.GTNewHorizons:bartworks:0.9.21:dev')

gradle.properties

@@ -117,7 +117,7 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.16'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21'
 }
 
 

src/main/java/com/github/dcysteine/neicustomdiagram/generators/debug/nbtviewer/NbtViewer.java

@@ -69,7 +69,7 @@ private static Layout buildLayout(NBTTagCompound nbt) {
         String nbtText = NbtUtil.prettyPrintNbt(nbt.toString());
         Iterable<String> lines = Splitter.on('\n').split(nbtText);
         layoutBuilder.addAllLabels(
-                Text.multiLineBuilder(Grid.GRID.grid(-1, 1), Grid.Direction.SE)
+                Text.multiLineBuilder(Grid.GRID.edge(0, 1, Grid.Direction.W), Grid.Direction.SE)
                         .setSmall(ConfigOptions.NBT_VIEWER_SMALL_TEXT.get()).addAllLines(lines).build());
 
         return layoutBuilder.build();

src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/DiagramBuilder.java

@@ -224,7 +224,21 @@ void buildDiagram(ComponentDiagramMatcher.Builder matcherBuilder) {
                         LabelHandler.ItemLabel.ELECTRIC_BLAST_FURNACE,
                         LayoutHandler.AdditionalRecipeLabelPositions.ELECTRIC_BLAST_FURNACE,
                         RecipeHandler.RecipeMap.BLAST_FURNACE,
-                        Optional.of(rawOre)));
+                        // As of the time of this comment,
+                        // looks like there is exactly one crushed ore recipe: lead. Weird ¯\(°_o)/¯
+                        Optional.of(rawOre),
+                        crushedOreOptional));
+
+        // There's some redundancy here, in that we already show chemical bath recipes for
+        // sodium persulfate and mercury, and crushed ore.
+        // If it's an issue, we can add logic to filter those out here.
+        additionalRecipeOutputs.addAll(
+                addAdditionalRecipesInteractable(
+                        LabelHandler.ItemLabel.CHEMICAL_BATH,
+                        LayoutHandler.AdditionalRecipeLabelPositions.CHEMICAL_BATH,
+                        RecipeHandler.RecipeMap.CHEMICAL_BATH,
+                        crushedOreOptional,
+                        purifiedOreOptional));
 
         additionalRecipeOutputs.addAll(
                 addAdditionalRecipesInteractable(
@@ -234,6 +248,16 @@ void buildDiagram(ComponentDiagramMatcher.Builder matcherBuilder) {
                         crushedOreOptional,
                         purifiedOreOptional));
 
+        additionalRecipeOutputs.addAll(
+                addAdditionalRecipesInteractable(
+                        LabelHandler.ItemLabel.MIXER,
+                        LayoutHandler.AdditionalRecipeLabelPositions.MIXER,
+                        RecipeHandler.RecipeMap.MIXER,
+                        crushedOreOptional,
+                        purifiedOreOptional,
+                        impureDustOptional,
+                        purifiedDustOptional));
+
         additionalRecipeOutputs.addAll(
                 addAdditionalRecipesInteractable(
                         LabelHandler.ItemLabel.AUTOCLAVE,

src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/LabelHandler.java

@@ -27,6 +27,7 @@ enum ItemLabel {
         FURNACE(ItemList.Machine_HV_E_Furnace, "furnacelabel"),
         ELECTRIC_BLAST_FURNACE(ItemList.Machine_Multi_BlastFurnace, "electricblastfurnacelabel"),
         CHEMICAL_REACTOR(ItemList.Machine_HV_ChemicalReactor, "chemicalreactorlabel"),
+        MIXER(ItemList.Machine_HV_Mixer, "mixerlabel"),
         AUTOCLAVE(ItemList.Machine_HV_Autoclave, "autoclavelabel");
 
         final ItemList item;

src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/LayoutHandler.java

@@ -50,8 +50,10 @@ static final class AdditionalRecipeLabelPositions {
 
         static final Point FURNACE = Grid.GRID.grid(2, 0);
         static final Point ELECTRIC_BLAST_FURNACE = Grid.GRID.grid(4, 0);
-        static final Point CHEMICAL_REACTOR = Grid.GRID.grid(6, 0);
-        static final Point AUTOCLAVE = Grid.GRID.grid(8, 0);
+        static final Point CHEMICAL_BATH = Grid.GRID.grid(6, 0);
+        static final Point CHEMICAL_REACTOR = Grid.GRID.grid(8, 0);
+        static final Point MIXER = Grid.GRID.grid(10, 0);
+        static final Point AUTOCLAVE = Grid.GRID.grid(12, 0);
     }
 
     private final DiagramGroupInfo info;

src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/RecipeHandler.java

@@ -48,6 +48,7 @@ enum RecipeMap {
         CHEMICAL_BATH(RecipeMaps.chemicalBathRecipes),
         CHEMICAL_REACTOR(RecipeMaps.chemicalReactorRecipes),
         ELECTROMAGNETIC_SEPARATOR(RecipeMaps.electroMagneticSeparatorRecipes),
+        MIXER(RecipeMaps.mixerRecipes),
         AUTOCLAVE(RecipeMaps.autoclaveRecipes);
 
         final gregtech.api.recipe.RecipeMap<?> recipeMap;

src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/recipedebugger/RecipeHandler.java

@@ -102,7 +102,7 @@ enum RecipeMap {
 
         /*
          * Assembly line recipes don't conflict usually since they are position-dependent. So it's disabled.
-         * ASSEMBLY_LINE( RecipeMaps.assemblylineVisualRecipes, ItemList.Machine_Multi_Assemblyline,
+         * ASSEMBLY_LINE(RecipeMaps.assemblylineVisualRecipes, ItemList.Machine_Multi_Assemblyline,
          * "assemblylinelabel"),
          */
 
@@ -113,6 +113,10 @@ enum RecipeMap {
         PRECISION_LASER_ENGRAVER(RecipeMaps.laserEngraverRecipes, ItemList.Machine_HV_LaserEngraver,
                 "precisionlaserengraverlabel"),
         MIXER(RecipeMaps.mixerRecipes, ItemList.Machine_HV_Mixer, "mixerlabel"),
+        /*
+         * TODO I think this is the multiblock mixer, from GT++? MIXER_NON_CELL(RecipeMaps.mixerNonCellRecipes,
+         * ItemList.Machine_HV_Mixer, "mixerlabel"),
+         */
         AUTOCLAVE(RecipeMaps.autoclaveRecipes, ItemList.Machine_HV_Autoclave, "autoclavelabel"),
         ELECTROMAGNETIC_SEPARATOR(RecipeMaps.electroMagneticSeparatorRecipes,
                 ItemList.Machine_HV_ElectromagneticSeparator, "electromagneticseparatorlabel"),
@@ -124,23 +128,32 @@ enum RecipeMap {
         FLUID_HEATER(RecipeMaps.fluidHeaterRecipes, ItemList.Machine_HV_FluidHeater, "fluidheaterlabel"),
         DISTILLERY(RecipeMaps.distilleryRecipes, ItemList.Machine_HV_Distillery, "distillerylabel"),
         FERMENTER(RecipeMaps.fermentingRecipes, ItemList.Machine_HV_Fermenter, "fermenterlabel"),
-        // Fluid Solidifier
-        // Be warned: this thing has way too many recipes (~46k), and they all have similar
-        // components! Expect extreme slow-down if you want to add it.
+
+        /*
+         * Fluid Solidifier Be warned: this thing has way too many recipes (~46k), and they all have similar components!
+         * Expect extreme slow-down if you want to add it. FLUID_SOLIDIFIER(RecipeMaps.fluidSolidifierRecipes,
+         * ItemList.Machine_HV_FluidSolidifier, "fluidsolidifierlabel"),
+         */
+
         FLUID_EXTRACTOR(RecipeMaps.fluidExtractionRecipes, ItemList.Machine_HV_FluidExtractor, "fluidextractorlabel"),
         PACKAGER(RecipeMaps.packagerRecipes, ItemList.Machine_HV_Boxinator, "packagerlabel"),
         UNPACKAGER(RecipeMaps.unpackagerRecipes, ItemList.Machine_HV_Unboxinator, "unpackagerlabel"),
         FUSION_REACTOR(RecipeMaps.fusionRecipes, ItemList.FusionComputer_LuV, "fusionreactorlabel"),
         CENTRIFUGE(RecipeMaps.centrifugeRecipes, ItemList.Machine_HV_Centrifuge, "centrifugelabel"),
+        /*
+         * TODO I think this is the multiblock centrifuge, from GT++? CENTRIFUGE_NON_CELL(
+         * RecipeMaps.centrifugeNonCellRecipes, ItemList.Machine_HV_Centrifuge, "centrifugelabel"),
+         */
         ELECTROLYZER(RecipeMaps.electrolyzerRecipes, ItemList.Machine_HV_Electrolyzer, "electrolyzerlabel"),
+        /*
+         * TODO I think this is the multiblock electrolyzer, from GT++? ELECTROLYZER_NON_CELL(
+         * RecipeMaps.electrolyzerNonCellRecipes, ItemList.Machine_HV_Electrolyzer, "electrolyzerlabel"),
+         */
         ELECTRIC_BLAST_FURNACE(RecipeMaps.blastFurnaceRecipes, ItemList.Machine_Multi_BlastFurnace,
                 "electricblastfurnacelabel"),
         PLASMA_FORGE(RecipeMaps.plasmaForgeRecipes, ItemList.Machine_Multi_PlasmaForge, "plasmaforgelabel"),
-        // Commenting this one out for now, for backward compatibility. Uncomment later.
-        /*
-         * TRANSCENDENT_PLASMA_MIXER( RecipeMaps.transcendentPlasmaMixerRecipes,
-         * ItemList.Machine_Multi_TranscendentPlasmaMixer, "transcendentplasmamixerlabel"),
-         */
+        TRANSCENDENT_PLASMA_MIXER(RecipeMaps.transcendentPlasmaMixerRecipes,
+                ItemList.Machine_Multi_TranscendentPlasmaMixer, "transcendentplasmamixerlabel"),
         // Fake Space Project
         BRICKED_BLAST_FURNACE(RecipeMaps.primitiveBlastRecipes, ItemList.Machine_Bricked_BlastFurnace,
                 "brickedblastfurnacelabel"),

src/main/java/com/github/dcysteine/neicustomdiagram/util/OreDictUtil.java

@@ -39,9 +39,9 @@ public static List<ItemComponent> getComponents(String oreName) {
     }
 
     /**
-     * If {@component} is an {@link ItemComponent} with {@link ItemComponent#hasWildcardDamage()} equal to {@code true},
-     * then returns a list of all valid item damage permutations of that item; otherwise, returns a list containing just
-     * {@code component}.
+     * If {@code component} is an {@link ItemComponent} with {@link ItemComponent#hasWildcardDamage()} equal to
+     * {@code true}, then returns a list of all valid item damage permutations of that item; otherwise, returns a list
+     * containing just {@code component}.
      */
     public static List<Component> getPermutations(Component component) {
         if (component.type() != Component.ComponentType.ITEM) {

src/main/resources/assets/neicustomdiagram/lang/en_US.lang

@@ -198,6 +198,7 @@ neicustomdiagram.generators.gregtech5.oreprocessing.thermalcentrifugeslot=Therma
 neicustomdiagram.generators.gregtech5.oreprocessing.furnacelabel=Additional Furnace recipes
 neicustomdiagram.generators.gregtech5.oreprocessing.electricblastfurnacelabel=Additional Electric Blast Furnace recipes
 neicustomdiagram.generators.gregtech5.oreprocessing.chemicalreactorlabel=Additional Chemical Reactor recipes
+neicustomdiagram.generators.gregtech5.oreprocessing.mixerlabel=Additional Mixer recipes
 neicustomdiagram.generators.gregtech5.oreprocessing.autoclavelabel=Additional Autoclave recipes
 neicustomdiagram.generators.gregtech5.oreprocessing.additionalrecipeoutputsslot=Additional recipe outputs
 
@@ -235,6 +236,7 @@ neicustomdiagram.generators.gregtech5.recipedebugger.brewerylabel=Brewery recipe
 neicustomdiagram.generators.gregtech5.recipedebugger.fluidheaterlabel=Fluid Heater recipe
 neicustomdiagram.generators.gregtech5.recipedebugger.distillerylabel=Distillery recipe
 neicustomdiagram.generators.gregtech5.recipedebugger.fermenterlabel=Fermenter recipe
+neicustomdiagram.generators.gregtech5.recipedebugger.fluidsolidifierlabel=Fluid Solidifier recipe
 neicustomdiagram.generators.gregtech5.recipedebugger.fluidextractorlabel=Fluid Extractor recipe
 neicustomdiagram.generators.gregtech5.recipedebugger.packagerlabel=Packager recipe
 neicustomdiagram.generators.gregtech5.recipedebugger.unpackagerlabel=Unpackager recipe

src/main/resources/assets/neicustomdiagram/lang/zh_CN.lang

@@ -198,6 +198,7 @@ neicustomdiagram.generators.gregtech5.oreprocessing.thermalcentrifugeslot=热力
 neicustomdiagram.generators.gregtech5.oreprocessing.furnacelabel=附加熔炉合成表
 neicustomdiagram.generators.gregtech5.oreprocessing.electricblastfurnacelabel=附加工业高炉合成表
 neicustomdiagram.generators.gregtech5.oreprocessing.chemicalreactorlabel=附加化学反应釜合成表
+neicustomdiagram.generators.gregtech5.oreprocessing.mixerlabel=附加搅拌机合成表
 neicustomdiagram.generators.gregtech5.oreprocessing.autoclavelabel=附加高压釜合成表
 neicustomdiagram.generators.gregtech5.oreprocessing.additionalrecipeoutputsslot=附加合成表输出
 
@@ -235,6 +236,7 @@ neicustomdiagram.generators.gregtech5.recipedebugger.brewerylabel=酿造室合
 neicustomdiagram.generators.gregtech5.recipedebugger.fluidheaterlabel=流体加热器合成表
 neicustomdiagram.generators.gregtech5.recipedebugger.distillerylabel=蒸馏室合成表
 neicustomdiagram.generators.gregtech5.recipedebugger.fermenterlabel=发酵槽合成表
+neicustomdiagram.generators.gregtech5.recipedebugger.fluidsolidifierlabel=Fluid Solidifier recipe
 neicustomdiagram.generators.gregtech5.recipedebugger.fluidextractorlabel=流体提取机合成表
 neicustomdiagram.generators.gregtech5.recipedebugger.packagerlabel=打包机合成表
 neicustomdiagram.generators.gregtech5.recipedebugger.unpackagerlabel=解包器合成表