aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-12-04 05:34:27 +0900
committerGitHub <noreply@github.com>2023-12-03 21:34:27 +0100
commitf74c7cc297d1d19d38a19683cd277ad9ce605d3a (patch)
treeb2a5d66ec5a959099240fb1db239ffc0f9531839 /src/main/java/gregtech/loaders
parentb08cde7de4ec93cba05fb070991ad1dffb800ce1 (diff)
downloadGT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.tar.gz
GT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.tar.bz2
GT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.zip
Refactor RecipeMap (#2345)
* Remove deprecated and unused things * Move recipemap subclasses * Move GT_Recipe_Map to outside and rename to RecipeMap * Move recipemap instances to separated class & remove prepending s * Remove useless GT_Recipe constructors * Always use ModularUI * Rename IGT_RecipeMap -> IRecipeMap * Add RecipeMapBuilder * Remove more deprecated and unused things * Fix RecipeMap type parameters * Use multimap for recipe index * Fix bending recipe error in dev env * Remove mUniqueIdentifier * Update AE2FC * Less edgy texture for NEI recipe background * Add replicator fluid output slot for NEI and machine GUI * Fix fluid fuels not having fuel value in large boilers * Remove GT_RectHandler and NEI_TransferRectHost * Remove RecipeMapHandler * Move NEI energy description from RecipeMapFrontend to Power * Refactor the way to filter fusion recipes * Check restriction for some properties * Remove showVoltageAmperage * Make Power accept GT_Recipe * Fix NPE * Move NEI duration description to Power from Frontend * Directly implement IRecipeProcessingAwareHatch for GT_MetaTileEntity_Hatch_InputBus_ME * Make Power integrated with GT_OverclockCalculator * Rename Power -> OverclockDescriber * Don't modify recipe find logic until postload finishes * Reformat reserved MTE ids * Fix check for too few inputs on recipe addition * Move replicator logic to backend * Stop un-hiding assline recipes * Allow setting custom recipe comparator & implement for fusion * Update AE2FC * Rename getRecipeList and getRecipes -> getRecipeMap * Automatically register recipe catalysts * Cleanup the way to detect recipe collision * Make use of BasicUIProperties for basic machines * Make use of BasicUIProperties for UIHelper * Rename specialHandler -> recipeTransformer * Add way to automatically register handler info * Add recipe category * Add some APIs for addons * Rename blastRecipes -> blastFurnaceRecipes * Remove GT_MetaTileEntity_BasicMachine_GT_Recipe#mSharedTank and #mRequiresFluidForFiltering * Don't require setting duration and EU/t for fuel recipes * Don't require setting EU/t for primitive blast furnace recipes * Revert change to addMultiblockChemicalRecipe * Fix large boiler general desc recipe not being added * Hide duration and EU/t from large boiler * Cleanup recipe stacktrace draw * Extend metadata usage of recipe builder to recipe itself * Implement metadata handling & NEI comparator for PCB factory * Some rename around NEIRecipeInfo * Some toString implementations * Add more APIs for addons & some rename * Infer handler icon from recipe catalyst if one is not set * Also shrink recipe title when OC is not used * Remove rare earth centrifuge recipe * Use metadata for replicator backend * Adjust geothermal generator output slot * Allow having multiple transferrects * Store recipemap reference in backend * Rename vacuumRecipes -> vacuumFreezerRecipes * Add config to tweak visibility of recipe categories * Remove mHideRecyclingRecipes in favor of recipe category config * Fix typo fluidSolidfierRecipes -> fluidSolidifierRecipes * Refactor findRecipe and ProcessingLogic to use Stream * Fix BBF handler icon & remove bronze blast furnace * Add fluent API for findRecipe * Add way to stop adding progressbar * Change arg order for special texture * Avoid overwriting interesting failure with NO_RECIPE * Some changes for FuelBackend * Set space project icon * Remove localization from TT * Remove CNC recipe adder * Move recipe extractor from AE2FC * Minor internal change for ProcessingLogic#applyRecipe * More javadoc on #getAvailableRecipeMaps * Better implementation of #ofSupplier * Move replicator exponent config to GT_Proxy * Remove RC & IC2 macerator handling * Rename StreamUtil -> GT_StreamUtil * Refactor code around RecipeMetadataStorage * Revise #compileRecipe javadoc * Switch extreme diesel recipe loader to downstream recipe map * Optimize #reMap * Rename reload -> reloadNEICache * Minor tweak for drawEnergyInfo * a bit more doc * Adjust recipe catalysts * Add toString implementation for GT_Fluid for debug * Minor revision for OilCrackerBackend * Index replicator recipes by material --------- Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java31
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java30
-rw-r--r--src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java888
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java12
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java30
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java20
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java106
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java20
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java36
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java18
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java20
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java92
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java24
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java98
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java42
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java14
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java72
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java15
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java22
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java33
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java30
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java68
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java12
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java133
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java20
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java12
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java76
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java46
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java24
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java68
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java22
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_PostLoad.java221
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java92
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java7
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java50
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java487
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java12
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java47
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java1260
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java48
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java88
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java130
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java118
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java182
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java82
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java410
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java42
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java36
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java8
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java140
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java62
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java80
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java22
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java171
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java20
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java130
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java38
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java40
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java34
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java72
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java12
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java302
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java12
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java128
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java26
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java100
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java18
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java36
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java9
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java53
102 files changed, 3408 insertions, 3785 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index ad9b890cc1..0343362c77 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -16,6 +16,7 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.fluid.GT_FluidFactory;
+import gregtech.api.recipe.RecipeMaps;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -47,7 +48,7 @@ public class GT_FuelLoader implements Runnable {
30,