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 000000000..5674143b6 Binary files /dev/null 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 new file mode 100644 index 000000000..1c089bdc9 Binary files /dev/null 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_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png new file mode 100644 index 000000000..294e28b37 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png differ 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 000000000..c5c2a4c1e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_terminal.png differ 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 000000000..f225dcf4b Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png differ 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 000000000..b9ac51647 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png new file mode 100644 index 000000000..5c35091fc Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png differ 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 000000000..e048439c7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png new file mode 100644 index 000000000..4164db176 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png new file mode 100644 index 000000000..9c55296ad Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png new file mode 100644 index 000000000..8b1f6f9f3 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png differ 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 000000000..142f38511 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png differ