Fix fluid parts item models (#3676)

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()

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;
-		}
-	}
 }

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": [
         {

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": [
         {

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": [
         {

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": [
         {