-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added a better way for the Processing Array to handle recipes. #1551
Merged
draknyte1
merged 4 commits into
Blood-Asp:unstable
from
draknyte1:Fix-Shitty-PA-Handling
Apr 6, 2020
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3a9e389
Added a better way for the Processing Array to handle recipes.
draknyte1 b96b301
Tidied PR up a little bit.
draknyte1 e4f8398
Fixed minor oversight in range check.
draknyte1 9a533aa
Avoid caching the same recipe map more than once.
draknyte1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package gregtech.api.util; | ||
|
|
||
| import java.util.HashMap; | ||
|
|
||
| import gregtech.api.util.GT_Recipe.GT_Recipe_Map; | ||
|
|
||
| public class GT_ProcessingArray_Manager { | ||
|
|
||
| private static final HashMap<Integer, String> mMetaKeyMap = new HashMap<Integer, String>(); | ||
| private static final HashMap<String, GT_Recipe_Map> mRecipeCache = new HashMap<String, GT_Recipe_Map>(); | ||
|
|
||
| public static boolean registerRecipeMapForMeta(int aMeta, GT_Recipe_Map aMap) { | ||
| if (aMeta < 0 || aMeta > Short.MAX_VALUE || aMap == null) { | ||
| return false; | ||
| } | ||
| if (mMetaKeyMap.containsKey(aMeta)) { | ||
| return false; | ||
| } | ||
| String aMapNameKey = aMap.mUnlocalizedName; | ||
| mMetaKeyMap.put(aMeta, aMapNameKey); | ||
| mRecipeCache.put(aMapNameKey, aMap); | ||
| return true; | ||
| } | ||
|
|
||
| public static GT_Recipe_Map getRecipeMapForMeta(int aMeta) { | ||
| return mRecipeCache.get(mMetaKeyMap.get(aMeta)); | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 144 additions & 0 deletions
144
src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package gregtech.loaders.postload; | ||
|
|
||
| import gregtech.api.util.GT_ProcessingArray_Manager; | ||
| import gregtech.api.util.GT_Recipe; | ||
| import gregtech.api.util.GT_Recipe.GT_Recipe_Map; | ||
|
|
||
| public class GT_ProcessingArrayRecipeLoader { | ||
|
|
||
| public static void registerDefaultGregtechMaps() { | ||
|
|
||
| // Centrifuge | ||
| registerMapBetweenRange(361, 368, GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes); | ||
|
|
||
| // Electrolyzer | ||
| registerMapBetweenRange(371, 378, GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); | ||
|
|
||
| // Assembler | ||
| registerMapBetweenRange(211, 218, GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); | ||
|
|
||
| // Compressor | ||
| registerMapBetweenRange(241, 248, GT_Recipe.GT_Recipe_Map.sCompressorRecipes); | ||
|
|
||
| //Extractor | ||
| registerMapBetweenRange(271, 278, GT_Recipe.GT_Recipe_Map.sExtractorRecipes); | ||
|
|
||
| //Macerator | ||
| registerMapBetweenRange(301, 308, GT_Recipe.GT_Recipe_Map.sMaceratorRecipes); | ||
|
|
||
| // Microwave (New) | ||
| registerMapBetweenRange(311, 318, GT_Recipe.GT_Recipe_Map.sMicrowaveRecipes); | ||
|
|
||
| //Recycler | ||
| registerMapBetweenRange(331, 338, GT_Recipe.GT_Recipe_Map.sRecyclerRecipes); | ||
|
|
||
| //Thermal Centrifuge | ||
| registerMapBetweenRange(381, 388, GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes); | ||
|
|
||
| // Ore Washer | ||
| registerMapBetweenRange(391, 398, GT_Recipe.GT_Recipe_Map.sOreWasherRecipes); | ||
|
|
||
| // Chemical Reactor | ||
| registerMapBetweenRange(421, 428, GT_Recipe.GT_Recipe_Map.sChemicalRecipes); | ||
|
|
||
| // Chemical Bath | ||
| registerMapBetweenRange(541, 548, GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes); | ||
|
|
||
| // Magnetic Seperator | ||
| registerMapBetweenRange(561, 568, GT_Recipe.GT_Recipe_Map.sElectroMagneticSeparatorRecipes); | ||
|
|
||
| // Autoclave | ||
| registerMapBetweenRange(571, 578, GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); | ||
|
|
||
| // Mixer | ||
| registerMapBetweenRange(581, 588, GT_Recipe.GT_Recipe_Map.sMixerRecipes); | ||
|
|
||
| // Forge Hammer | ||
| registerMapBetweenRange(611, 618, GT_Recipe.GT_Recipe_Map.sHammerRecipes); | ||
|
|
||
| // Sifter | ||
| registerMapBetweenRange(641, 648, GT_Recipe.GT_Recipe_Map.sSifterRecipes); | ||
|
|
||
| // Extruder | ||
| registerMapBetweenRange(281, 288, GT_Recipe.GT_Recipe_Map.sExtruderRecipes); | ||
|
|
||
| // Laser Engraver | ||
| registerMapBetweenRange(591, 598, GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); | ||
|
|
||
| // Bender | ||
| registerMapBetweenRange(221, 228, GT_Recipe.GT_Recipe_Map.sBenderRecipes); | ||
|
|
||
| // Wiremill | ||
| registerMapBetweenRange(351, 358, GT_Recipe.GT_Recipe_Map.sWiremillRecipes); | ||
|
|
||
| // Arc Furnace | ||
| registerMapBetweenRange(651, 658, GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes); | ||
|
|
||
| // Plasma Arc Furnace | ||
| registerMapBetweenRange(661, 668, GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes); | ||
|
|
||
| // Brewery | ||
| registerMapBetweenRange(491, 498, GT_Recipe.GT_Recipe_Map.sBrewingRecipes); | ||
|
|
||
| // Canner | ||
| registerMapBetweenRange(231, 238, GT_Recipe.GT_Recipe_Map.sCannerRecipes); | ||
|
|
||
| // Cutter | ||
| registerMapBetweenRange(251, 258, GT_Recipe.GT_Recipe_Map.sCutterRecipes); | ||
|
|
||
| // Fermenter | ||
| registerMapBetweenRange(501, 508, GT_Recipe.GT_Recipe_Map.sFermentingRecipes); | ||
|
|
||
| // Fluid Extractor | ||
| registerMapBetweenRange(511, 518, GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes); | ||
|
|
||
| // Fluid Solidifier | ||
| registerMapBetweenRange(521, 528, GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes); | ||
|
|
||
| // Lathe | ||
| registerMapBetweenRange(291, 298, GT_Recipe.GT_Recipe_Map.sLatheRecipes); | ||
|
|
||
| // Boxinator | ||
| registerMapBetweenRange(401, 408, GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes); | ||
|
|
||
| // Unboxinator | ||
| registerMapBetweenRange(411, 408, GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes); | ||
|
|
||
| // Polarizer | ||
| registerMapBetweenRange(551, 558, GT_Recipe.GT_Recipe_Map.sPolarizerRecipes); | ||
|
|
||
| // Printer | ||
| registerMapBetweenRange(321, 328, GT_Recipe.GT_Recipe_Map.sPrinterRecipes); | ||
|
|
||
| // Fluid Canner | ||
| registerMapBetweenRange(431, 438, GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes); | ||
|
|
||
| // Fluid Heater | ||
| registerMapBetweenRange(621, 628, GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes); | ||
|
|
||
| // Distillery | ||
| registerMapBetweenRange(531, 538, GT_Recipe.GT_Recipe_Map.sDistilleryRecipes); | ||
|
|
||
| // Slicer | ||
| registerMapBetweenRange(631, 638, GT_Recipe.GT_Recipe_Map.sSlicerRecipes); | ||
|
|
||
| // Matter Amplifier | ||
| registerMapBetweenRange(471, 478, GT_Recipe.GT_Recipe_Map.sAmplifiers); | ||
|
|
||
| // Circuit Assembler | ||
| registerMapBetweenRange(1180, 1187, GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes); | ||
|
|
||
| // Alloy Smelter | ||
| registerMapBetweenRange(201, 208, GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes); | ||
|
|
||
| // Forming Press | ||
| registerMapBetweenRange(601, 608, GT_Recipe.GT_Recipe_Map.sPressRecipes); | ||
|
|
||
| } | ||
|
|
||
| private static final void registerMapBetweenRange(int aMin, int aMax, GT_Recipe_Map aMap) { | ||
| for (int i=aMin; i<=aMax;i++) { | ||
| GT_ProcessingArray_Manager.registerRecipeMapForMeta(i, aMap); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should probably change this to a set type collection or check for existing key to save a cpu cycle or two.