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 000000000..2529a9b7e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/fluid_interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png b/src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png index 29492e3e8..41ed69fd6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png and b/src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png index 5674143b6..fa8afa503 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png differ 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 1c089bdc9..f39d2415d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png new file mode 100644 index 000000000..2529a9b7e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png index 294e28b37..bd13196d8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png differ