Adapt crafting calculator & crafting cpu & patterns for work with fluid directly #752
Conversation
This file contains hidden or 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
NOT COMPLETE TODO: Implement the config so it is used by MeteoritePlacer.java
…s for each dimension Created JSON config for meteorite loot tables for each dimension NOT COMPLETE TODO: Implement the config so it is used by MeteoritePlacer.java
… Created a few useful methods throughout.
…rgistics-2-Unofficial into storagebus update branch
display scheduled reason remove duplicate
No more manual deserilazation on JSON creation. Switched to the instance variable for certain methods. Moved to a 2d arraylist object based Entry Map: Allows for multiple unique loot tables in one dimension.(is essentially the opposite of an exclusive group) Reworked all methods to support the 2d array. Removed unnessecary methods. Loot tables are selected based on total entry weight. Cleaned up AEJSONEntry.java Added another constructor Added itemstack accessor method Fixed file creation on initlization event Completed chest loot creation in MeteoritePlacer.java Disabled old loot placement (will be removed before final push) Added general functionality as expected from the JSON. Needs further testing to confirm that all works well.
Cleaned up AEJSONConfig.java: No more manual deserilazation on JSON creation. Switched to the instance variable for certain methods. Moved to a 2d arraylist object based Entry Map: Allows for multiple unique loot tables in one dimension.(is essentially the opposite of an exclusive group) Reworked all methods to support the 2d array. Removed unnessecary methods. Loot tables are selected based on total entry weight. Cleaned up AEJSONEntry.java Added another constructor Added itemstack accessor method Fixed file creation on initlization event Completed chest loot creation in MeteoritePlacer.java Disabled old loot placement (will be removed before final push) Added general functionality as expected from the JSON. Needs further testing to confirm that all works well. TODO: TEST BEFORE FINAL PUSH TODO: FINALIZE DEFAULT LOOT. MAKE IT SIMILAR TO OLD LOOT. (BUT BETTER)
Reworked defaults DO NOT WORK YET Added OreDictionary Support Modified getItemStack method to return a list of ItemStacks Made dimensions that are not a part of the config use the currently set overworld config rather than the default one.
# Conflicts: # src/main/java/appeng/core/AEJSONConfig.java # src/main/java/appeng/core/AEJSONEntry.java # src/main/java/appeng/worldgen/MeteoritePlacer.java
…e items if option is enabled
# Conflicts: # dependencies.gradle # src/main/java/appeng/helpers/DualityInterface.java # src/main/java/appeng/items/storage/ItemBasicStorageCell.java
# Conflicts: # src/main/java/appeng/api/config/Settings.java # src/main/java/appeng/client/gui/widgets/GuiImgButton.java # src/main/java/appeng/core/localization/ButtonToolTips.java # src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java # src/main/resources/assets/appliedenergistics2/lang/en_US.lang # src/main/resources/assets/appliedenergistics2/textures/guis/states.png
…to dev # Conflicts: # dependencies.gradle # src/main/java/appeng/client/gui/widgets/GuiImgButton.java # src/main/java/appeng/helpers/DualityInterface.java # src/main/java/appeng/items/storage/ItemBasicStorageCell.java # src/main/resources/assets/appliedenergistics2/lang/en_US.lang
…storage-inventory' into dev # Conflicts: # src/main/java/appeng/helpers/DualityInterface.java
fix cost of crafting operation for fluids fix npe with Ultra pattern with substation on
Dream-Master
added
the
🚧 Testing on Zeta
…step # Conflicts: # src/main/java/appeng/api/config/PinsState.java # src/main/java/appeng/api/config/Settings.java # src/main/java/appeng/api/networking/crafting/ICraftingCPU.java # src/main/java/appeng/api/storage/ITerminalPins.java # src/main/java/appeng/client/gui/AEBaseGui.java # src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java # src/main/java/appeng/client/gui/widgets/GuiImgButton.java # src/main/java/appeng/client/me/ItemRepo.java # src/main/java/appeng/client/me/PinSlotME.java # src/main/java/appeng/container/AEBaseContainer.java # src/main/java/appeng/container/implementations/ContainerInterface.java # src/main/java/appeng/container/implementations/ContainerMEMonitorable.java # src/main/java/appeng/container/implementations/ContainerStorageBus.java # src/main/java/appeng/core/localization/ButtonToolTips.java # src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java # src/main/java/appeng/core/sync/packets/PacketPinsUpdate.java # src/main/java/appeng/helpers/DualityInterface.java # src/main/java/appeng/helpers/IPinsHandler.java # src/main/java/appeng/helpers/WirelessTerminalGuiObject.java # src/main/java/appeng/items/contents/WirelessTerminalPins.java # src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java # src/main/java/appeng/parts/misc/PartStorageBus.java # src/main/java/appeng/parts/p2p/PartP2PInterface.java # src/main/java/appeng/parts/reporting/AbstractPartTerminal.java # src/main/resources/assets/appliedenergistics2/lang/en_US.lang # src/main/resources/assets/appliedenergistics2/textures/guis/states.png
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This makes crafting calculator, crafting cpu and patterns work with actual fluid instead of trick with conversions fluid to item with discretizer. Since other components of system not ready for that, for compitability i used convertation in/out drops.
Interfaces are not changet. They should work as before.
In future all machines/terminal will be changed too, for work with actual fluid.
My goal is add full fluid support in AE and remove it from ae2fc, this will significantly improve adding new features. Because will not need to copy paste/adapt code for ae2fc.
For not make PR too big and for ease plans/tests/bug fix, for conversation about sensitive things about machines/terminal etc. I split changes in time and space, so changes will applied piece by piece.
Some road map:
I also used convertation for write NBT, so this should be reversible without break world.
I also removed v1 calculator.
req: GTNewHorizons/AE2FluidCraft-Rework#293