From 2c6e50d48ab19551dcc8922711b4fd82336479c0 Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 17 Jun 2018 21:17:40 +0200 Subject: [PATCH] Added fluid models (#3543) --- .../implementations/ContainerUpgradeable.java | 4 +- src/main/java/appeng/core/sync/GuiBridge.java | 8 +- .../packets/PacketMEFluidInventoryUpdate.java | 2 +- .../sync/packets/PacketTargetFluidStack.java | 2 +- .../core/sync/packets/PacketValueConfig.java | 2 +- .../client/gui}/GuiFluidIO.java | 5 +- .../client/gui}/GuiFluidStorageBus.java | 5 +- .../client/gui}/GuiFluidTerminal.java | 6 +- .../container}/ContainerFluidIO.java | 3 +- .../container}/ContainerFluidStorageBus.java | 3 +- .../container}/ContainerFluidTerminal.java | 4 +- .../parts}/PartFluidTerminal.java | 7 +- .../java/appeng/items/parts/PartType.java | 2 +- .../models/item/part/fluid_terminal.json | 8 +- .../models/part/fluid_export_bus_base.json | 2 +- .../models/part/fluid_import_bus_base.json | 2 +- .../models/part/fluid_storage_bus_base.json | 2 +- .../models/part/fluid_terminal.json | 283 ++++++++++++++++++ .../models/part/fluid_terminal_off.json | 8 + .../models/part/fluid_terminal_on.json | 76 +++++ .../textures/items/part/fluid_export_bus.png | Bin 0 -> 340 bytes .../textures/items/part/fluid_import_bus.png | Bin 0 -> 339 bytes .../textures/items/part/fluid_storage_bus.png | Bin 0 -> 327 bytes .../textures/items/part/fluid_terminal.png | Bin 0 -> 244 bytes .../textures/parts/fluid_terminal/back.png | Bin 0 -> 268 bytes .../parts/fluid_terminal/backlights.png | Bin 0 -> 272 bytes .../textures/parts/fluid_terminal/frame.png | Bin 0 -> 259 bytes .../parts/fluid_terminal/lights_bright.png | Bin 0 -> 265 bytes .../parts/fluid_terminal/lights_dark.png | Bin 0 -> 203 bytes .../parts/fluid_terminal/lights_medium.png | Bin 0 -> 288 bytes .../textures/parts/fluid_terminal/sides.png | Bin 0 -> 229 bytes .../parts/fluid_terminal/sidesstatus.png | Bin 0 -> 261 bytes 32 files changed, 403 insertions(+), 31 deletions(-) rename src/main/java/appeng/{client/gui/implementations => fluids/client/gui}/GuiFluidIO.java (91%) rename src/main/java/appeng/{client/gui/implementations => fluids/client/gui}/GuiFluidStorageBus.java (94%) rename src/main/java/appeng/{client/gui/implementations => fluids/client/gui}/GuiFluidTerminal.java (95%) rename src/main/java/appeng/{container/implementations => fluids/container}/ContainerFluidIO.java (96%) rename src/main/java/appeng/{container/implementations => fluids/container}/ContainerFluidStorageBus.java (95%) rename src/main/java/appeng/{container/implementations => fluids/container}/ContainerFluidTerminal.java (96%) rename src/main/java/appeng/{parts/reporting => fluids/parts}/PartFluidTerminal.java (91%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_terminal.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index 3c3dd87ee..a8684b4af 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java @@ -289,7 +289,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl return this.fzMode; } - void setFuzzyMode( final FuzzyMode fzMode ) + protected void setFuzzyMode( final FuzzyMode fzMode ) { this.fzMode = fzMode; } @@ -324,7 +324,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl this.schedulingMode = schedulingMode; } - IUpgradeableHost getUpgradeable() + protected IUpgradeableHost getUpgradeable() { return this.upgradeable; } diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 252ff1d1d..f058e0662 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -62,9 +62,6 @@ import appeng.container.implementations.ContainerCraftingCPU; import appeng.container.implementations.ContainerCraftingStatus; import appeng.container.implementations.ContainerCraftingTerm; import appeng.container.implementations.ContainerDrive; -import appeng.container.implementations.ContainerFluidIO; -import appeng.container.implementations.ContainerFluidStorageBus; -import appeng.container.implementations.ContainerFluidTerminal; import appeng.container.implementations.ContainerFormationPlane; import appeng.container.implementations.ContainerGrinder; import appeng.container.implementations.ContainerIOPort; @@ -89,7 +86,11 @@ import appeng.container.implementations.ContainerUpgradeable; import appeng.container.implementations.ContainerVibrationChamber; import appeng.container.implementations.ContainerWireless; import appeng.container.implementations.ContainerWirelessTerm; +import appeng.fluids.container.ContainerFluidIO; +import appeng.fluids.container.ContainerFluidStorageBus; +import appeng.fluids.container.ContainerFluidTerminal; import appeng.fluids.parts.PartFluidStorageBus; +import appeng.fluids.parts.PartFluidTerminal; import appeng.fluids.parts.PartSharedFluidBus; import appeng.helpers.IInterfaceHost; import appeng.helpers.IPriorityHost; @@ -99,7 +100,6 @@ import appeng.parts.automation.PartFormationPlane; import appeng.parts.automation.PartLevelEmitter; import appeng.parts.misc.PartStorageBus; import appeng.parts.reporting.PartCraftingTerminal; -import appeng.parts.reporting.PartFluidTerminal; import appeng.parts.reporting.PartInterfaceTerminal; import appeng.parts.reporting.PartPatternTerminal; import appeng.tile.crafting.TileCraftingTile; diff --git a/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java index 6182ec3d8..cdacdb7dd 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java @@ -40,10 +40,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.storage.data.IAEFluidStack; -import appeng.client.gui.implementations.GuiFluidTerminal; import appeng.core.AELog; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; +import appeng.fluids.client.gui.GuiFluidTerminal; import appeng.util.item.AEFluidStack; diff --git a/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java b/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java index 85227ecf3..ac0360fa0 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java +++ b/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java @@ -24,10 +24,10 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; -import appeng.container.implementations.ContainerFluidTerminal; import appeng.core.AELog; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; +import appeng.fluids.container.ContainerFluidTerminal; import appeng.util.item.AEFluidStack; diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index f5020bf97..36e50d8b6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -44,7 +44,6 @@ import appeng.container.implementations.ContainerCellWorkbench; import appeng.container.implementations.ContainerCraftConfirm; import appeng.container.implementations.ContainerCraftingCPU; import appeng.container.implementations.ContainerCraftingStatus; -import appeng.container.implementations.ContainerFluidStorageBus; import appeng.container.implementations.ContainerLevelEmitter; import appeng.container.implementations.ContainerNetworkTool; import appeng.container.implementations.ContainerPatternTerm; @@ -54,6 +53,7 @@ import appeng.container.implementations.ContainerSecurityStation; import appeng.container.implementations.ContainerStorageBus; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; +import appeng.fluids.container.ContainerFluidStorageBus; import appeng.helpers.IMouseWheelItem; diff --git a/src/main/java/appeng/client/gui/implementations/GuiFluidIO.java b/src/main/java/appeng/fluids/client/gui/GuiFluidIO.java similarity index 91% rename from src/main/java/appeng/client/gui/implementations/GuiFluidIO.java rename to src/main/java/appeng/fluids/client/gui/GuiFluidIO.java index e556f66ef..bca5df466 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFluidIO.java +++ b/src/main/java/appeng/fluids/client/gui/GuiFluidIO.java @@ -16,14 +16,15 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.client.gui.implementations; +package appeng.fluids.client.gui; import net.minecraft.entity.player.InventoryPlayer; import appeng.api.implementations.IUpgradeableHost; -import appeng.container.implementations.ContainerFluidIO; +import appeng.client.gui.implementations.GuiUpgradeable; import appeng.core.localization.GuiText; +import appeng.fluids.container.ContainerFluidIO; import appeng.fluids.parts.PartFluidImportBus; diff --git a/src/main/java/appeng/client/gui/implementations/GuiFluidStorageBus.java b/src/main/java/appeng/fluids/client/gui/GuiFluidStorageBus.java similarity index 94% rename from src/main/java/appeng/client/gui/implementations/GuiFluidStorageBus.java rename to src/main/java/appeng/fluids/client/gui/GuiFluidStorageBus.java index bac27ad10..c9f297f23 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFluidStorageBus.java +++ b/src/main/java/appeng/fluids/client/gui/GuiFluidStorageBus.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.client.gui.implementations; +package appeng.fluids.client.gui; import java.io.IOException; @@ -31,9 +31,9 @@ import appeng.api.config.ActionItems; import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.config.StorageFilter; +import appeng.client.gui.implementations.GuiUpgradeable; import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerFluidStorageBus; import appeng.core.AELog; import appeng.core.localization.GuiText; import appeng.core.sync.GuiBridge; @@ -41,6 +41,7 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketConfigButton; import appeng.core.sync.packets.PacketSwitchGuis; import appeng.core.sync.packets.PacketValueConfig; +import appeng.fluids.container.ContainerFluidStorageBus; import appeng.fluids.parts.PartFluidStorageBus; diff --git a/src/main/java/appeng/client/gui/implementations/GuiFluidTerminal.java b/src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java similarity index 95% rename from src/main/java/appeng/client/gui/implementations/GuiFluidTerminal.java rename to src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java index 30b3090e5..555a6f413 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFluidTerminal.java +++ b/src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.client.gui.implementations; +package appeng.fluids.client.gui; import java.io.IOException; @@ -47,15 +47,15 @@ import appeng.client.gui.widgets.MEGuiTextField; import appeng.client.me.FluidRepo; import appeng.client.me.SlotFluidME; import appeng.client.me.InternalFluidSlotME; -import appeng.container.implementations.ContainerFluidTerminal; import appeng.container.slot.ISlotFluid; import appeng.core.AELog; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketInventoryAction; import appeng.core.sync.packets.PacketValueConfig; +import appeng.fluids.container.ContainerFluidTerminal; +import appeng.fluids.parts.PartFluidTerminal; import appeng.helpers.InventoryAction; -import appeng.parts.reporting.PartFluidTerminal; import appeng.util.IConfigManagerHost; import appeng.util.Platform; import appeng.util.item.AEFluidStack; diff --git a/src/main/java/appeng/container/implementations/ContainerFluidIO.java b/src/main/java/appeng/fluids/container/ContainerFluidIO.java similarity index 96% rename from src/main/java/appeng/container/implementations/ContainerFluidIO.java rename to src/main/java/appeng/fluids/container/ContainerFluidIO.java index 6e161c979..7cb591233 100644 --- a/src/main/java/appeng/container/implementations/ContainerFluidIO.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidIO.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.container.implementations; +package appeng.fluids.container; import net.minecraft.entity.player.InventoryPlayer; @@ -26,6 +26,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.items.IItemHandler; import appeng.api.implementations.IUpgradeableHost; +import appeng.container.implementations.ContainerUpgradeable; import appeng.container.slot.OptionalSlotFakeFluid; import appeng.container.slot.SlotFakeFluid; diff --git a/src/main/java/appeng/container/implementations/ContainerFluidStorageBus.java b/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java similarity index 95% rename from src/main/java/appeng/container/implementations/ContainerFluidStorageBus.java rename to src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java index ccfa5621a..a0e457145 100644 --- a/src/main/java/appeng/container/implementations/ContainerFluidStorageBus.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.container.implementations; +package appeng.fluids.container; import java.util.Iterator; @@ -37,6 +37,7 @@ import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; import appeng.container.guisync.GuiSync; +import appeng.container.implementations.ContainerUpgradeable; import appeng.container.slot.OptionalSlotFakeFluid; import appeng.container.slot.SlotFakeFluid; import appeng.container.slot.SlotRestrictedInput; diff --git a/src/main/java/appeng/container/implementations/ContainerFluidTerminal.java b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java similarity index 96% rename from src/main/java/appeng/container/implementations/ContainerFluidTerminal.java rename to src/main/java/appeng/fluids/container/ContainerFluidTerminal.java index d5cb3e81c..c6f17196e 100644 --- a/src/main/java/appeng/container/implementations/ContainerFluidTerminal.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.container.implementations; +package appeng.fluids.container; import java.io.IOException; @@ -63,9 +63,9 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEFluidInventoryUpdate; import appeng.core.sync.packets.PacketTargetFluidStack; import appeng.core.sync.packets.PacketValueConfig; +import appeng.fluids.parts.PartFluidTerminal; import appeng.helpers.InventoryAction; import appeng.me.helpers.ChannelPowerSrc; -import appeng.parts.reporting.PartFluidTerminal; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; diff --git a/src/main/java/appeng/parts/reporting/PartFluidTerminal.java b/src/main/java/appeng/fluids/parts/PartFluidTerminal.java similarity index 91% rename from src/main/java/appeng/parts/reporting/PartFluidTerminal.java rename to src/main/java/appeng/fluids/parts/PartFluidTerminal.java index 0b8fe26ad..38c509026 100644 --- a/src/main/java/appeng/parts/reporting/PartFluidTerminal.java +++ b/src/main/java/appeng/fluids/parts/PartFluidTerminal.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.parts.reporting; +package appeng.fluids.parts; import net.minecraft.entity.player.EntityPlayer; @@ -28,6 +28,7 @@ import appeng.core.AppEng; import appeng.core.sync.GuiBridge; import appeng.items.parts.PartModels; import appeng.parts.PartModel; +import appeng.parts.reporting.AbstractPartTerminal; /** @@ -39,9 +40,9 @@ public class PartFluidTerminal extends AbstractPartTerminal { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation( AppEng.MOD_ID, "part/crafting_terminal_off" ); + public static final ResourceLocation MODEL_OFF = new ResourceLocation( AppEng.MOD_ID, "part/fluid_terminal_off" ); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation( AppEng.MOD_ID, "part/crafting_terminal_on" ); + public static final ResourceLocation MODEL_ON = new ResourceLocation( AppEng.MOD_ID, "part/fluid_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/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 1a3d1f467..235b47ebe 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -44,6 +44,7 @@ import appeng.core.localization.GuiText; import appeng.fluids.parts.PartFluidExportBus; import appeng.fluids.parts.PartFluidImportBus; import appeng.fluids.parts.PartFluidStorageBus; +import appeng.fluids.parts.PartFluidTerminal; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.parts.automation.PartAnnihilationPlane; @@ -73,7 +74,6 @@ import appeng.parts.p2p.PartP2PTunnelME; import appeng.parts.reporting.PartConversionMonitor; import appeng.parts.reporting.PartCraftingTerminal; import appeng.parts.reporting.PartDarkPanel; -import appeng.parts.reporting.PartFluidTerminal; import appeng.parts.reporting.PartInterfaceTerminal; import appeng.parts.reporting.PartPanel; import appeng.parts.reporting.PartPatternTerminal; diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_terminal.json index d61fef4ae..8da242944 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_terminal.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part/display", "textures": { - "front": "appliedenergistics2:items/part/terminal", - "front_bright": "appliedenergistics2:parts/terminal_bright", - "front_medium": "appliedenergistics2:parts/terminal_medium", - "front_dark": "appliedenergistics2:parts/terminal_dark" + "front": "appliedenergistics2:items/part/crafting_terminal", + "front_bright": "appliedenergistics2:parts/fluid_terminal/lights_bright", + "front_medium": "appliedenergistics2:parts/fluid_terminal/lights_medium", + "front_dark": "appliedenergistics2:parts/fluid_terminal/lights_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json index 9d036d085..bf94785bc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/export_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:items/part/export_bus", + "front": "appliedenergistics2:items/part/fluid_export_bus", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json index 98f994ded..5ac7962ac 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/import_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:items/part/import_bus", + "front": "appliedenergistics2:items/part/fluid_import_bus", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json index 7e1a4dd55..fbcce521b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/storage_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:items/part/storage_bus", + "front": "appliedenergistics2:items/part/fluid_storage_bus", "particle": "appliedenergistics2:parts/storage_bus_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json new file mode 100644 index 000000000..b0a836c66 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json @@ -0,0 +1,283 @@ +{ + "textures": { + "frame": "appliedenergistics2:parts/fluid_terminal/frame", + "sides": "appliedenergistics2:parts/fluid_terminal/sides", + "back": "appliedenergistics2:parts/fluid_terminal/back", + "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright", + "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium", + "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark", + "status": "appliedenergistics2:parts/fluid_terminal/status", + "backlights": "appliedenergistics2:parts/fluid_terminal/backlights", + "particle": "appliedenergistics2:parts/fluid_terminal/back" + }, + "elements": [ + { + "name": "Base", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 1.0 + ], + "faces": { + "north": { + "texture": "frame", + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + }, + "east": { + "texture": "sides", + "uv": [ + 0.0, + 2.0, + 1.0, + 14.0 + ] + }, + "south": { + "texture": "back", + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + }, + "west": { + "texture": "sides", + "uv": [ + 15.0, + 2.0, + 16.0, + 14.0 + ] + }, + "up": { + "texture": "sides", + "uv": [ + 2.0, + 0.0, + 14.0, + 1.0 + ] + }, + "down": { + "texture": "sides", + "uv": [ + 2.0, + 15.0, + 14.0, + 16.0 + ] + } + } + }, + { + "name": "lightsBright", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 1.0 + ], + "faces": { + "north": { + "texture": "lightsBright", + "tintindex": 1, + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + } + } + }, + { + "name": "lightsDark", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 1.0 + ], + "faces": { + "north": { + "texture": "lightsDark", + "tintindex": 2, + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + } + } + }, + { + "name": "lightsMedium", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 1.0 + ], + "faces": { + "north": { + "texture": "lightsMedium", + "tintindex": 3, + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + } + } + }, + { + "name": "Back", + "from": [ + 4.0, + 4.0, + 1.0 + ], + "to": [ + 12.0, + 12.0, + 2.0 + ], + "faces": { + "north": { + "texture": "back", + "uv": [ + 4.0, + 4.0, + 12.0, + 12.0 + ] + }, + "east": { + "texture": "status", + "uv": [ + 0.0, + 4.0, + 1.0, + 12.0 + ] + }, + "south": { + "texture": "back", + "uv": [ + 4.0, + 4.0, + 12.0, + 12.0 + ] + }, + "west": { + "texture": "status", + "uv": [ + 15.0, + 4.0, + 16.0, + 12.0 + ] + }, + "up": { + "texture": "status", + "uv": [ + 4.0, + 0.0, + 12.0, + 1.0 + ] + }, + "down": { + "texture": "status", + "uv": [ + 4.0, + 15.0, + 12.0, + 16.0 + ] + } + } + }, + { + "name": "backlights", + "from": [ + 4.0, + 4.0, + 1.0 + ], + "to": [ + 12.0, + 12.0, + 2.0 + ], + "faces": { + "east": { + "texture": "backlights", + "tintindex": 0, + "uv": [ + 0.0, + 4.0, + 1.0, + 12.0 + ] + }, + "west": { + "texture": "backlights", + "tintindex": 0, + "uv": [ + 15.0, + 4.0, + 16.0, + 12.0 + ] + }, + "up": { + "texture": "backlights", + "tintindex": 0, + "uv": [ + 4.0, + 0.0, + 12.0, + 1.0 + ] + }, + "down": { + "texture": "backlights", + "tintindex": 0, + "uv": [ + 4.0, + 15.0, + 12.0, + 16.0 + ] + } + } + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json new file mode 100644 index 000000000..d7f3c27d7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json @@ -0,0 +1,8 @@ +{ + "parent": "appliedenergistics2:part/display_off", + "textures": { + "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright", + "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium", + "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json new file mode 100644 index 000000000..2a2e7cdcd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json @@ -0,0 +1,76 @@ +{ + "ae2_uvl_marker": true, + "textures": { + "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright", + "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium", + "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_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/items/part/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png new file mode 100644 index 0000000000000000000000000000000000000000..5674143b6419000cae79547880b8df42c17ed33a GIT binary patch literal 340 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?S zaSXBW@0}FL*JL2zQqA?h!(K-sg zsk?J)?c-BR*U8AePkJbt_l-AfKGVXt?^1ma{HxSp$|&>DWG_*f{GsbemB)byHjCba zY#uetj5!M>Jo-x*UU+yuc+QfL=NbJi$#(XHV1_fgPhAqqz3aEC3201Vnj69qwda9; n%gzIgJyyM^Dz0A6oSR1_lOCS3j3^P6XMus01GN&>yFf8$O zaSXBWpE@a)ugO55rJC!0hrXT!hsm@Cn<5FmM};=ag10X;`g8T9%9OWtbC(_r`MEXM z2YPa zwwdF`kGAB5>LvN<0*rM__A~BMEt#-Yj?wEzFw2W+-rq literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..294e28b37c1c68a9e1e4e0ae84a5462796396c4c GIT binary patch literal 327 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&>yFwF3D zaSXBWpF1g*&%r>TrJ5`M(NU!qx1;A5AGYXtY_TjeY{@OR(&9_2?*|5;41XbX@+>lffbtr1J}Oe blbxIYR91X}{_!OY3=9mOu6{1-oD!M<8mDnC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_terminal.png new file mode 100644 index 0000000000000000000000000000000000000000..c5c2a4c1edaa8f868bb93b8996ca72dde1ea2609 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#LhU zT^vI!{F5bY9K1un?cX?0OJcV4s^rwe8``?w)UPmOVeoXA$-)@6_3#0PfCR^xEC*MJ qXQVQ$ThhbZe8p)iuSG%v1B1S`(|pxhdlm);1_n=8KbLh*2~7aX^F)mR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png new file mode 100644 index 0000000000000000000000000000000000000000..f225dcf4be7ed02289b753871b62cb4ff19f5052 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#Lza zT^vI!{F5bY9K1un?cX?0OJcV4s^rwe8``?w)UPmOVenkCWQjnlW7fi30t{&md3kzq zK2sQZd3hrYb9ot9uN~NxP*BMzua?1JD6yJx$0Q>&o*?e4W)B(~85x4FYS~FHYbs@6 PU|{fc^>bP0l+XkKnC47R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png new file mode 100644 index 0000000000000000000000000000000000000000..b9ac516475da2c9d48542b31c16f9ebf46e89111 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#I>f zT^vI!{MYsvaxob49RBs+|9MpNf#w&Ngf*I3BaMrN*SN}hZxAchIT&?iBTIJRaUq0& n&GXK9xjSfr$f~x@{mOXL&f-(cg^*4L1_lOCS3j3^P6%BGDw7g~jx@no+!@$a|+g9>A^@Szh~8@YrI zHD6%}NH}<-<--c`j8ukoOL};luOvx0=pEDYu!%d!z_8x5yXeaweO?9z1_n=8KbLh* G2~7a^a8DQj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png new file mode 100644 index 0000000000000000000000000000000000000000..e048439c789e984e3ddef2e89ce37eb7c81b4afc GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^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&>yFhqH} zIEGmGZ|%9r#h}2!{QLiWvv?l$&08`GF62ECn5e$ujYDd?hE}6}fXK8Rzw2xcn7!Y| zuJ!LeV|Ds%rmm!o<=b=@XiR%?nYZgv@WXMus01GN&>yFvxhi zIEGmGCrhw0GyG#_oZ=}bVVV#jVQ_XMus01GN&>yFcf;a zIEGmGFP#*~bwGi~+4hCrmf01j{Z4BI&RZ1yV4<(m{#j?$$nv6e(^dhD;lI Z1@TWwLi?L%?gv@J;OXk;vd$@?2>_~zKdt}( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png new file mode 100644 index 0000000000000000000000000000000000000000..142f38511c2f61f1c9ec3acfbebd6bf52ec420f1 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#Ko5 zT^vI!{I8zbD0skt!#U6`nQ_~KRCcrQH%@akgv|Ti$0Zlu-z7cyYfiBAT=rF5!faRE z#954lLG*J*xms2G`x`nAw76$2=4N`=$H|