From d439fb2915d22a8b222cb9c7d892b4e8ec25f9e4 Mon Sep 17 00:00:00 2001 From: fscan Date: Wed, 29 Aug 2018 19:09:04 +0200 Subject: [PATCH] Fix fluid parts item models (#3676) --- .../fluids/parts/PartFluidStorageBus.java | 1 - .../parts/misc/PartSharedStorageBus.java | 34 ------------------- .../models/item/part/fluid_export_bus.json | 2 +- .../models/item/part/fluid_import_bus.json | 2 +- .../models/item/part/fluid_interface.json | 2 +- .../models/item/part/fluid_storage_bus.json | 2 +- 6 files changed, 4 insertions(+), 39 deletions(-) diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java index 65e5e58f7..72a857fbc 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java +++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java @@ -467,7 +467,6 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni return this.config; } - @SuppressWarnings( "Duplicates" ) @Nonnull @Override public IPartModel getStaticModels() diff --git a/src/main/java/appeng/parts/misc/PartSharedStorageBus.java b/src/main/java/appeng/parts/misc/PartSharedStorageBus.java index 02d1cdefa..18a3fb1bd 100644 --- a/src/main/java/appeng/parts/misc/PartSharedStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartSharedStorageBus.java @@ -22,11 +22,8 @@ package appeng.parts.misc; import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -37,7 +34,6 @@ import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.ticking.IGridTickable; import appeng.api.parts.IPartCollisionHelper; -import appeng.api.parts.IPartModel; import appeng.api.storage.ICellContainer; import appeng.api.storage.ICellInventory; import appeng.api.storage.IMEInventoryHandler; @@ -45,11 +41,8 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.util.AECableType; import appeng.api.util.IConfigManager; -import appeng.core.AppEng; import appeng.helpers.IPriorityHost; -import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -import appeng.parts.PartModel; import appeng.parts.automation.PartUpgradeable; @@ -60,14 +53,6 @@ import appeng.parts.automation.PartUpgradeable; */ public abstract class PartSharedStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IPriorityHost { - public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_base" ); - @PartModels - public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_off" ) ); - @PartModels - public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_on" ) ); - @PartModels - public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_has_channel" ) ); - private boolean wasActive = false; private int priority = 0; @@ -207,23 +192,4 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG { return 4; } - - @SuppressWarnings( "Duplicates" ) - @Nonnull - @Override - public IPartModel getStaticModels() - { - if( this.isActive() && this.isPowered() ) - { - return MODELS_HAS_CHANNEL; - } - else if( this.isPowered() ) - { - return MODELS_ON; - } - else - { - return MODELS_OFF; - } - } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json index 3b3c94b24..254a9331a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/export_bus_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:items/part/export_bus" + "front": "appliedenergistics2:items/part/fluid_export_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json index cd019540e..7adde9f95 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/import_bus_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:items/part/import_bus" + "front": "appliedenergistics2:items/part/fluid_import_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json index 8810a7578..c7fda9e65 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/monitor_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:items/part/interface" + "front": "appliedenergistics2:items/part/fluid_interface" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json index 464df4cea..2a8d25e71 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/storage_bus_sides", "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:items/part/storage_bus" + "front": "appliedenergistics2:items/part/fluid_storage_bus" }, "elements": [ {