From 19747ba1f1ce48335a3533078f64466f3d41e21f Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Mon, 10 Oct 2022 22:25:28 -0300 Subject: [PATCH] lang, models, textures --- ...uiFluidInterfaceConfigurationTerminal.java | 6 +- .../appeng/core/localization/GuiText.java | 1 + .../java/appeng/items/parts/PartType.java | 2 +- ...rtFluidInterfaceConfigurationTerminal.java | 4 +- .../appliedenergistics2/lang/en_us.lang | 2 + ...luid_interface_configuration_terminal.json | 9 +++ ..._interface_configuration_terminal_off.json | 8 ++ ...d_interface_configuration_terminal_on.json | 76 ++++++++++++++++++ ...nterface_configuration_terminal_bright.png | Bin 0 -> 5370 bytes ..._interface_configuration_terminal_dark.png | Bin 0 -> 205 bytes ...nterface_configuration_terminal_medium.png | Bin 0 -> 5322 bytes 11 files changed, 101 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface_configuration_terminal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_off.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_configuration_terminal_on.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_bright.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_dark.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_configuration_terminal_medium.png 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 0000000000000000000000000000000000000000..695cbf048b1cdb89a7d8380a7e932b708cb2eb3c GIT binary patch literal 5370 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 JF6*2UngHg6pD_Rc literal 0 HcmV?d00001