Skip to content

Commit bcd85b4

Browse files
authored
Remove Distinct functionality from Output Parts (GregTechCEu#2386)
1 parent 79b8e09 commit bcd85b4

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IDistinctPart.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public interface IDistinctPart extends IMultiPart {
2323

2424
@Override
2525
default void attachConfigurators(ConfiguratorPanel configuratorPanel) {
26-
IMultiPart.super.attachConfigurators(configuratorPanel);
26+
superAttachConfigurators(configuratorPanel);
2727
configuratorPanel.attachConfigurators(new IFancyConfiguratorButton.Toggle(
2828
GuiTextures.BUTTON_DISTINCT_BUSES.getSubTexture(0, 0.5, 1, 0.5),
2929
GuiTextures.BUTTON_DISTINCT_BUSES.getSubTexture(0, 0, 1, 0.5),
@@ -34,4 +34,8 @@ default void attachConfigurators(ConfiguratorPanel configuratorPanel) {
3434
.append(Component.translatable(pressed ? "gtceu.multiblock.universal.distinct.yes" :
3535
"gtceu.multiblock.universal.distinct.no")))));
3636
}
37+
38+
default void superAttachConfigurators(ConfiguratorPanel configuratorPanel) {
39+
IMultiPart.super.attachConfigurators(configuratorPanel);
40+
}
3741
}

src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public Widget createUIWidget() {
159159

160160
@Override
161161
public boolean isDistinct() {
162-
return super.isDistinct() && tank.isDistinct();
162+
return io != IO.OUT && super.isDistinct() && tank.isDistinct();
163163
}
164164

165165
@Override

src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void onUnload() {
133133

134134
@Override
135135
public boolean isDistinct() {
136-
return getInventory().isDistinct() && circuitInventory.isDistinct();
136+
return io != IO.OUT && getInventory().isDistinct() && circuitInventory.isDistinct();
137137
}
138138

139139
@Override
@@ -193,8 +193,10 @@ public void setWorkingEnabled(boolean workingEnabled) {
193193
//////////////////////////////////////
194194

195195
public void attachConfigurators(ConfiguratorPanel configuratorPanel) {
196-
IDistinctPart.super.attachConfigurators(configuratorPanel);
197-
if (this.io == IO.IN) {
196+
if (this.io == IO.OUT) {
197+
IDistinctPart.super.superAttachConfigurators(configuratorPanel);
198+
} else if (this.io == IO.IN) {
199+
IDistinctPart.super.attachConfigurators(configuratorPanel);
198200
configuratorPanel.attachConfigurators(new CircuitFancyConfigurator(circuitInventory.storage));
199201
}
200202
}

0 commit comments

Comments
 (0)