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

Jump to bottom

Remove Distinct functionality from Output Parts #2386

Merged
merged 4 commits into from
Nov 17, 2024
Merged

Remove Distinct functionality from Output Parts #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b6fd9e
remove distinct functionality from output parts
YoungOnionMC Nov 17, 2024
9f679ff
fix output not having working enabled lol
YoungOnionMC Nov 17, 2024
ecc55ff
Update ItemBusPartMachine.java
YoungOnionMC Nov 17, 2024
6143873
Update ItemBusPartMachine.java
YoungOnionMC Nov 17, 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
6 changes: 5 additions & 1 deletion src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IDistinctPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public interface IDistinctPart extends IMultiPart {

@Override
default void attachConfigurators(ConfiguratorPanel configuratorPanel) {
IMultiPart.super.attachConfigurators(configuratorPanel);
superAttachConfigurators(configuratorPanel);
configuratorPanel.attachConfigurators(new IFancyConfiguratorButton.Toggle(
GuiTextures.BUTTON_DISTINCT_BUSES.getSubTexture(0, 0.5, 1, 0.5),
GuiTextures.BUTTON_DISTINCT_BUSES.getSubTexture(0, 0, 1, 0.5),
Expand All @@ -34,4 +34,8 @@ default void attachConfigurators(ConfiguratorPanel configuratorPanel) {
.append(Component.translatable(pressed ? "gtceu.multiblock.universal.distinct.yes" :
"gtceu.multiblock.universal.distinct.no")))));
}

default void superAttachConfigurators(ConfiguratorPanel configuratorPanel) {
IMultiPart.super.attachConfigurators(configuratorPanel);
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public Widget createUIWidget() {

@Override
public boolean isDistinct() {
return super.isDistinct() && tank.isDistinct();
return io != IO.OUT && super.isDistinct() && tank.isDistinct();
}

@Override
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void onUnload() {

@Override
public boolean isDistinct() {
return getInventory().isDistinct() && circuitInventory.isDistinct();
return io != IO.OUT && getInventory().isDistinct() && circuitInventory.isDistinct();
}

@Override
Expand Down Expand Up @@ -193,8 +193,10 @@ public void setWorkingEnabled(boolean workingEnabled) {
//////////////////////////////////////

public void attachConfigurators(ConfiguratorPanel configuratorPanel) {
IDistinctPart.super.attachConfigurators(configuratorPanel);
if (this.io == IO.IN) {
if (this.io == IO.OUT) {
IDistinctPart.super.superAttachConfigurators(configuratorPanel);
} else if (this.io == IO.IN) {
IDistinctPart.super.attachConfigurators(configuratorPanel);
configuratorPanel.attachConfigurators(new CircuitFancyConfigurator(circuitInventory.storage));
}
}
Expand Down