Skip to content

Commit 62f148a

Browse files
authored
Fix ClassNotFound exceptions on servers due to client only class being accessed in cover code (#2829)
1 parent 43f5492 commit 62f148a

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ protected IWidget createIoRow() {
212212
.coverChildrenHeight()
213213
.child(new ToggleButton()
214214
.value(new BooleanSyncValue(this::isIoEnabled, this::setIoEnabled))
215-
.overlay(IKey.dynamic(() -> IKey.lang(this.ioEnabled ?
215+
.overlay(IKey.lang(() -> this.ioEnabled ?
216216
"behaviour.soft_hammer.enabled" :
217-
"behaviour.soft_hammer.disabled").get())
217+
"behaviour.soft_hammer.disabled")
218218
.color(Color.WHITE.darker(1)))
219219
.widthRel(0.6f)
220220
.left(0));

src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public boolean isItemValid(int slot, @NotNull ItemStack stack) {
9797

9898
protected abstract boolean isItemValid(ItemStack stack);
9999

100-
protected abstract String getFilterName();
100+
protected abstract @NotNull IKey getFilterKey();
101101

102102
@Override
103103
public @NotNull ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
@@ -244,7 +244,7 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) {
244244
}
245245
return true;
246246
}))
247-
.child(IKey.dynamic(this::getFilterName)
247+
.child(getFilterKey()
248248
.color(CoverWithUI.UI_TEXT_COLOR)
249249
.shadow(false)
250250
.alignment(Alignment.CenterRight).asWidget()

src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import com.cleanroommc.modularui.api.drawable.IKey;
88
import org.jetbrains.annotations.ApiStatus;
9+
import org.jetbrains.annotations.NotNull;
910

1011
import java.util.function.BooleanSupplier;
1112
import java.util.function.Consumer;
@@ -56,9 +57,9 @@ protected boolean isItemValid(ItemStack stack) {
5657
}
5758

5859
@Override
59-
protected String getFilterName() {
60-
return hasFilter() ?
61-
getFilterStack().getDisplayName() :
62-
IKey.lang("metaitem.fluid_filter.name").get();
60+
protected @NotNull IKey getFilterKey() {
61+
return IKey.lang(() -> hasFilter() ?
62+
getFilterStack().getTranslationKey() + ".name" :
63+
"metaitem.fluid_filter.name");
6364
}
6465
}

src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import com.cleanroommc.modularui.api.drawable.IKey;
1212
import org.jetbrains.annotations.ApiStatus;
13+
import org.jetbrains.annotations.NotNull;
1314

1415
import java.util.function.BooleanSupplier;
1516
import java.util.function.Consumer;
@@ -57,9 +58,9 @@ protected boolean isItemValid(ItemStack stack) {
5758
}
5859

5960
@Override
60-
protected String getFilterName() {
61-
return hasFilter() ?
62-
getFilterStack().getDisplayName() :
63-
IKey.lang("metaitem.item_filter.name").get();
61+
protected @NotNull IKey getFilterKey() {
62+
return IKey.lang(() -> hasFilter() ?
63+
getFilterStack().getTranslationKey() + ".name" :
64+
"metaitem.item_filter.name");
6465
}
6566
}

0 commit comments

Comments
 (0)