Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

New multis 3 #93

Merged
merged 53 commits into from
Jan 22, 2022
Merged

New multis 3 #93

merged 53 commits into from
Jan 22, 2022

Conversation

draknyte1
Copy link
Contributor

I broke things.

draknyte1 and others added 30 commits December 21, 2021 17:17
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.
Added more information to Hi-Amp xformers.
draknyte1 and others added 18 commits January 15, 2022 19:08
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 }.
@draknyte1 draknyte1 requested a review from a team January 21, 2022 19:21
@Dream-Master Dream-Master requested a review from a team January 21, 2022 20:12
@repo-alt
Copy link
Contributor

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

@draknyte1
Copy link
Contributor Author

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. 🤷🏻‍♀️

@bombcar
Copy link
Member

bombcar commented Jan 22, 2022

field_151573_f huh - not pulling the right jar somewhere?

@Dream-Master
Copy link
Member

zeta has it now. So lets merge it.

@Dream-Master Dream-Master merged commit 3e5c759 into master Jan 22, 2022
@Dream-Master Dream-Master deleted the New-Multis-3 branch January 22, 2022 22:35
@@ -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});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably need compat with bartworks somehow. we can work that out later.

@@ -110,6 +121,25 @@ private static void run() {

}

if (OreDictionary.doesOreNameExist("dustPotassiumNitrade")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above. Probably should just use saltpeter.


GT_ModHandler.addCraftingRecipe(
ItemList.Processing_Array.get(1L),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What?

import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

public class GG_Utils {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I overheard GG just got a few more fuel rods... sigh.




}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants