diff --git a/dependencies.gradle b/dependencies.gradle index 919235b1..f22ee760 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.7.60-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-652-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-656-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.10:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.34:dev") diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java index 2f753079..5084605d 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -1260,8 +1260,8 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel BlockPosHighlighter.highlightBlocks( mc.thePlayer, Collections.singletonList(blockPos), - PlayerMessages.LevelEmitterHighlighted.getName(), - PlayerMessages.LevelEmitterInAnotherDim.getName()); + PlayerMessages.LevelEmitterHighlighted.getUnlocalized(), + PlayerMessages.LevelEmitterInAnotherDim.getUnlocalized()); mc.thePlayer.closeScreen(); } return true; diff --git a/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java index 457b56c3..219fe7f2 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java @@ -54,19 +54,19 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II } IWirelessTermRegistry term = AEApi.instance().registries().wireless(); if (!term.isWirelessTerminal(item)) { - player.addChatMessage(PlayerMessages.DeviceNotWirelessTerminal.get()); + player.addChatMessage(PlayerMessages.DeviceNotWirelessTerminal.toChat()); return item; } final IWirelessTermHandler handler = term.getWirelessTerminalHandler(item); final String unparsedKey = handler.getEncryptionKey(item); if (unparsedKey.isEmpty()) { - player.addChatMessage(PlayerMessages.DeviceNotLinked.get()); + player.addChatMessage(PlayerMessages.DeviceNotLinked.toChat()); return item; } final long parsedKey = Long.parseLong(unparsedKey); final ILocatable securityStation = AEApi.instance().registries().locatable().getLocatableBy(parsedKey); if (securityStation == null) { - player.addChatMessage(PlayerMessages.StationCanNotBeLocated.get()); + player.addChatMessage(PlayerMessages.StationCanNotBeLocated.toChat()); return item; } if (handler.hasPower(player, 0.5, item)) { @@ -77,7 +77,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II ForgeDirection.UNKNOWN, this.guiGuiType(item)); } else { - player.addChatMessage(PlayerMessages.DeviceNotPowered.get()); + player.addChatMessage(PlayerMessages.DeviceNotPowered.toChat()); } } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java index f0d4c747..cc2a1348 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java @@ -44,7 +44,7 @@ public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal IGridNode gridNode = Util.getWirelessGrid(stack); return new WirelessFluidTerminalInventory(stack, x, gridNode, player); } catch (Exception e) { - player.addChatMessage(PlayerMessages.OutOfRange.get()); + player.addChatMessage(PlayerMessages.OutOfRange.toChat()); } return null; } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java index a3740f6f..4b159406 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java @@ -44,7 +44,7 @@ public class ItemWirelessInterfaceTerminal extends ItemBaseWirelessTerminal IGridNode gridNode = Util.getWirelessGrid(stack); return new WirelessInterfaceTerminalInventory(stack, x, gridNode, player); } catch (Exception e) { - player.addChatMessage(PlayerMessages.OutOfRange.get()); + player.addChatMessage(PlayerMessages.OutOfRange.toChat()); } return null; } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java index a762a143..543081f2 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java @@ -44,7 +44,7 @@ public class ItemWirelessLevelTerminal extends ItemBaseWirelessTerminal IGridNode gridNode = Util.getWirelessGrid(stack); return new WirelessLevelTerminalInventory(stack, x, gridNode, player); } catch (Exception e) { - player.addChatMessage(PlayerMessages.OutOfRange.get()); + player.addChatMessage(PlayerMessages.OutOfRange.toChat()); } return null; } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java index 6b036a3a..28b50edd 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java @@ -44,7 +44,7 @@ public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal IGridNode gridNode = Util.getWirelessGrid(stack); return new WirelessPatternTerminalInventory(stack, x, gridNode, player); } catch (Exception e) { - player.addChatMessage(PlayerMessages.OutOfRange.get()); + player.addChatMessage(PlayerMessages.OutOfRange.toChat()); } return null; } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index c6001b01..70c3bc9a 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -135,7 +135,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal return new WirelessFluidTerminalInventory(stack, x, gridNode, player); } } catch (Exception e) { - player.addChatMessage(PlayerMessages.OutOfRange.get()); + player.addChatMessage(PlayerMessages.OutOfRange.toChat()); } return null; } diff --git a/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java b/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java index a388b76f..c5f0487c 100644 --- a/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java +++ b/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java @@ -148,7 +148,7 @@ public abstract class FCPartMonitor extends AbstractPartDisplay implements IPart if (Platform.isWrench(player, eq, te.xCoord, te.yCoord, te.zCoord)) { this.isLocked = !this.isLocked; - player.addChatMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).get()); + player.addChatMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).toChat()); this.getHost().markForUpdate(); } else if (!this.isLocked) { this.configuredFluid = AEFluidStack.create(Util.FluidUtil.getFluidFromContainer(eq));