Skip to content
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

MuTE overhaul and ACR #1883

Merged
merged 115 commits into from Apr 22, 2023
Merged

MuTE overhaul and ACR #1883

merged 115 commits into from Apr 22, 2023

Conversation

minecraft7771
Copy link
Contributor

@minecraft7771 minecraft7771 commented Apr 14, 2023

This PR was initially made to add the Advanced Chemical Reactor MuTE, but in doing so many bugs were found so this is basically an overhaul by now.
Changelog:

  • When sneaking while rightclicking a casing with the Soft Mallet, the facing of it is changed to the side of the casing you're looking at
  • Fixed MuTE tanks not consuming loosing fluids, when a recipe should've consumed them
  • Fixed NBT data being overwritten on world load
  • Fixed machine being disabled on world load
  • Added ComplexController class, which adds all logic to make a machine that does different recipes in parallel
  • Added void protection support for MuTEs in GT_ParallelHelper
  • Added the Advanced Chemical Reactor, a tiered chemical reactor which can perform multiple recipes at once. How many is dependent on the structure upgrades
    • Added item chaining to ACR. So if the item that a process outputs is on the whitelist of any process, it will prioritize output there
    • Added seperate inventories for each process
  • Make the power switch button do a force structure check, if the machine isn't formed
  • Added WAILA data
  • Added scanner data
  • Fixed the structure randomly not forming
  • Added Motor, Pump, Piston, Conveyor, Robot Arm, Sensor, Emitter and Field Generator Functional Casings
  • Fixed MuTE input busses not accepting items from conveyors, hoppers etc.
  • Added fluid locking to fluid output casings
  • improved GUI of fluid IO casings
  • Added a MuTE Renderer and a possibility of rendering objects with it
  • When getting an item stack from a MuTE block in world, the default behavior is now to not save it's nbt to it
  • Added possibility to give the controller and casings a texture for each side. Will use empty texture as fallback.

BlueWeabo and others added 30 commits April 12, 2023 21:03
@minecraft7771 minecraft7771 marked this pull request as ready for review April 18, 2023 06:12
@minecraft7771 minecraft7771 requested review from a team and mitchej123 April 18, 2023 06:13
LOCKED_INVENTORY = "gt.locked.inventory", // String
LOCKED_INVENTORY_INDEX = "gt.locked.inventory.index", // Number
UPGRADE_INVENTORY_SIZE = "gt.invsize.upg", // String
UPGRADE_INVENTORY_UUID = "gt.invuuid.upg", // String
UPGRADE_INVENTORY_NAME = "gt.invname.upg", // String
UPGRADE_INVENTORIES_INPUT = "gt.invlist.upg.in", // NBT List
UPGRADE_INVENTORIES_OUTPUT = "gt.invlist.upg.out", // NBT List
UPGRADE_TANK_CAPACITY = "gt.tankcapacity.upg", // Long
UPGRADE_TANK_CAPACITY_MULTIPLIER = "gt.tankcapacitymultiplier.upg", // Long
Copy link
Contributor

Choose a reason for hiding this comment

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

As mentioned in github; the nbt strings should be kept short (while still understandable).

@@ -588,6 +600,10 @@ public static final class NBT {
+ EnumChatFormatting.BOLD
+ "Weabo";

public static final String Authorminecraft7771 = "Author: " + EnumChatFormatting.BLUE
+ EnumChatFormatting.LIGHT_PURPLE
+ "minecraft7771";
Copy link
Contributor

Choose a reason for hiding this comment

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

❄️

@@ -717,6 +834,150 @@ public IIcon getTexture(OrePrefixes aBlock) {
};
}

protected <S> IStructureElementChain<S> addMotorCasings(int modes) {
Copy link
Contributor

Choose a reason for hiding this comment

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

@Glease Thoughts on performance of these? Any ideas for keeping them "cheap", or are they good enough?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ideally we'd be able to immediately bail if it's not a motor casing at all... for example... 🤔

@github-actions
Copy link
Contributor

Warning: 2 uncommitted changes
#1904

github-actions bot and others added 2 commits April 21, 2023 20:19
Co-authored-by: GitHub GTNH Actions <>
@mitchej123 mitchej123 merged commit fdde96a into master Apr 22, 2023
2 checks passed
@mitchej123 mitchej123 deleted the MuTETextureWorkAndController branch April 22, 2023 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants