diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index 6ffac2ee5..ef6e9548f 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -87,6 +87,9 @@ import java.util.Set; import java.util.concurrent.TimeUnit; public abstract class AEBaseScreen extends ContainerScreen { + + public static final int COLOR_DARK_GRAY = 4210752; + private final List meSlots = new ArrayList<>(); // drag y private final Set drag_click = new HashSet<>(); diff --git a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java index dc1321b89..c6ac708bf 100644 --- a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java +++ b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java @@ -20,6 +20,7 @@ package appeng.client.gui.implementations; import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; +import appeng.api.config.PowerUnits; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; @@ -49,7 +50,7 @@ public class LevelEmitterScreen extends UpgradeableScreen super.init(); this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_ITEM_COUNT, this::onLevelChange); - this.level.setTextFieldBounds(25, 44, 79); + this.level.setTextFieldBounds(25, 44, 75); this.level.addButtons(children::add, this::addButton); container.setTextField(this.level); } @@ -89,7 +90,14 @@ public class LevelEmitterScreen extends UpgradeableScreen } if (this.levelMode != null) { - this.levelMode.set(((LevelEmitterContainer) this.cvb).getLevelMode()); + LevelType currentLevelMode = ((LevelEmitterContainer) this.cvb).getLevelMode(); + this.levelMode.set(currentLevelMode); + + if (notCraftingMode) { + if (currentLevelMode == LevelType.ENERGY_LEVEL) { + this.font.drawString(PowerUnits.AE.textComponent().getString(), 110, 44, COLOR_DARK_GRAY); + } + } } } diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java index 4297ea77f..24a24da53 100644 --- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java +++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java @@ -18,7 +18,19 @@ package appeng.container.implementations; +import appeng.api.config.FuzzyMode; +import appeng.api.config.LevelType; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.YesNo; import appeng.client.gui.implementations.NumberEntryWidget; +import appeng.container.ContainerLocator; +import appeng.container.guisync.GuiSync; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.parts.automation.LevelEmitterPart; +import appeng.util.Platform; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -27,19 +39,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; -import appeng.api.config.FuzzyMode; -import appeng.api.config.LevelType; -import appeng.api.config.RedstoneMode; -import appeng.api.config.SecurityPermissions; -import appeng.api.config.Settings; -import appeng.api.config.YesNo; -import appeng.container.ContainerLocator; -import appeng.container.guisync.GuiSync; -import appeng.container.slot.FakeTypeOnlySlot; -import appeng.container.slot.RestrictedInputSlot; -import appeng.parts.automation.LevelEmitterPart; -import appeng.util.Platform; - public class LevelEmitterContainer extends UpgradeableContainer { public static ContainerType TYPE; @@ -104,7 +103,7 @@ public class LevelEmitterContainer extends UpgradeableContainer { final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); final int y = 40; - final int x = 80 + 44; + final int x = 80 + 57; this.addSlot(new FakeTypeOnlySlot(inv, 0, x, y)); } diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index dd4c201ef..86f38e73c 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -27,7 +27,7 @@ public enum GuiText { Chest, StoredEnergy, Of, Condenser, Drive, GrindStone, SkyChest, - VibrationChamber, SpatialIOPort, LevelEmitter, FluidLevelEmitter, Terminal, + VibrationChamber, SpatialIOPort, LevelEmitter, FluidLevelEmitter, FluidLevelEmitterUnit, Terminal, Interface, FluidInterface, Config, StoredItems, StoredFluids, Patterns, ImportBus, ImportBusFluids, ExportBus, ExportBusFluids, diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java index 61856ec09..9c64b7b45 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java @@ -29,12 +29,12 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen