-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: autocrafting monitor respects activeness
- Loading branch information
1 parent
b4a185c
commit b74c948
Showing
24 changed files
with
414 additions
and
202 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
35 changes: 35 additions & 0 deletions
35
.../src/test/java/com/refinedmods/refinedstorage/api/autocrafting/status/TaskStatusTest.java
This file contains 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,35 @@ | ||
package com.refinedmods.refinedstorage.api.autocrafting.status; | ||
|
||
import com.refinedmods.refinedstorage.api.autocrafting.ResourceFixtures; | ||
import com.refinedmods.refinedstorage.api.autocrafting.TaskId; | ||
|
||
import java.util.List; | ||
import java.util.UUID; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
public class TaskStatusTest { | ||
@Test | ||
void dummyTest() { | ||
new TaskStatus( | ||
new TaskStatus.TaskInfo( | ||
new TaskId(UUID.randomUUID()), | ||
ResourceFixtures.A, | ||
0, | ||
0 | ||
), | ||
0.69F, | ||
List.of( | ||
new TaskStatus.Item( | ||
TaskStatus.ItemType.NORMAL, | ||
ResourceFixtures.A, | ||
0, | ||
0, | ||
0, | ||
0, | ||
0 | ||
) | ||
) | ||
); | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
...pi/src/test/java/com/refinedmods/refinedstorage/api/autocrafting/status/package-info.java
This file contains 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,7 @@ | ||
@ParametersAreNonnullByDefault | ||
@FieldsAndMethodsAreNonnullByDefault | ||
package com.refinedmods.refinedstorage.api.autocrafting.status; | ||
|
||
import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; | ||
|
||
import javax.annotation.ParametersAreNonnullByDefault; |
192 changes: 192 additions & 0 deletions
192
.../refinedstorage/common/autocrafting/monitor/AbstractAutocraftingMonitorContainerMenu.java
This file contains 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,192 @@ | ||
package com.refinedmods.refinedstorage.common.autocrafting.monitor; | ||
|
||
import com.refinedmods.refinedstorage.api.autocrafting.TaskId; | ||
import com.refinedmods.refinedstorage.api.autocrafting.status.TaskStatus; | ||
import com.refinedmods.refinedstorage.api.autocrafting.status.TaskStatusListener; | ||
import com.refinedmods.refinedstorage.api.autocrafting.status.TaskStatusProvider; | ||
import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; | ||
import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; | ||
import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; | ||
|
||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.stream.Collectors; | ||
import javax.annotation.Nullable; | ||
|
||
import net.minecraft.server.level.ServerPlayer; | ||
import net.minecraft.world.entity.player.Inventory; | ||
import net.minecraft.world.entity.player.Player; | ||
import net.minecraft.world.inventory.MenuType; | ||
|
||
public abstract class AbstractAutocraftingMonitorContainerMenu extends AbstractBaseContainerMenu | ||
implements TaskStatusListener, AutocraftingMonitorWatcher { | ||
private final Map<TaskId, TaskStatus> statusByTaskId; | ||
private final List<TaskStatus.TaskInfo> tasks; | ||
private final List<TaskStatus.TaskInfo> tasksView; | ||
@Nullable | ||
private final TaskStatusProvider taskStatusProvider; | ||
private final Player player; | ||
|
||
@Nullable | ||
private AutocraftingMonitorListener listener; | ||
@Nullable | ||
private TaskId currentTaskId; | ||
private boolean active; | ||
|
||
protected AbstractAutocraftingMonitorContainerMenu(final MenuType<?> menuType, | ||
final int syncId, | ||
final Inventory playerInventory, | ||
final AutocraftingMonitorData data) { | ||
super(menuType, syncId); | ||
this.statusByTaskId = data.statuses().stream().collect(Collectors.toMap( | ||
s -> s.info().id(), | ||
s -> s | ||
)); | ||
this.tasks = data.statuses().stream().map(TaskStatus::info).collect(Collectors.toList()); | ||
this.tasksView = Collections.unmodifiableList(tasks); | ||
this.currentTaskId = data.statuses().isEmpty() ? null : data.statuses().getFirst().info().id(); | ||
this.taskStatusProvider = null; | ||
this.active = data.active(); | ||
this.player = playerInventory.player; | ||
} | ||
|
||
protected AbstractAutocraftingMonitorContainerMenu(final MenuType<?> menuType, | ||
final int syncId, | ||
final Player player, | ||
final TaskStatusProvider taskStatusProvider) { | ||
super(menuType, syncId); | ||
this.statusByTaskId = Collections.emptyMap(); | ||
this.tasks = Collections.emptyList(); | ||
this.tasksView = Collections.emptyList(); | ||
this.currentTaskId = null; | ||
this.taskStatusProvider = taskStatusProvider; | ||
this.player = player; | ||
taskStatusProvider.addListener(this); | ||
} | ||
|
||
@Override | ||
public void removed(final Player removedPlayer) { | ||
super.removed(removedPlayer); | ||
if (taskStatusProvider != null) { | ||
taskStatusProvider.removeListener(this); | ||
} | ||
} | ||
|
||
@Override | ||
public void broadcastChanges() { | ||
super.broadcastChanges(); | ||
if (taskStatusProvider instanceof TaskStatusProviderImpl taskStatusProviderImpl) { | ||
taskStatusProviderImpl.testTick(); | ||
} | ||
} | ||
|
||
void setListener(@Nullable final AutocraftingMonitorListener listener) { | ||
this.listener = listener; | ||
} | ||
|
||
List<TaskStatus.Item> getCurrentItems() { | ||
final TaskStatus status = statusByTaskId.get(currentTaskId); | ||
if (status == null) { | ||
return Collections.emptyList(); | ||
} | ||
return status.items(); | ||
} | ||
|
||
List<TaskStatus.TaskInfo> getTasksView() { | ||
return tasksView; | ||
} | ||
|
||
float getPercentageCompleted(final TaskId taskId) { | ||
final TaskStatus status = statusByTaskId.get(taskId); | ||
return status == null ? 0 : status.percentageCompleted(); | ||
} | ||
|
||
void setCurrentTaskId(@Nullable final TaskId taskId) { | ||
this.currentTaskId = taskId; | ||
loadCurrentTask(); | ||
} | ||
|
||
void loadCurrentTask() { | ||
if (listener != null) { | ||
listener.currentTaskChanged(currentTaskId == null ? null : statusByTaskId.get(currentTaskId)); | ||
} | ||
} | ||
|
||
@Override | ||
public void taskStatusChanged(final TaskStatus status) { | ||
if (taskStatusProvider != null && player instanceof ServerPlayer serverPlayer) { | ||
S2CPackets.sendAutocraftingMonitorTaskStatusChanged(serverPlayer, status); | ||
return; | ||
} | ||
statusByTaskId.put(status.info().id(), status); | ||
} | ||
|
||
@Override | ||
public void taskRemoved(final TaskId id) { | ||
if (taskStatusProvider != null && player instanceof ServerPlayer serverPlayer) { | ||
S2CPackets.sendAutocraftingMonitorTaskRemoved(serverPlayer, id); | ||
return; | ||
} | ||
statusByTaskId.remove(id); | ||
tasks.removeIf(task -> task.id().equals(id)); | ||
if (listener != null) { | ||
listener.taskRemoved(id); | ||
} | ||
if (id.equals(currentTaskId)) { | ||
this.currentTaskId = tasks.isEmpty() ? null : tasks.getFirst().id(); | ||
loadCurrentTask(); | ||
} | ||
} | ||
|
||
@Override | ||
public void taskAdded(final TaskStatus status) { | ||
if (taskStatusProvider != null && player instanceof ServerPlayer serverPlayer) { | ||
S2CPackets.sendAutocraftingMonitorTaskAdded(serverPlayer, status); | ||
return; | ||
} | ||
statusByTaskId.put(status.info().id(), status); | ||
tasks.add(status.info()); | ||
if (listener != null) { | ||
listener.taskAdded(status); | ||
} | ||
if (currentTaskId == null) { | ||
this.currentTaskId = status.info().id(); | ||
loadCurrentTask(); | ||
} | ||
} | ||
|
||
public void cancelTask(final TaskId taskId) { | ||
if (taskStatusProvider != null) { | ||
taskStatusProvider.cancel(taskId); | ||
} | ||
} | ||
|
||
void cancelCurrentTask() { | ||
if (currentTaskId != null) { | ||
C2SPackets.sendAutocraftingMonitorCancel(currentTaskId); | ||
} | ||
} | ||
|
||
public void cancelAllTasks() { | ||
if (taskStatusProvider != null) { | ||
taskStatusProvider.cancelAll(); | ||
} else { | ||
C2SPackets.sendAutocraftingMonitorCancelAll(); | ||
} | ||
} | ||
|
||
@Override | ||
public void activeChanged(final boolean newActive) { | ||
if (player instanceof ServerPlayer serverPlayer) { | ||
S2CPackets.sendAutocraftingMonitorActive(serverPlayer, newActive); | ||
} else { | ||
this.active = newActive; | ||
loadCurrentTask(); | ||
} | ||
} | ||
|
||
boolean isActive() { | ||
return active; | ||
} | ||
} |
This file contains 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.