diff --git a/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java index bf6de2d0c..b0e7e3c28 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java @@ -36,9 +36,7 @@ import appeng.container.interfaces.IJEIGhostIngredients; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketInventoryAction; -import appeng.fluids.client.gui.widgets.GuiFluidSlot; import appeng.fluids.client.gui.widgets.GuiFluidTank; -import appeng.fluids.container.IFluidSyncContainer; import appeng.fluids.util.AEFluidStack; import appeng.helpers.InventoryAction; import appeng.parts.reporting.PartFluidInterfaceConfigurationTerminal; @@ -138,7 +136,7 @@ public class GuiFluidInterfaceConfigurationTerminal extends AEBaseGui implements public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { this.buttonList.clear(); - this.fontRenderer.drawString(this.getGuiDisplayName(GuiText.InterfaceConfigurationTerminal.getLocal()), 8, 6, 4210752); + this.fontRenderer.drawString(this.getGuiDisplayName(GuiText.FluidInterfaceConfigurationTerminal.getLocal()), 8, 6, 4210752); this.fontRenderer.drawString(GuiText.inventory.getLocal(), this.offsetX + 2, this.ySize - 96 + 3, 4210752); final int currentScroll = this.getScrollBar().getCurrentScroll(); @@ -244,7 +242,7 @@ public class GuiFluidInterfaceConfigurationTerminal extends AEBaseGui implements final Object lineObj = this.lines.get(ex + x); if (lineObj instanceof ClientDCInternalFluidInv) { GlStateManager.color(1, 1, 1, 1); - final int width = 9 * 18; + final int width = 5 * 18; int extraLines = numUpgradesMap.get(lineObj); diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index 6b0f5e78a..56cc91c8a 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -174,6 +174,7 @@ public enum GuiText { InterfaceTerminal, InterfaceConfigurationTerminal, + FluidInterfaceConfigurationTerminal, NoCraftingCPUs, Clean, InvalidPattern, diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 3e54527fe..3eddfffa0 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -230,7 +230,7 @@ public enum PartType { FLUID_TERMINAL(520, "fluid_terminal", EnumSet.of(AEFeature.FLUID_TERMINAL), EnumSet.noneOf(IntegrationType.class), PartFluidTerminal.class), INTERFACE_CONFIGURATION_TERMINAL(521, "interface_configuration_terminal", EnumSet.of(AEFeature.INTERFACE_TERMINAL), EnumSet.noneOf(IntegrationType.class), PartInterfaceConfigurationTerminal.class), - FLUID_INTERFACE_CONFIGURATION_TERMINAL(522, "interface_configuration_terminal", EnumSet.of(AEFeature.INTERFACE_TERMINAL), EnumSet.noneOf(IntegrationType.class), PartFluidInterfaceConfigurationTerminal.class); + FLUID_INTERFACE_CONFIGURATION_TERMINAL(522, "fluid_interface_configuration_terminal", EnumSet.of(AEFeature.INTERFACE_TERMINAL), EnumSet.noneOf(IntegrationType.class), PartFluidInterfaceConfigurationTerminal.class); private final int baseDamage; diff --git a/src/main/java/appeng/parts/reporting/PartFluidInterfaceConfigurationTerminal.java b/src/main/java/appeng/parts/reporting/PartFluidInterfaceConfigurationTerminal.java index 3c081cc5d..319153af7 100644 --- a/src/main/java/appeng/parts/reporting/PartFluidInterfaceConfigurationTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartFluidInterfaceConfigurationTerminal.java @@ -35,9 +35,9 @@ import net.minecraft.util.math.Vec3d; public class PartFluidInterfaceConfigurationTerminal extends AbstractPartDisplay { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/interface_configuration_terminal_off"); + public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_configuration_terminal_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/interface_configuration_terminal_on"); + public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_configuration_terminal_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang index 0948fdd0c..6c31088c4 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang @@ -169,6 +169,7 @@ gui.appliedenergistics2.Terminal=Terminal gui.appliedenergistics2.InterfaceTerminal=Interface Terminal gui.appliedenergistics2.InterfaceTerminalHint=Show Or Hide on Interface Terminal. gui.appliedenergistics2.InterfaceConfigurationTerminal=Interface Configuration Terminal +gui.appliedenergistics2.FluidInterfaceConfigurationTerminal=Fluid Interface Configuration Terminal gui.appliedenergistics2.FormationPlane=Formation Plane gui.appliedenergistics2.FluidFormationPlane=Fluid Formation Plane gui.appliedenergistics2.VibrationChamber=Vibration Chamber @@ -551,6 +552,7 @@ item.appliedenergistics2.multi_part.toggle_bus.name=ME Toggle Bus item.appliedenergistics2.multi_part.crafting_monitor.name=ME Crafting Monitor item.appliedenergistics2.multi_part.interface_terminal.name=ME Interface Terminal item.appliedenergistics2.multi_part.interface_configuration_terminal.name=ME Configuration Interface Terminal +item.appliedenergistics2.multi_part.fluid_interface_configuration_terminal.name=ME Configuration Fluid Interface Terminal item.appliedenergistics2.multi_part.fluid_terminal.name=ME Fluid Terminal item.appliedenergistics2.multi_part.invalid_type.name=Disabled Item diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface_configuration_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface_configuration_terminal.json new file mode 100644 index 000000000..7267aea3a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface_configuration_terminal.json @@ -0,0 +1,9 @@ +{ + "parent": "appliedenergistics2:item/part/display", + "textures": { + "front": "appliedenergistics2:items/part/interface_terminal", + "front_bright": "appliedenergistics2:parts/fluid_interface_configuration_terminal_bright", + "front_medium": "appliedenergistics2:parts/fluid_interface_configuration_terminal_medium", + "front_dark": "appliedenergistics2:parts/fluid_interface_configuration_terminal_dark" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_off.json new file mode 100644 index 000000000..e4abc56e1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_off.json @@ -0,0 +1,8 @@ +{ + "parent": "appliedenergistics2:part/display_off", + "textures": { + "lightsBright": "appliedenergistics2:parts/fluid_interface_configuration_terminal_bright", + "lightsMedium": "appliedenergistics2:parts/fluid_interface_configuration_terminal_medium", + "lightsDark": "appliedenergistics2:parts/fluid_interface_configuration_terminal_dark" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_on.json new file mode 100644 index 000000000..fbea7d5f2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_on.json @@ -0,0 +1,76 @@ +{ + "ae2_uvl_marker": true, + "textures": { + "lightsBright": "appliedenergistics2:parts/fluid_interface_configuration_terminal_bright", + "lightsMedium": "appliedenergistics2:parts/fluid_interface_configuration_terminal_medium", + "lightsDark": "appliedenergistics2:parts/fluid_interface_configuration_terminal_dark" + }, + "elements": [ + { + "from": [ + 2, + 2, + 0 + ], + "to": [ + 14, + 14, + 2 + ], + "faces": { + "north": { + "texture": "#lightsBright", + "tintindex": 3, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + } + } + }, + { + "from": [ + 2, + 2, + 0 + ], + "to": [ + 14, + 14, + 2 + ], + "faces": { + "north": { + "texture": "#lightsMedium", + "tintindex": 2, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + } + } + }, + { + "from": [ + 2, + 2, + 0 + ], + "to": [ + 14, + 14, + 2 + ], + "faces": { + "north": { + "texture": "#lightsDark", + "tintindex": 1, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + } + } + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_bright.png new file mode 100644 index 000000000..695cbf048 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_bright.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_dark.png new file mode 100644 index 000000000..8affc2651 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_dark.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_medium.png new file mode 100644 index 000000000..9d038a3e8 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_medium.png differ