Skip to content

Commit af32797

Browse files
committed
Fix a couple places where the wrong lookup was occurring for security frequencies
1 parent 418d53b commit af32797

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

src/main/java/mekanism/client/gui/GuiSecurityDesk.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@
2828
import mekanism.common.util.text.BooleanStateDisplay.OnOff;
2929
import mekanism.common.util.text.InputValidator;
3030
import mekanism.common.util.text.OwnerDisplay;
31-
import mekanism.common.util.text.TextUtils;
3231
import net.minecraft.SharedConstants;
3332
import net.minecraft.client.gui.GuiGraphics;
3433
import net.minecraft.network.chat.Component;
3534
import net.minecraft.resources.ResourceLocation;
3635
import net.minecraft.util.StringUtil;
3736
import net.minecraft.world.entity.player.Inventory;
38-
import net.minecraft.world.entity.player.Player;
3937
import org.jetbrains.annotations.NotNull;
4038
import org.jetbrains.annotations.Nullable;
4139

src/main/java/mekanism/client/gui/element/text/GuiTextField.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import mekanism.client.gui.element.GuiElement;
1212
import mekanism.client.gui.element.button.MekanismImageButton;
1313
import mekanism.common.lib.Color;
14-
import net.minecraft.SharedConstants;
1514
import net.minecraft.client.Minecraft;
1615
import net.minecraft.client.gui.Font;
1716
import net.minecraft.client.gui.GuiGraphics;
@@ -202,6 +201,8 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
202201
return super.isValidClickButton(button) && super.mouseClicked(mouseX, mouseY, button);
203202
}
204203

204+
//TODO - 1.20.5: Figure out why Guis with text fields seem to still have issues with https://github.com/emilyploszaj/emi/issues/480 when other ones don't
205+
// and it doesn't seem related to any of the code inside this draw background block
205206
@Override
206207
public void drawBackground(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
207208
super.drawBackground(guiGraphics, mouseX, mouseY, partialTicks);

src/main/java/mekanism/common/lib/frequency/FrequencyType.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,15 @@ public FrequencyManager<FREQ> getFrequencyManager(@Nullable FREQ freq) {
140140
if (freq == null) {
141141
return null;
142142
}
143+
FrequencyManagerWrapper<FREQ> manager = getManagerWrapper();
144+
if (freq.getType() == FrequencyType.SECURITY) {
145+
//Frequency#getSecurity means something slightly different for security frequencies. They are always public
146+
return manager.getPublicManager();
147+
}
143148
return switch (freq.getSecurity()) {
144-
case PUBLIC -> getManagerWrapper().getPublicManager();
145-
case PRIVATE -> getManagerWrapper().getPrivateManager(freq.getOwner());
146-
case TRUSTED -> getManagerWrapper().getTrustedManager(freq.getOwner());
149+
case PUBLIC -> manager.getPublicManager();
150+
case PRIVATE -> manager.getPrivateManager(freq.getOwner());
151+
case TRUSTED -> manager.getTrustedManager(freq.getOwner());
147152
};
148153
}
149154

src/main/java/mekanism/common/lib/frequency/TileComponentFrequency.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ private <FREQ extends Frequency> void updateFrequency(FrequencyType<FREQ> type,
211211
if (frequencyData.selectedFrequency != null) {
212212
if (frequencyData.selectedFrequency.isValid()) {
213213
boolean unsetFrequency = frequencyData.selectedFrequency.isRemoved();
214-
if (!unsetFrequency && frequencyData.selectedFrequency.getSecurity() == SecurityMode.TRUSTED) {
214+
//Note: Security frequencies can only be public, and security means something different on them. So even if it is set as trusted, we don't need to check this
215+
if (!unsetFrequency && type != FrequencyType.SECURITY && frequencyData.selectedFrequency.getSecurity() == SecurityMode.TRUSTED) {
215216
//If we aren't unsetting the frequency, check if it is a trusted frequency that we no longer have access to
216217
UUID ownerUUID = tile.getOwnerUUID();
217218
if (ownerUUID != null && !frequencyData.selectedFrequency.ownerMatches(ownerUUID)) {

0 commit comments

Comments
 (0)