This repository was archived by the owner on May 26, 2024. It is now read-only.
New multis 3 #93
Merged
New multis 3 #93
Conversation
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
Add base for Multiblock Molecular Transformer.
Added Xl Gas/Plasma Turbines.
Cleaned up scanner output for all multiblocks. Update Sifter tooltip to reflect 4 output bus requirement.
Added Potassium Nitrate. Added Sodium Nitrate. Added Hot/Cold Solar Salt. Added recipes for the above. Added Solar Salt processing to Thermal Boiler. Re-added Assembly Line MKII, Tesla Tower. (WIP)
Removed some useless classes. Buffed Amazon Packager. Implemented Caching for Amazon Packager. Fixed all GT++ multis getting stuck when input bus contains less than required input of an item. (It will check other inputs for another valid recipe now)
Added single use API for adding MT recipes.
Fix Fluid Extraction recipes for Ingots/Nuggets being generated wrong. Greatly improve generation of Fluid Extraction recipes. Removed useless Fluid Extractor code which is no longer used. Initial work on the Elemental Duplicator.
Added GT Crop Managers.
Added GT Auto Crafting Tables.
Added GT Inventory Managers.
Redstone Lamp
Redstone Display
Redstone Scale
Redstone Button Panel
Fix Multis wanting Mufflers when pollution = 0. Fix getMethodName potentially crawling too far up the stack.
…splus into New-Multis-2
More work on Computer Cube GUI.
Added more information to Hi-Amp xformers.
Fixed PSS GUI suffering integer overflows. Improve PSS GUI. Fix Reactor Planner handling components.
…Elemental Duplicator. Removed a whole heap of pointless Reactor Planner files/functions. Hide some of the modes in the Computer Cube.
Fixed GUI tooltips breaking block lighting. Fixed creative energy buffer not keeping it's tier on world load.
Fixed Creative Energy Buffer some more. Fixed Redstone Circuit Block output. Did a little work on breaker boxes.
Fix early init of FmlCommonHandler.
Changed recipes for Rhugnor and Hypogen. Fixed structure check for Large Extruder. Fixed structure check for Maceration Stack. Fixed structure check for Large Rocket Engine. Fix Chem Plant consuming wrong catalyst.
…into New-Multis-3 # Conflicts: # .gitignore # build.gradle # src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java # src/main/java/gtPlusPlus/core/lib/LoadedMods.java # src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java # src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java # src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java # src/main/resources/assets/miscutils/lang/en_US.lang
Fixed missing }.
|
ok, I don't believe it can really be reviewed, but I skimmed a bit, and perhaps some others skimmed a bit, so maybe we just merge that blob and hope for the best |
|
I've had people testing it along the way, don't believe I've introduced any regressions. No idea why Advanced Solars fails in the build process though. 🤷🏻♀️ |
|
|
|
zeta has it now. So lets merge it. |
Dream-Master
approved these changes
Jan 22, 2022
Glease
reviewed
Jan 22, 2022
| @@ -359,100 +366,550 @@ else if (this.componentMaterial.getRGBA()[3] == 3) { | |||
| ((Map<Integer, Short[]>) extraData).put(aSlot++, new Short[] { 0, 255, 0}); | |||
| ((Map<Integer, Short[]>) extraData).put(aSlot++, new Short[] { 0, 255, 0}); | |||
| ((Map<Integer, Short[]>) extraData).put(aSlot++, new Short[] { 0, 255, 0}); | |||
| ((Map<Integer, Short[]>) extraData).put(aSlot++, new Short[] { 0, 255, 0}); | |||
There was a problem hiding this comment.
Do you have to repeat these lines over and over? How about some good old for loops?
| MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false); | ||
| MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false); | ||
| WATER.registerComponentForMaterial(FluidUtils.getWater(1000)); | ||
| } | ||
|
|
||
| public static final Material POTASSIUM_NITRATE = new Material( |
There was a problem hiding this comment.
Let's use saltpeter instead, which already exist in base gt since greg added railcraft compat.
| new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), | ||
| new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) | ||
| }); | ||
| public static final Material SODIUM_NITRATE = new Material( |
There was a problem hiding this comment.
Probably need compat with bartworks somehow. we can work that out later.
| @@ -110,6 +121,25 @@ private static void run() { | |||
|
|
|||
| } | |||
|
|
|||
| if (OreDictionary.doesOreNameExist("dustPotassiumNitrade")) { | |||
There was a problem hiding this comment.
Same as above. Probably should just use saltpeter.
|
|
||
| GT_ModHandler.addCraftingRecipe( | ||
| ItemList.Processing_Array.get(1L), |
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
|
|
||
| public class GG_Utils { |
There was a problem hiding this comment.
I overheard GG just got a few more fuel rods... sigh.
Glease
reviewed
Jan 22, 2022
|
|
||
|
|
||
|
|
||
| } |
There was a problem hiding this comment.
This is as far as I have gone through. There is just too much stuff.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I broke things.