From f74c7cc297d1d19d38a19683cd277ad9ce605d3a Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 4 Dec 2023 05:34:27 +0900 Subject: 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> --- src/main/resources/assets/gregtech/lang/en_US.lang | 59 +++++++++++++++++++-- .../textures/gui/background/nei_single_recipe.png | Bin 0 -> 150 bytes .../textures/gui/picture/alloy_smelter_molding.png | Bin 0 -> 448 bytes .../gui/picture/alloy_smelter_recycling.png | Bin 0 -> 350 bytes .../textures/gui/picture/arc_furnace_recycling.png | Bin 0 -> 325 bytes .../gui/picture/fluid_extractor_recycling.png | Bin 0 -> 336 bytes .../gui/picture/forge_hammer_recycling.png | Bin 0 -> 344 bytes .../textures/gui/picture/macerator_recycling.png | Bin 0 -> 284 bytes .../gui/picture/plasma_arc_furnace_recycling.png | Bin 0 -> 325 bytes 9 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/background/nei_single_recipe.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_molding.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_recycling.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/picture/arc_furnace_recycling.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/picture/fluid_extractor_recycling.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/picture/forge_hammer_recycling.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/picture/macerator_recycling.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/picture/plasma_arc_furnace_recycling.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 1a6505a731..f76c25ef71 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -100,8 +100,8 @@ gt.recipe.assembler=Assembler gt.recipe.assembler.description=Avengers, Assemble! gt.recipe.autoclave=Autoclave gt.recipe.autoclave.description=Crystallizing your Dusts -gt.recipe.brewery=Brewery -gt.recipe.brewery.description=Brewing your Drinks +gt.recipe.brewer=Brewery +gt.recipe.brewer.description=Brewing your Drinks gt.recipe.metalbender=Bending Machine gt.recipe.metalbender.description=Boo, he's bad! We want BENDER!!! gt.recipe.canner=Canner @@ -191,6 +191,47 @@ gt.recipe.unpackager.description=Grabs things out of Boxes gt.recipe.wiremill=Wiremill gt.recipe.wiremill.description=Produces Wires more efficiently +# RecipeMaps that are not listed on MachineType enum +gt.recipe.fakeAssemblylineProcess=Assemblyline Process +gt.recipe.fusionreactor=Fusion Reactor +gt.recipe.blastfurnace=Blast Furnace +gt.recipe.plasmaforge=DTPF +gt.recipe.transcendentplasmamixerrecipes=Transcendent Plasma Mixer +gt.recipe.fakespaceprojects=Space Projects +gt.recipe.primitiveblastfurnace=Primitive Blast Furnace +gt.recipe.implosioncompressor=Implosion Compressor +gt.recipe.vacuumfreezer=Vacuum Freezer +gt.recipe.largechemicalreactor=Large Chemical Reactor +gt.recipe.distillationtower=Distillation Tower +gt.recipe.craker=Oil Cracker +gt.recipe.pyro=Pyrolyse Oven +gt.recipe.dieselgeneratorfuel=Combustion Generator Fuels +gt.recipe.extremedieselgeneratorfuel=Extreme Diesel Engine Fuel +gt.recipe.gasturbinefuel=Gas Turbine Fuel +gt.recipe.thermalgeneratorfuel=Thermal Generator Fuels +gt.recipe.semifluidboilerfuels=Semifluid Boiler Fuels +gt.recipe.plasmageneratorfuels=Plasma Generator Fuels +gt.recipe.magicfuels=Magic Energy Absorber Fuels +gt.recipe.smallnaquadahreactor=Naquadah Reactor MkI +gt.recipe.largenaquadahreactor=Naquadah Reactor MkII +gt.recipe.fluidnaquadahreactor=Naquadah Reactor MkIII +gt.recipe.hugenaquadahreactor=Naquadah Reactor MkIV +gt.recipe.extrahugenaquadahreactor=Naquadah Reactor MkV +gt.recipe.fluidfuelnaquadahreactor=Fluid Naquadah Reactor +gt.recipe.largeboilerfakefuels=Large Boiler +gt.recipe.nanoforge=Nano Forge +gt.recipe.pcbfactory=PCB Factory +gt.recipe.ic2nuke=Nuclear Fission + +# Recipe categories +gt.recipe.category.arc_furnace_recycling=Arc Furnace Recycling +gt.recipe.category.plasma_arc_furnace_recycling=Plasma Arc Furnace Recycling +gt.recipe.category.macerator_recycling=Macerator Recycling +gt.recipe.category.fluid_extractor_recycling=Fluid Extractor Recycling +gt.recipe.category.alloy_smelter_recycling=Alloy Smelter Recycling +gt.recipe.category.alloy_smelter_molding=Alloy Smelter Molding +gt.recipe.category.forge_hammer_recycling=Forge Hammer Recycling + GT5U.machines.tier=Tier GT5U.machines.workarea=Work Area GT5U.machines.workareaset=Work Area set to @@ -466,6 +507,13 @@ GT5U.multiblock.usage=Probably uses GT5U.multiblock.parallelism=Max parallelism GT5U.multiblock.curparallelism=Current parallelism +# NEI recipe handlers +GT5U.nei.heat_capacity=Heat Capacity: %s K (%s) +GT5U.nei.tier=Tier: %s +GT5U.nei.start_eu=Start: %s EU (MK %s) +GT5U.nei.stages=Stages: %s +GT5U.nei.fuel=Fuel Value: %s EU + GT5U.config.colormodulation=Color Modulator GT5U.config.colormodulation.cable_insulation=Cable Insulation GT5U.config.colormodulation.cable_insulation.B=Blue @@ -514,6 +562,7 @@ GT5U.config.nei.RecipeOwner=Show which mod added the recipe GT5U.config.nei.RecipeOwnerStackTrace=[debug] Show stack traces of recipe addition GT5U.config.nei.RecipeOwnerStackTrace.tooltip=[requires reboot] GT5U.config.nei.OriginalVoltage=Show original voltage when overclocked +GT5U.config.nei.recipe_categories=Recipe Categories GT5U.config.waila=Waila GT5U.config.waila.WailaTransformerVoltageTier=Show voltage tier of transformer GT5U.config.waila.WailaAverageNS=Show average ns of multiblocks on waila @@ -526,7 +575,10 @@ GT5U.interface.coverTabs.south=South GT5U.interface.coverTabs.west=West GT5U.interface.coverTabs.east=East -# NEI +GT5U.steam_variant.bronze=Bronze +GT5U.steam_variant.steel=Steel + +# NEI options nei.options.tools.dump.gt5u=GT5u nei.options.tools.dump.gt5u.metatileentity=MetaTileEntity nei.options.tools.dump.gt5u.metatileentitys=MetaTileEntities @@ -1375,7 +1427,6 @@ gt.solar.system.nereid=Nereid gt.solar.system.mercury=Mercury gt.solar.system.titan=Titan gt.solar.system.phobos=Phobos -gt.specialvalue.stages=Stages: gt.multiBlock.controller.cokeOven=Coke Oven diff --git a/src/main/resources/assets/gregtech/textures/gui/background/nei_single_recipe.png b/src/main/resources/assets/gregtech/textures/gui/background/nei_single_recipe.png new file mode 100644 index 0000000000..e385d976b1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/background/nei_single_recipe.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_molding.png b/src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_molding.png new file mode 100644 index 0000000000..333b94759d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_molding.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_recycling.png b/src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_recycling.png new file mode 100644 index 0000000000..7210d1bd95 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/picture/alloy_smelter_recycling.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/picture/arc_furnace_recycling.png b/src/main/resources/assets/gregtech/textures/gui/picture/arc_furnace_recycling.png new file mode 100644 index 0000000000..c5c1bd598d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/picture/arc_furnace_recycling.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/picture/fluid_extractor_recycling.png b/src/main/resources/assets/gregtech/textures/gui/picture/fluid_extractor_recycling.png new file mode 100644 index 0000000000..31a3ed19ee Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/picture/fluid_extractor_recycling.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/picture/forge_hammer_recycling.png b/src/main/resources/assets/gregtech/textures/gui/picture/forge_hammer_recycling.png new file mode 100644 index 0000000000..2bba77de12 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/picture/forge_hammer_recycling.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/picture/macerator_recycling.png b/src/main/resources/assets/gregtech/textures/gui/picture/macerator_recycling.png new file mode 100644 index 0000000000..69a79e1a8a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/picture/macerator_recycling.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/picture/plasma_arc_furnace_recycling.png b/src/main/resources/assets/gregtech/textures/gui/picture/plasma_arc_furnace_recycling.png new file mode 100644 index 0000000000..2dbf7ce070 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/picture/plasma_arc_furnace_recycling.png differ -- cgit