From dcf7de9000801f55c50a912b74cbc8b07bcaede2 Mon Sep 17 00:00:00 2001 From: yueh Date: Wed, 27 Jun 2018 20:28:43 +0200 Subject: [PATCH] Updated fluid interface GUI and other fluid related textures. (#3567) --- .../gui/implementations/GuiInterface.java | 4 +- .../appeng/core/localization/GuiText.java | 1 + .../fluids/client/gui/GuiFluidInterface.java | 8 +- .../container/ContainerFluidInterface.java | 2 +- .../fluids/helper/DualityFluidInterface.java | 4 +- .../fluids/parts/PartFluidInterface.java | 10 +- .../blockstates/fluid_interface.json | 2 +- .../appliedenergistics2/lang/en_us.lang | 1 + .../models/block/fluid_interface.json | 6 + .../models/part/fluid_interface_base.json | 104 ++++++++++++++++++ .../part/fluid_interface_has_channel.json | 54 +++++++++ .../models/part/fluid_interface_off.json | 33 ++++++ .../models/part/fluid_interface_on.json | 54 +++++++++ .../textures/blocks/fluid_interface.png | Bin 0 -> 341 bytes .../textures/guis/interfacefluid.png | Bin 1271 -> 1987 bytes .../textures/items/part/fluid_export_bus.png | Bin 340 -> 344 bytes .../textures/items/part/fluid_import_bus.png | Bin 339 -> 339 bytes .../textures/items/part/fluid_interface.png | Bin 0 -> 341 bytes .../textures/items/part/fluid_storage_bus.png | Bin 327 -> 334 bytes 19 files changed, 270 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/fluid_interface.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java index 4b27ffd9b..d479901d2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterface.java @@ -82,8 +82,8 @@ public class GuiInterface extends GuiUpgradeable this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Interface.getLocal() ), 8, 6, 4210752 ); - this.fontRenderer.drawString( GuiText.Config.getLocal(), 18, 6 + 11 + 7, 4210752 ); - this.fontRenderer.drawString( GuiText.StoredItems.getLocal(), 18, 6 + 60 + 7, 4210752 ); + this.fontRenderer.drawString( GuiText.Config.getLocal(), 8, 6 + 11 + 7, 4210752 ); + this.fontRenderer.drawString( GuiText.StoredItems.getLocal(), 8, 6 + 60 + 7, 4210752 ); this.fontRenderer.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 ); this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index 4eafbdc71..c6b826365 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -43,6 +43,7 @@ public enum GuiText FluidInterface, Config, StoredItems, + StoredFluids, Patterns, ImportBus, ImportBusFluids, diff --git a/src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java b/src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java index d950fbc5c..094354f9f 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java +++ b/src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java @@ -32,6 +32,7 @@ import appeng.core.sync.GuiBridge; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketSwitchGuis; import appeng.fluids.container.ContainerFluidInterface; +import appeng.fluids.helper.AEFluidTank; import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.IFluidInterfaceHost; @@ -57,8 +58,9 @@ public class GuiFluidInterface extends AEBaseGui for( int i = 0; i < DualityFluidInterface.NUMBER_OF_TANKS; ++i ) { - this.buttonList.add( new GuiFluidTank( ID_BUTTON_TANK + i, this.host.getDualityFluidInterface() - .getTank( i ), this.getGuiLeft() + 7 + 18 * i, this.getGuiTop() + 16 + 8, 16, 80 ) ); + final AEFluidTank fluidTank = this.host.getDualityFluidInterface().getTank( i ); + final GuiFluidTank guiTank = new GuiFluidTank( ID_BUTTON_TANK + i, fluidTank, this.getGuiLeft() + 35 + 18 * i, this.getGuiTop() + 53, 16, 68 ); + this.buttonList.add( guiTank ); } this.priority = new GuiTabButton( this.getGuiLeft() + 154, this.getGuiTop(), 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ); @@ -69,6 +71,8 @@ public class GuiFluidInterface extends AEBaseGui public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY ) { this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.FluidInterface.getLocal() ), 8, 6, 4210752 ); + this.fontRenderer.drawString( GuiText.Config.getLocal(), 35, 6 + 11 + 7, 4210752 ); + this.fontRenderer.drawString( GuiText.StoredFluids.getLocal(), 35, 6 + 112 + 7, 4210752 ); this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidInterface.java b/src/main/java/appeng/fluids/container/ContainerFluidInterface.java index 14ba7fa46..d8dbffbd3 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidInterface.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidInterface.java @@ -54,7 +54,7 @@ public class ContainerFluidInterface extends AEBaseContainer for( int x = 0; x < DualityFluidInterface.NUMBER_OF_TANKS; x++ ) { - this.addSlotToContainer( new SlotFakeFluid( this.myDuality.getConfig(), x, 8 + 18 * x, 115 ) ); + this.addSlotToContainer( new SlotFakeFluid( this.myDuality.getConfig(), x, 35 + 18 * x, 35 ) ); } this.bindPlayerInventory( ip, 0, 231 - /* height of player inventory */82 ); diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java index 926a594a0..5081f9f35 100644 --- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java +++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java @@ -76,7 +76,7 @@ import appeng.util.inv.InvOperation; public class DualityFluidInterface implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IAEAppEngInventory, IPriorityHost { - public static final int NUMBER_OF_TANKS = 9; + public static final int NUMBER_OF_TANKS = 6; public static final int TANK_CAPACITY = Fluid.BUCKET_VOLUME * 4; private final AENetworkProxy gridProxy; @@ -455,7 +455,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable @Override public void onFluidInventoryChanged( final IFluidHandler inventory ) { - final int slot = getTankSlot( inventory ); + final int slot = this.getTankSlot( inventory ); this.tankChanged[slot] = true; this.saveChanges(); diff --git a/src/main/java/appeng/fluids/parts/PartFluidInterface.java b/src/main/java/appeng/fluids/parts/PartFluidInterface.java index 72b29a6f7..671d8d7f9 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidInterface.java +++ b/src/main/java/appeng/fluids/parts/PartFluidInterface.java @@ -59,16 +59,16 @@ import appeng.util.Platform; public class PartFluidInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost { - public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/interface_base" ); + public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/fluid_interface_base" ); @PartModels - public static final PartModel MODELS_OFF = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/interface_off" ) ); + public static final PartModel MODELS_OFF = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/fluid_interface_off" ) ); @PartModels - public static final PartModel MODELS_ON = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/interface_on" ) ); + public static final PartModel MODELS_ON = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/fluid_interface_on" ) ); @PartModels - public static final PartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/interface_has_channel" ) ); + public static final PartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/fluid_interface_has_channel" ) ); private final DualityFluidInterface duality = new DualityFluidInterface( this.getProxy(), this ); @@ -81,7 +81,7 @@ public class PartFluidInterface extends PartBasicState implements IGridTickable, @Override public DualityFluidInterface getDualityFluidInterface() { - return duality; + return this.duality; } @MENetworkEventSubscribe diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json index ebd072327..b574b040d 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:interface" + "model": "appliedenergistics2:fluid_interface" } } } diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang index ffb801c1f..e30db25ce 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang @@ -160,6 +160,7 @@ gui.appliedenergistics2.Patterns=Patterns gui.appliedenergistics2.SpatialIOPort=Spatial IO Port gui.appliedenergistics2.StoredEnergy=Stored Energy gui.appliedenergistics2.StoredItems=Stored Items +gui.appliedenergistics2.StoredFluids=Stored Fluids gui.appliedenergistics2.Terminal=Terminal gui.appliedenergistics2.InterfaceTerminal=Interface Terminal gui.appliedenergistics2.InterfaceTerminalHint=Show Or Hide on Interface Terminal. diff --git a/src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json new file mode 100644 index 000000000..1c8b19eaf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/fluid_interface" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json new file mode 100644 index 000000000..e9bae6587 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json @@ -0,0 +1,104 @@ +{ + "textures": { + "sides": "appliedenergistics2:parts/export_bus_sides", + "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", + "back": "appliedenergistics2:parts/monitor_back", + "front": "appliedenergistics2:items/part/fluid_interface", + "particle": "appliedenergistics2:parts/monitor_back" + }, + "elements": [ + { + "from": [ + 2, + 2, + 0 + ], + "to": [ + 14, + 14, + 2 + ], + "faces": { + "down": { + "texture": "#sides" + }, + "up": { + "texture": "#sides" + }, + "south": { + "texture": "#back" + }, + "east": { + "texture": "#sides" + }, + "north": { + "texture": "#front" + }, + "west": { + "texture": "#sides" + } + } + }, + { + "from": [ + 5, + 5, + 3 + ], + "to": [ + 11, + 11, + 4 + ], + "faces": { + "down": { + "texture": "#sides" + }, + "up": { + "texture": "#sides" + }, + "south": { + "texture": "#back" + }, + "east": { + "texture": "#sides" + }, + "north": { + "texture": "#front" + }, + "west": { + "texture": "#sides" + } + } + }, + { + "from": [ + 5, + 5, + 2 + ], + "to": [ + 11, + 11, + 3 + ], + "faces": { + "down": { + "texture": "#sidesStatus" + }, + "up": { + "texture": "#sidesStatus" + }, + "south": { + "texture": "#back" + }, + "east": { + "texture": "#sidesStatus" + }, + "west": { + "texture": "#sidesStatus" + } + } + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json new file mode 100644 index 000000000..f47216bf2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json @@ -0,0 +1,54 @@ +{ + "ae2_uvl_marker": true, + "textures": { + "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + }, + "elements": [ + { + "from": [ + 5, + 5, + 2 + ], + "to": [ + 11, + 11, + 3 + ], + "faces": { + "down": { + "texture": "#indicator", + "tintindex": 1, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + }, + "up": { + "texture": "#indicator", + "tintindex": 1, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + }, + "east": { + "texture": "#indicator", + "tintindex": 1, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + }, + "west": { + "texture": "#indicator", + "tintindex": 1, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + } + } + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json new file mode 100644 index 000000000..3ab8507fa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json @@ -0,0 +1,33 @@ +{ + "textures": { + "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + }, + "elements": [ + { + "from": [ + 5, + 5, + 2 + ], + "to": [ + 11, + 11, + 3 + ], + "faces": { + "down": { + "texture": "#indicator" + }, + "up": { + "texture": "#indicator" + }, + "east": { + "texture": "#indicator" + }, + "west": { + "texture": "#indicator" + } + } + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json new file mode 100644 index 000000000..cd41b8f73 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json @@ -0,0 +1,54 @@ +{ + "ae2_uvl_marker": true, + "textures": { + "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + }, + "elements": [ + { + "from": [ + 5, + 5, + 2 + ], + "to": [ + 11, + 11, + 3 + ], + "faces": { + "down": { + "texture": "#indicator", + "tintindex": 3, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + }, + "up": { + "texture": "#indicator", + "tintindex": 3, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + }, + "east": { + "texture": "#indicator", + "tintindex": 3, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + }, + "west": { + "texture": "#indicator", + "tintindex": 3, + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } + } + } + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/fluid_interface.png new file mode 100644 index 0000000000000000000000000000000000000000..2529a9b7ef106ad428f59f571b682cffb67bbbd6 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLSkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUk|nMYCBgY=CFO}lsSE{)nRz98d8s7|CVB>XMus01GN&>yFf8+Q zaSXBWPreW~+5B2?t3t7JX-bRcqJ>JQ8J0+OusJA8_GZx^prw85kH?(j9#r z85lP9bN@+XWnf@t2=EDUWnf@1H#ZLr4XvrE>F(}czkdC(W5@pg|IaWAMnhl(guu(I z@t&YuQxfDC{C{KvhT!k)stgPaoCO|{#S9F52SJ!|$HeTn3=9nHC7!;n?DrW3M0E_@ z4>-JGU|^6eag8Vm&QB{TPb^AhC`ioAE78kKEm1JhGte_K{HTyQm4Sho!_&nvq$2L^ z-HTbb9R%6}%}XDDuTR?Q_s`>C(n>>PjqY>hn-lfQ!r9v!GA5ti6!R=|<@-%Bd7rN+ z6wG}2GynZpCV7VUo4Lw|>%W@a&eb)W;(O0m7hQ|!+3uw-o=W61XI2T*7on7|Kvm<0|Uc}y{DNN7#JGf z*sXeB_#Ny71_lf_GBPkIeAnX!>E85v#lGWr{fnMxFfcGYxt9tm{~gNYuYTY0+p|xG z6*;ID|B@@WKRIzR0|Uc^>glW?-8XAP?mvE~4tL}{h8Mr*8iI6|@*Lnt2_JP11|*lD z^Bm+I>JI)7dn_+_V%OIzOQawCo9?%-{CB1>$QA~KXF*(t`}Y6W&N5+sviEe@hV*KP8o&CpPzZuB=AVpBGfS3$l_MTixhWaytkdWWU@abLY>W_c(uB~0Jc9-F2 z=H_cZnBQ*Y1e=WrNf39z``o;%OC%He7#J+f4@9#cDBAhn+LxE%v}*PFfS;f5GybcU z_PP9gsdn~_qIC=@wz&+O=9w`>`b#&gSrCbeU$-!xsJewJt)3hCk7>o4 VlgoO~x=sdJ<>~6@vd$@?2>^~XZ1MmA literal 1271 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4rT@hhU_&FAq)&mzXE(hT%9e985kJM&COjb zja{rvTx?A185lxCL%GT>ba!`8nKI?rv19-L|7RElqaiT7LSWha=N~|Mq9n*Kn8D%M zjWiG^$=lt9p@UV{gMop8v%n*=n1O-s5C}7hYIrp;Ffg!}c>21s-)9sM)iH2C;P8fl zfw9cf#WAGf*4x{LT!#$=To2wgar5|YzkYJq1ho{$?&njrn4}C^`eg-gE?=P$KL69h z@A1aj3~AHXX=^j64P1~~h&*`1cJY{jr` zx@AV3sk_&2HrcW7u5a^&>A~M$@7R=|)qZ?)gvFt=`;NYfRoF6juMTI${@gBxS+YT= z7-dhY*eGq36Ec{_xXSPbLubCig*)*DJWJefF_bJ(`B2JauziWWZuZ7`z9%#po=q!K z+OTWs{wN_15wFJPD;&G34#sm7H}Xo9N=^N^V)tbQdCTXL>@hZ?=?n}E44$rjF6*2U FngGCCQ?md7 delta 194 zcmcb?bcJcctoo&%E{-7<{=Jg|`I-y_T&lVLci8JlbeK2=*xB~5f3%Rhe3NJ6hTM&l zJu|ldp0V`c*Rz#UEp>Npt$loI={gy?_el>$^S<$h&1YKp_Fby)fq#`6Oc`Y!n(QSi zlRtDFsq#1w!Di8WkjpLb-SS zRy6^QDNJ)iIHLAE&~Mp!fU(D__f*Bz%b64O>$l02r_H`1!N9=4;OXk;vd$@?2>=Kk BRJH&B diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png index 1c089bdc9d01425a0ea3e0771aad169061e055f4..f39d2415d847d0b459b56debdd91c5f7f0700b96 100644 GIT binary patch delta 186 zcmcc2beU<6hmevYh1@(nD71E|OwJAK}kZw5Vba{c$9+AEaCJ7&z>v(U>ZEgTe~DWM4f|6D?L delta 186 zcmcc2beUd31X`-O?sw?xNpP4XMus01GN&>yFf8+Q zaSXBWPreW~+5B2?t3t7JX-bRcqJ>JQ8J0+OusJA8_c}@CYxUiZdE9DE=_6CT(nT>G{X|94mJm637@Z58`g-r zFf1@Kt_@wm>#&bGj^QFh$Qgz$tm_*656WpbWiwcE-eg-aXGS2Gl+!haO^h#e9+@uq z-MD~l(;SygY+C}Hf_Yt7at?F_m?*Rh$uV4P5b|PSyu#MOrew;=>jlk1dvEhAp|}b~;69 z>+SWy(u*`VEmZz?XZo_cUQ?Gd_1i{SIQ48g@Tx;#oA0D`EPK|kPhyzO8kDCHIQzQ! zg7qnC3!a~1DPdYC%75d&083r$OXCFJlc5R+U$ZCpy>#WVStfEtZ|VVuB_;vET?<@= p{yEJM&p5DRb70`wcYLyQ^PkF!FVH`}gn@y9!PC{xWt~$(698X`P#FLK