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.

Sign up for GitHub

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

修复grid tick逻辑 #1000

Merged
merged 2 commits into from
Jul 2, 2024
Merged

修复grid tick逻辑 #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0ee707
修复grid tick逻辑
dmzz-yyhyy Jul 2, 2024
1f7c747
修正电网逻辑
dmzz-yyhyy Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/main/java/dev/dubhe/anvilcraft/api/chargecollector/ChargeCollectorManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
public class ChargeCollectorManager {
private final Map<BlockPos, ChargeCollectorBlockEntity> chargeCollectors = new HashMap<>();
private static final Map<Level, ChargeCollectorManager> INSTANCES = new HashMap<>();

@Getter
private final Level level;

public ChargeCollectorManager(Level level) {
Expand Down Expand Up @@ -81,7 +81,7 @@ public boolean canCollect(ChargeCollectorBlockEntity blockEntity, BlockPos block
}

@Getter
public class Entry {
public static class Entry {
public final double distance;
public final ChargeCollectorBlockEntity blockEntity;

Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/dev/dubhe/anvilcraft/api/power/PowerGrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static void tickGrid() {
Set<PowerGrid> remove = Collections.synchronizedSet(new HashSet<>());
while (iterator.hasNext()) {
PowerGrid grid = iterator.next();
if (grid.isEmpty()) remove.add(grid);
if (grid.isEmpty() || grid.isRemove()) remove.add(grid);
grid.tick();
}
grids.removeAll(remove);
Expand Down Expand Up @@ -239,7 +239,6 @@ public void remove(IPowerComponent @NotNull ... components) {
for (IPowerComponent component : components) {
set.remove(component);
}
PowerGrid.getGridSet(this.level).remove(this);
new PowerGridRemovePack(this).broadcast();
PowerGrid.addComponent(set.toArray(IPowerComponent[]::new));
}
Expand Down Expand Up @@ -289,7 +288,7 @@ public static void addComponent(IPowerComponent @NotNull ... components) {
Set<PowerGrid> remove = Collections.synchronizedSet(new HashSet<>());
while (iterator.hasNext()) {
PowerGrid grid1 = iterator.next();
if (!grid1.isInRange(component)) continue;
if (grid1.isRemove() || !grid1.isInRange(component)) continue;
if (grid == null) grid = grid1;
else {
grid.merge(grid1);
Expand Down
Loading