-
Notifications
You must be signed in to change notification settings - Fork 328
Speedup ae2 stocking hatches #4009
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
Open
jurrejelle
wants to merge
10
commits into
1.20.1
Choose a base branch
from
jj/fix-slowdown-stocking-hatch
base: 1.20.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+340
−117
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
214aba1
Remove expensive hatch extraction check
jurrejelle 3bc7d53
First attempt at migrating MEStockingBusPartMachine to IStorageWatche…
jurrejelle f905805
implement StockingHatchList
jurrejelle de8c175
Merge branch '1.20.1' into jj/fix-slowdown-stocking-hatch
jurrejelle 946245c
Merge branch '1.20.1' into jj/fix-slowdown-stocking-hatch
jurrejelle 02ec4c4
Comments
jurrejelle 8e726b8
More progress, 90% working stocking parts
jurrejelle da8c72d
Merge branch '1.20.1' into jj/fix-slowdown-stocking-hatch
jurrejelle 8fe0627
Apply comments, remove todos
jurrejelle 3900160
Fix CME by deferring syncing of watched stacks
jurrejelle 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
126 changes: 126 additions & 0 deletions
126
src/main/java/com/gregtechceu/gtceu/api/misc/StockingHatchList.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| package com.gregtechceu.gtceu.api.misc; | ||
|
|
||
| import appeng.api.stacks.AEKey; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
|
|
||
| // List of AEStacks, always sorted largest to smallest. | ||
| public class StockingHatchList implements Iterable<StockingHatchList.AEStack> { | ||
|
|
||
| private final List<AEStack> list; | ||
| private final int capacity; | ||
|
|
||
| public StockingHatchList(int capacity) { | ||
| this.capacity = capacity; | ||
| this.list = new ArrayList<>(capacity); | ||
| } | ||
|
|
||
| public boolean insert(AEKey key, long amount) { | ||
| for (int i = 0; i < list.size(); i++) { | ||
| AEStack stack = list.get(i); | ||
| if (!key.equals(stack.key)) { | ||
| continue; | ||
| } | ||
| if (amount > stack.amount) { | ||
| // stack grew, resort the area before it | ||
| stack.amount = amount; | ||
| if (i > 0 && list.get(i - 1).amount < amount) { | ||
| for (int j = 0; j < i; j++) { | ||
| if (amount > list.get(j).amount) { | ||
| list.add(j, stack); | ||
| list.remove(i + 1); // remove old stack which is now shifted | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| // didn't need to move, already updated in place | ||
| return true; | ||
| } else if (amount < stack.amount) { | ||
| // stack shrunk, resort the area after it | ||
| stack.amount = amount; | ||
| if (i + 1 < list.size() && list.get(i + 1).amount > amount) { | ||
| for (int j = i + 1; j < list.size(); j++) { | ||
| if (amount > list.get(j).amount) { | ||
| list.add(j, stack); | ||
| list.remove(i); // remove old stack | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| // didn't need to move, already updated in place | ||
| return true; | ||
| } | ||
| // no change | ||
| return false; | ||
| } | ||
| // not enough space in list | ||
| if (list.size() >= capacity) { | ||
| return false; | ||
| } | ||
| // unseen item | ||
| for (int i = 0; i < list.size(); i++) { | ||
| AEStack stack = list.get(i); | ||
| if (amount > stack.amount) { | ||
| list.add(i, new AEStack(key, amount)); | ||
| return true; | ||
| } | ||
| } | ||
| list.add(new AEStack(key, amount)); | ||
| return true; | ||
| } | ||
|
|
||
| public boolean remove(AEKey key) { | ||
| for (int i = 0; i < list.size(); i++) { | ||
| AEStack stack = list.get(i); | ||
| if (stack.key.equals(key)) { | ||
| list.remove(i); | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| public boolean contains(AEKey what) { | ||
| for (var stack : list) { | ||
| if (stack.getKey().equals(what)) return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull Iterator<AEStack> iterator() { | ||
| return list.iterator(); | ||
| } | ||
|
|
||
| public int size() { | ||
| return list.size(); | ||
| } | ||
|
|
||
| public void clear() { | ||
| list.clear(); | ||
| } | ||
|
|
||
| public StockingHatchList.AEStack get(int index) { | ||
| return list.get(index); | ||
| } | ||
|
|
||
| public static class AEStack { | ||
|
|
||
| @Getter | ||
| @Setter | ||
| public @NotNull AEKey key; | ||
| @Getter | ||
| @Setter | ||
| public long amount; | ||
|
|
||
| public AEStack(@NotNull AEKey key, long amount) { | ||
| this.key = key; | ||
| this.amount = amount; | ||
| } | ||
| } | ||
| } |
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
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.
Early return instead of an else block.
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.
I disagree, see https://discord.com/channels/701354865217110096/1089296351906504835/1424306374787072071