diff --git a/src/minecraft/fluidmech/client/gui/GuiReleaseValve.java b/src/minecraft/fluidmech/client/gui/GuiReleaseValve.java deleted file mode 100644 index 5cf6666ec..000000000 --- a/src/minecraft/fluidmech/client/gui/GuiReleaseValve.java +++ /dev/null @@ -1,99 +0,0 @@ -package fluidmech.client.gui; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ContainerRepair; -import net.minecraft.world.World; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiReleaseValve extends GuiContainer -{ - private ContainerRepair field_82327_o; - private InventoryPlayer field_82325_q; - - public GuiReleaseValve(InventoryPlayer par1, World par2World, int par3, int par4, int par5) - { - super(new ContainerRepair(par1, par2World, par3, par4, par5, Minecraft.getMinecraft().thePlayer)); - this.field_82325_q = par1; - this.field_82327_o = (ContainerRepair)this.inventorySlots; - } - - /** - * Adds the buttons (and other controls) to the screen in question. - */ - public void initGui() - { - super.initGui(); - Keyboard.enableRepeatEvents(true); - int width = (this.width - this.xSize) / 2; - int height = (this.height - this.ySize) / 2; - } - - /** - * Called when the screen is unloaded. Used to disable keyboard repeat events - */ - public void onGuiClosed() - { - super.onGuiClosed(); - Keyboard.enableRepeatEvents(false); - } - - /** - * Draw the foreground layer for the GuiContainer (everything in front of the items) - */ - protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - GL11.glDisable(GL11.GL_LIGHTING); - this.fontRenderer.drawString("Release Valve", 60, 6, 4210752); - - - - GL11.glEnable(GL11.GL_LIGHTING); - } - - /** - * Fired when a key is typed. This is the equivalent of KeyListener.keyTyped(KeyEvent e). - */ - protected void keyTyped(char par1, int par2) - { - super.keyTyped(par1, par2); - } - - /** - * Called when the mouse is clicked. - */ - protected void mouseClicked(int par1, int par2, int par3) - { - super.mouseClicked(par1, par2, par3); - } - - /** - * Draws the screen and all the components in it. - */ - public void drawScreen(int par1, int par2, float par3) - { - super.drawScreen(par1, par2, par3); - GL11.glDisable(GL11.GL_LIGHTING); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the items) - */ - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) - { - int tID = this.mc.renderEngine.getTexture("/gui/repair.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(tID); - int width = (this.width - this.xSize) / 2; - int height = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(width, height, 0, 0, this.xSize, this.ySize); - } - -} diff --git a/src/minecraft/fluidmech/common/FluidMech.java b/src/minecraft/fluidmech/common/FluidMech.java index 9dde4485a..350fd7240 100644 --- a/src/minecraft/fluidmech/common/FluidMech.java +++ b/src/minecraft/fluidmech/common/FluidMech.java @@ -76,6 +76,8 @@ public class FluidMech extends DummyModContainer public static final String BLOCK_TEXTURE_FILE = RESOURCE_PATH + "blocks.png"; public static final String ITEM_TEXTURE_FILE = RESOURCE_PATH + "items.png"; public static final String LANGUAGE_PATH = RESOURCE_PATH + "lang/"; + + public static final String TEXTURE_NAME_PREFIX = "fluidmechanics:"; private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US" }; diff --git a/src/minecraft/fluidmech/common/item/ItemBasic.java b/src/minecraft/fluidmech/common/item/ItemBasic.java new file mode 100644 index 000000000..9b3704e17 --- /dev/null +++ b/src/minecraft/fluidmech/common/item/ItemBasic.java @@ -0,0 +1,55 @@ +package fluidmech.common.item; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import universalelectricity.components.common.BasicComponents; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fluidmech.common.FluidMech; + +public class ItemBasic extends Item +{ + protected List icons = new ArrayList(); + + public ItemBasic(String name, int id) + { + super(id); + this.setUnlocalizedName(name); + this.setCreativeTab(BasicComponents.TAB); + } + + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister iconRegister) + { + List list = new ArrayList(); + this.getSubItems(this.itemID, this.getCreativeTab(), list); + + if (list.size() > 0) + { + for (ItemStack itemStack : list) + { + this.icons.add(iconRegister.func_94245_a(this.getUnlocalizedName(itemStack).replace("item.", FluidMech.TEXTURE_NAME_PREFIX))); + } + } + else + { + this.iconIndex = iconRegister.func_94245_a(this.getUnlocalizedName().replace("item.", FluidMech.TEXTURE_NAME_PREFIX)); + } + } + + @Override + public Icon getIconFromDamage(int damage) + { + if (this.icons.size() > damage) + { + return icons.get(damage); + } + + return super.getIconFromDamage(damage); + } +} \ No newline at end of file diff --git a/src/minecraft/fluidmech/common/item/ItemLiquidMachine.java b/src/minecraft/fluidmech/common/item/ItemLiquidMachine.java index 42f29511c..4520d5733 100644 --- a/src/minecraft/fluidmech/common/item/ItemLiquidMachine.java +++ b/src/minecraft/fluidmech/common/item/ItemLiquidMachine.java @@ -7,28 +7,22 @@ import net.minecraft.item.ItemStack; public class ItemLiquidMachine extends ItemBlock { - public ItemLiquidMachine(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - } + public ItemLiquidMachine(int id) + { + super(id); + this.setMaxDamage(0); + this.setHasSubtypes(true); + } - @Override - public int getMetadata(int damage) - { - return damage; - } + @Override + public int getMetadata(int damage) + { + return damage; + } - @Override - public String getItemNameIS(ItemStack par1ItemStack) - { - return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage()); - } - - @Override - public String getItemName() - { - return Block.blocksList[this.getBlockID()].getBlockName() + ".0"; - } + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage(); + } } diff --git a/src/minecraft/fluidmech/common/item/ItemParts.java b/src/minecraft/fluidmech/common/item/ItemParts.java index ae02c4a99..40f6cfe40 100644 --- a/src/minecraft/fluidmech/common/item/ItemParts.java +++ b/src/minecraft/fluidmech/common/item/ItemParts.java @@ -2,80 +2,59 @@ package fluidmech.common.item; import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import fluidmech.common.FluidMech; import fluidmech.common.TabFluidMech; -/** A metadata item containing parts of various machines in Liquid Mechanics Mod. +/** + * A metadata item containing parts of various machines in Liquid Mechanics Mod. * - * @author Rs */ -public class ItemParts extends Item + * @author Rs + */ +public class ItemParts extends ItemBasic { - public enum Parts - { - Bronze("Bronze", 0), - Iron("Iron", 1), - Obby("Obby", 2), - Nether("Nether", 3), - Seal("Seal", 16), - SlimeSeal("Slime", 17), - Tank("Tank", 18), - Valve("Valve", 19); + public enum Parts + { + Bronze("BronzeTube"), Iron("IronTube"), Obby("ObbyTube"), Nether("NetherTube"), Seal("LeatherSeal"), SlimeSeal("SlimeSeal"), Tank("UnfinishedTank"), Valve("ValvePart"); - public String name; - public int itemIndex; + public String name; - private Parts(String name, int itemIndex) - { - this.name = name; - this.itemIndex = itemIndex; - } - } + private Parts(String name) + { + this.name = name; + } + } - public ItemParts(int par1) - { - super(par1); - this.setHasSubtypes(true); - this.setMaxDamage(0); - this.setMaxStackSize(64); - this.setItemName("lmPart"); - this.setCreativeTab(TabFluidMech.INSTANCE); - } + public ItemParts(int par1) + { + super("lmPart", par1); + this.setHasSubtypes(true); + this.setMaxDamage(0); + this.setMaxStackSize(64); + this.setCreativeTab(TabFluidMech.INSTANCE); + } - @Override - public int getIconFromDamage(int par1) - { - if (par1 < Parts.values().length) { return Parts.values()[par1].itemIndex; } - return par1; - } + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + return "item." + Parts.values()[itemStack.getItemDamage()].name; + } - @Override - public String getTextureFile() - { - return FluidMech.ITEM_TEXTURE_FILE; - } + @Override + public int getMetadata(int meta) + { + return meta; + } - @Override - public String getItemNameIS(ItemStack i) - { - int j = i.getItemDamage(); - return i.getItem().getItemName() + "." + j; - } - - @Override - public int getMetadata(int meta) - { - return meta; - } - - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - for (int i = 0; i < Parts.values().length; i++) - { - par3List.add(new ItemStack(this, 1, i)); - } - } + @Override + public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) + { + for (int i = 0; i < Parts.values().length; i++) + { + par3List.add(new ItemStack(this, 1, i)); + } + } } diff --git a/src/minecraft/fluidmech/common/item/ItemPipe.java b/src/minecraft/fluidmech/common/item/ItemPipe.java index bfc8842a2..09adbb42c 100644 --- a/src/minecraft/fluidmech/common/item/ItemPipe.java +++ b/src/minecraft/fluidmech/common/item/ItemPipe.java @@ -1,5 +1,6 @@ package fluidmech.common.item; +import fluidmech.common.item.ItemParts.Parts; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -7,28 +8,22 @@ import net.minecraft.item.ItemStack; public class ItemPipe extends ItemBlock { - public ItemPipe(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - } + public ItemPipe(int id) + { + super(id); + this.setMaxDamage(0); + this.setHasSubtypes(true); + } - @Override - public int getMetadata(int damage) - { - return damage; - } + @Override + public int getMetadata(int damage) + { + return damage; + } - @Override - public String getItemNameIS(ItemStack par1ItemStack) - { - return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage()); - } - - @Override - public String getItemName() - { - return Block.blocksList[this.getBlockID()].getBlockName() + ".0"; - } + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage(); + } } diff --git a/src/minecraft/fluidmech/common/item/ItemReleaseValve.java b/src/minecraft/fluidmech/common/item/ItemReleaseValve.java index 13325ebd9..646affc31 100644 --- a/src/minecraft/fluidmech/common/item/ItemReleaseValve.java +++ b/src/minecraft/fluidmech/common/item/ItemReleaseValve.java @@ -21,14 +21,8 @@ public class ItemReleaseValve extends ItemBlock } @Override - public String getItemNameIS(ItemStack par1ItemStack) - { - return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage()); - } - - @Override - public String getItemName() - { - return Block.blocksList[this.getBlockID()].getBlockName() + ".0"; - } + public String getUnlocalizedName(ItemStack itemStack) + { + return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage(); + } } diff --git a/src/minecraft/fluidmech/common/item/ItemTank.java b/src/minecraft/fluidmech/common/item/ItemTank.java index e0ac1ed07..a1fe504d3 100644 --- a/src/minecraft/fluidmech/common/item/ItemTank.java +++ b/src/minecraft/fluidmech/common/item/ItemTank.java @@ -7,28 +7,22 @@ import net.minecraft.item.ItemStack; public class ItemTank extends ItemBlock { - public ItemTank(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - } + public ItemTank(int id) + { + super(id); + this.setMaxDamage(0); + this.setHasSubtypes(true); + } - @Override - public int getMetadata(int damage) - { - return damage; - } + @Override + public int getMetadata(int damage) + { + return damage; + } - @Override - public String getItemNameIS(ItemStack par1ItemStack) - { - return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage()); - } - - @Override - public String getItemName() - { - return Block.blocksList[this.getBlockID()].getBlockName() + ".0"; - } + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage(); + } } diff --git a/src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java b/src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java index 5775ce87c..e902d9ebe 100644 --- a/src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java +++ b/src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java @@ -197,7 +197,7 @@ public class TileEntityMinorPump extends TileEntityElectricityRunnable implement int f = getFillTarget().fill(back, this.color.getLiquidData().getStack(), true); if (f > 0) { - worldObj.setBlockWithNotify(xCoord, yCoord - 1, zCoord, 0); + worldObj.setBlockAndMetadataWithNotify(xCoord, yCoord - 1, zCoord, 0, 0, 3); return true; } } diff --git a/src/minecraft/fluidmech/resource/blocks.png b/src/minecraft/fluidmech/resource/blocks.png deleted file mode 100644 index 0c893be66..000000000 Binary files a/src/minecraft/fluidmech/resource/blocks.png and /dev/null differ diff --git a/src/minecraft/fluidmech/resource/blue.png b/src/minecraft/fluidmech/resource/blue.png deleted file mode 100644 index 9e3ae82b7..000000000 Binary files a/src/minecraft/fluidmech/resource/blue.png and /dev/null differ diff --git a/src/minecraft/hydraulic/core/liquids/HydraulicNetworkManager.java b/src/minecraft/hydraulic/core/liquids/HydraulicNetworkManager.java index 306fe59ce..9982dd70c 100644 --- a/src/minecraft/hydraulic/core/liquids/HydraulicNetworkManager.java +++ b/src/minecraft/hydraulic/core/liquids/HydraulicNetworkManager.java @@ -9,6 +9,7 @@ import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; +import universalelectricity.core.vector.VectorHelper; import cpw.mods.fml.common.FMLLog; /** @@ -17,136 +18,131 @@ import cpw.mods.fml.common.FMLLog; */ public class HydraulicNetworkManager { - public static HydraulicNetworkManager instance = new HydraulicNetworkManager(); + public static HydraulicNetworkManager instance = new HydraulicNetworkManager(); - private List hydraulicNetworks = new ArrayList(); + private List hydraulicNetworks = new ArrayList(); - /** - * Registers a conductor into the UE electricity net. - */ - public void registerConductor(IFluidPipe newConductor) - { - this.cleanUpNetworks(); - HydraulicNetwork newNetwork = new HydraulicNetwork(newConductor); - this.hydraulicNetworks.add(newNetwork); - } + /** + * Registers a conductor into the UE electricity net. + */ + public void registerConductor(IFluidPipe newConductor) + { + this.cleanUpNetworks(); + HydraulicNetwork newNetwork = new HydraulicNetwork(newConductor); + this.hydraulicNetworks.add(newNetwork); + } - public void unregister(TileEntity tileEntity) - { - for (HydraulicNetwork network : this.hydraulicNetworks) - { - network.removeEntity(tileEntity); - } - } + public void unregister(TileEntity tileEntity) + { + for (HydraulicNetwork network : this.hydraulicNetworks) + { + network.removeEntity(tileEntity); + } + } - /** - * Merges two connection lines together into one. - * - * @param networkA - * - The network to be merged into. This network will be kept. - * @param networkB - * - The network to be merged. This network will be deleted. - */ - public void mergeConnection(HydraulicNetwork networkA, HydraulicNetwork networkB) - { - if (networkA != networkB) - { - if (networkA != null && networkB != null) - { - networkA.conductors.addAll(networkB.conductors); - networkA.setNetwork(); - this.hydraulicNetworks.remove(networkB); - networkB = null; + /** + * Merges two connection lines together into one. + * + * @param networkA - The network to be merged into. This network will be kept. + * @param networkB - The network to be merged. This network will be deleted. + */ + public void mergeConnection(HydraulicNetwork networkA, HydraulicNetwork networkB) + { + if (networkA != networkB) + { + if (networkA != null && networkB != null) + { + networkA.conductors.addAll(networkB.conductors); + networkA.setNetwork(); + this.hydraulicNetworks.remove(networkB); + networkB = null; - networkA.cleanConductors(); - } - else - { - System.err.println("Failed to merge pipe connections!"); - } - } - } + networkA.cleanConductors(); + } + else + { + System.err.println("Failed to merge pipe connections!"); + } + } + } - /** - * Separate one connection line into two different ones between two - * conductors. This function does this by resetting all wires in the - * connection line and making them each reconnect. - * - * @param conductorA - * - existing conductor - * @param conductorB - * - broken/invalid conductor - */ - public void splitConnection(IFluidPipe conductorA, IFluidPipe conductorB) - { - try - { - HydraulicNetwork network = conductorA.getNetwork(); + /** + * Separate one connection line into two different ones between two conductors. This function + * does this by resetting all wires in the connection line and making them each reconnect. + * + * @param conductorA - existing conductor + * @param conductorB - broken/invalid conductor + */ + public void splitConnection(IFluidPipe conductorA, IFluidPipe conductorB) + { + try + { + HydraulicNetwork network = conductorA.getNetwork(); - if (network != null) - { - network.cleanConductors(); - network.resetConductors(); + if (network != null) + { + network.cleanConductors(); + network.resetConductors(); - Iterator it = network.conductors.iterator(); + Iterator it = network.conductors.iterator(); - while (it.hasNext()) - { - IFluidPipe conductor = (IFluidPipe) it.next(); + while (it.hasNext()) + { + IFluidPipe conductor = (IFluidPipe) it.next(); - for (byte i = 0; i < 6; i++) - { - conductor.updateConnectionWithoutSplit(Vector3.getConnectorFromSide(((TileEntity) conductor).worldObj, new Vector3((TileEntity) conductor), ForgeDirection.getOrientation(i)), ForgeDirection.getOrientation(i)); - } - } - } - else - { - FMLLog.severe("Conductor invalid network while splitting connection!"); - } - } - catch (Exception e) - { - FMLLog.severe("Failed to split wire connection!"); - e.printStackTrace(); - } - } + for (byte i = 0; i < 6; i++) + { + conductor.updateConnectionWithoutSplit(VectorHelper.getConnectorFromSide(((TileEntity) conductor).worldObj, new Vector3((TileEntity) conductor), ForgeDirection.getOrientation(i)), ForgeDirection.getOrientation(i)); + } + } + } + else + { + FMLLog.severe("Conductor invalid network while splitting connection!"); + } + } + catch (Exception e) + { + FMLLog.severe("Failed to split wire connection!"); + e.printStackTrace(); + } + } - /** - * Clean up and remove all useless and invalid connections. - */ - public void cleanUpNetworks() - { - try - { - Iterator it = hydraulicNetworks.iterator(); + /** + * Clean up and remove all useless and invalid connections. + */ + public void cleanUpNetworks() + { + try + { + Iterator it = hydraulicNetworks.iterator(); - while (it.hasNext()) - { - HydraulicNetwork network = (HydraulicNetwork) it.next(); - network.cleanConductors(); + while (it.hasNext()) + { + HydraulicNetwork network = (HydraulicNetwork) it.next(); + network.cleanConductors(); - if (network.conductors.size() == 0) - { - it.remove(); - } - } - } - catch (Exception e) - { - FMLLog.severe("Failed to clean up wire connections!"); - e.printStackTrace(); - } - } + if (network.conductors.size() == 0) + { + it.remove(); + } + } + } + catch (Exception e) + { + FMLLog.severe("Failed to clean up wire connections!"); + e.printStackTrace(); + } + } - public void resetConductors() - { - Iterator it = hydraulicNetworks.iterator(); + public void resetConductors() + { + Iterator it = hydraulicNetworks.iterator(); - while (it.hasNext()) - { - HydraulicNetwork network = ((HydraulicNetwork) it.next()); - network.resetConductors(); - } - } + while (it.hasNext()) + { + HydraulicNetwork network = ((HydraulicNetwork) it.next()); + network.resetConductors(); + } + } } diff --git a/src/minecraft/fluidmech/resource/lang/en_US.properties b/src/mods/fluidmechanics/languages/en_US.properties similarity index 100% rename from src/minecraft/fluidmech/resource/lang/en_US.properties rename to src/mods/fluidmechanics/languages/en_US.properties diff --git a/src/mods/fluidmechanics/textures/items/BronzeTube.png b/src/mods/fluidmechanics/textures/items/BronzeTube.png new file mode 100644 index 000000000..568003676 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/BronzeTube.png differ diff --git a/src/mods/fluidmechanics/textures/items/GuardKit.png b/src/mods/fluidmechanics/textures/items/GuardKit.png new file mode 100644 index 000000000..386080081 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/GuardKit.png differ diff --git a/src/mods/fluidmechanics/textures/items/IronTube.png b/src/mods/fluidmechanics/textures/items/IronTube.png new file mode 100644 index 000000000..b514b1236 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/IronTube.png differ diff --git a/src/mods/fluidmechanics/textures/items/LeatherSeal.png b/src/mods/fluidmechanics/textures/items/LeatherSeal.png new file mode 100644 index 000000000..294fb9dcd Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/LeatherSeal.png differ diff --git a/src/mods/fluidmechanics/textures/items/NetherTube.png b/src/mods/fluidmechanics/textures/items/NetherTube.png new file mode 100644 index 000000000..15562e617 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/NetherTube.png differ diff --git a/src/mods/fluidmechanics/textures/items/ObbyTube.png b/src/mods/fluidmechanics/textures/items/ObbyTube.png new file mode 100644 index 000000000..cdb597061 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/ObbyTube.png differ diff --git a/src/mods/fluidmechanics/textures/items/PipeGuage.png b/src/mods/fluidmechanics/textures/items/PipeGuage.png new file mode 100644 index 000000000..cb5f3d0e4 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/PipeGuage.png differ diff --git a/src/mods/fluidmechanics/textures/items/SlimeSeal.png b/src/mods/fluidmechanics/textures/items/SlimeSeal.png new file mode 100644 index 000000000..084c82ea1 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/SlimeSeal.png differ diff --git a/src/mods/fluidmechanics/textures/items/UnfinishedTank.png b/src/mods/fluidmechanics/textures/items/UnfinishedTank.png new file mode 100644 index 000000000..a79b255bd Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/UnfinishedTank.png differ diff --git a/src/mods/fluidmechanics/textures/items/ValvePart.png b/src/mods/fluidmechanics/textures/items/ValvePart.png new file mode 100644 index 000000000..f217422e9 Binary files /dev/null and b/src/mods/fluidmechanics/textures/items/ValvePart.png differ diff --git a/src/minecraft/fluidmech/resource/items.png b/src/mods/fluidmechanics/textures/items/items.png similarity index 100% rename from src/minecraft/fluidmech/resource/items.png rename to src/mods/fluidmechanics/textures/items/items.png diff --git a/src/minecraft/fluidmech/resource/ReleaseValve.png b/src/mods/fluidmechanics/textures/models/ReleaseValve.png similarity index 100% rename from src/minecraft/fluidmech/resource/ReleaseValve.png rename to src/mods/fluidmechanics/textures/models/ReleaseValve.png diff --git a/src/minecraft/fluidmech/resource/Sink.png b/src/mods/fluidmechanics/textures/models/Sink.png similarity index 100% rename from src/minecraft/fluidmech/resource/Sink.png rename to src/mods/fluidmechanics/textures/models/Sink.png diff --git a/src/minecraft/fluidmech/resource/gear_shaft_piston.png b/src/mods/fluidmechanics/textures/models/gear_shaft_piston.png similarity index 100% rename from src/minecraft/fluidmech/resource/gear_shaft_piston.png rename to src/mods/fluidmechanics/textures/models/gear_shaft_piston.png diff --git a/src/minecraft/fluidmech/resource/mechanical/GearRod.png b/src/mods/fluidmechanics/textures/models/mechanical/GearRod.png similarity index 100% rename from src/minecraft/fluidmech/resource/mechanical/GearRod.png rename to src/mods/fluidmechanics/textures/models/mechanical/GearRod.png diff --git a/src/minecraft/fluidmech/resource/mechanical/Generator.png b/src/mods/fluidmechanics/textures/models/mechanical/Generator.png similarity index 100% rename from src/minecraft/fluidmech/resource/mechanical/Generator.png rename to src/mods/fluidmechanics/textures/models/mechanical/Generator.png diff --git a/src/minecraft/fluidmech/resource/pipes/BlackPipe.png b/src/mods/fluidmechanics/textures/models/pipes/BlackPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/BlackPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/BlackPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/BluePipe.png b/src/mods/fluidmechanics/textures/models/pipes/BluePipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/BluePipe.png rename to src/mods/fluidmechanics/textures/models/pipes/BluePipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/BrownPipe.png b/src/mods/fluidmechanics/textures/models/pipes/BrownPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/BrownPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/BrownPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/CyanPipe.png b/src/mods/fluidmechanics/textures/models/pipes/CyanPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/CyanPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/CyanPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/GreenPipe.png b/src/mods/fluidmechanics/textures/models/pipes/GreenPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/GreenPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/GreenPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/GreyPipe.png b/src/mods/fluidmechanics/textures/models/pipes/GreyPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/GreyPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/GreyPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/LightBluePipe.png b/src/mods/fluidmechanics/textures/models/pipes/LightBluePipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/LightBluePipe.png rename to src/mods/fluidmechanics/textures/models/pipes/LightBluePipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/LimePipe.png b/src/mods/fluidmechanics/textures/models/pipes/LimePipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/LimePipe.png rename to src/mods/fluidmechanics/textures/models/pipes/LimePipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/MagentaPipe.png b/src/mods/fluidmechanics/textures/models/pipes/MagentaPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/MagentaPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/MagentaPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/OrangePipe.png b/src/mods/fluidmechanics/textures/models/pipes/OrangePipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/OrangePipe.png rename to src/mods/fluidmechanics/textures/models/pipes/OrangePipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/PinkPipe.png b/src/mods/fluidmechanics/textures/models/pipes/PinkPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/PinkPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/PinkPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/Pipe.png b/src/mods/fluidmechanics/textures/models/pipes/Pipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/Pipe.png rename to src/mods/fluidmechanics/textures/models/pipes/Pipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/PurplePipe.png b/src/mods/fluidmechanics/textures/models/pipes/PurplePipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/PurplePipe.png rename to src/mods/fluidmechanics/textures/models/pipes/PurplePipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/RedPipe.png b/src/mods/fluidmechanics/textures/models/pipes/RedPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/RedPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/RedPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/SilverPipe.png b/src/mods/fluidmechanics/textures/models/pipes/SilverPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/SilverPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/SilverPipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/WhitePipe.png b/src/mods/fluidmechanics/textures/models/pipes/WhitePipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/WhitePipe.png rename to src/mods/fluidmechanics/textures/models/pipes/WhitePipe.png diff --git a/src/minecraft/fluidmech/resource/pipes/YellowPipe.png b/src/mods/fluidmechanics/textures/models/pipes/YellowPipe.png similarity index 100% rename from src/minecraft/fluidmech/resource/pipes/YellowPipe.png rename to src/mods/fluidmechanics/textures/models/pipes/YellowPipe.png diff --git a/src/minecraft/fluidmech/resource/pumps/WaterPump.png b/src/mods/fluidmechanics/textures/models/pumps/WaterPump.png similarity index 100% rename from src/minecraft/fluidmech/resource/pumps/WaterPump.png rename to src/mods/fluidmechanics/textures/models/pumps/WaterPump.png diff --git a/src/minecraft/fluidmech/resource/tanks/Corner.png b/src/mods/fluidmechanics/textures/models/tanks/Corner.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/Corner.png rename to src/mods/fluidmechanics/textures/models/tanks/Corner.png diff --git a/src/minecraft/fluidmech/resource/tanks/CornerLava.png b/src/mods/fluidmechanics/textures/models/tanks/CornerLava.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/CornerLava.png rename to src/mods/fluidmechanics/textures/models/tanks/CornerLava.png diff --git a/src/minecraft/fluidmech/resource/tanks/CornerMilk.png b/src/mods/fluidmechanics/textures/models/tanks/CornerMilk.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/CornerMilk.png rename to src/mods/fluidmechanics/textures/models/tanks/CornerMilk.png diff --git a/src/minecraft/fluidmech/resource/tanks/CornerWater.png b/src/mods/fluidmechanics/textures/models/tanks/CornerWater.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/CornerWater.png rename to src/mods/fluidmechanics/textures/models/tanks/CornerWater.png diff --git a/src/minecraft/fluidmech/resource/tanks/LavaTank.png b/src/mods/fluidmechanics/textures/models/tanks/LavaTank.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/LavaTank.png rename to src/mods/fluidmechanics/textures/models/tanks/LavaTank.png diff --git a/src/minecraft/fluidmech/resource/tanks/MilkTank.png b/src/mods/fluidmechanics/textures/models/tanks/MilkTank.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/MilkTank.png rename to src/mods/fluidmechanics/textures/models/tanks/MilkTank.png diff --git a/src/minecraft/fluidmech/resource/tanks/SteamTank.png b/src/mods/fluidmechanics/textures/models/tanks/SteamTank.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/SteamTank.png rename to src/mods/fluidmechanics/textures/models/tanks/SteamTank.png diff --git a/src/minecraft/fluidmech/resource/tanks/Tank.png b/src/mods/fluidmechanics/textures/models/tanks/Tank.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/Tank.png rename to src/mods/fluidmechanics/textures/models/tanks/Tank.png diff --git a/src/minecraft/fluidmech/resource/tanks/Tank2.png b/src/mods/fluidmechanics/textures/models/tanks/Tank2.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/Tank2.png rename to src/mods/fluidmechanics/textures/models/tanks/Tank2.png diff --git a/src/minecraft/fluidmech/resource/tanks/WaterTank.png b/src/mods/fluidmechanics/textures/models/tanks/WaterTank.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/WaterTank.png rename to src/mods/fluidmechanics/textures/models/tanks/WaterTank.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/0.png b/src/mods/fluidmechanics/textures/models/tanks/guage/0.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/0.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/0.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/0Fuel.png b/src/mods/fluidmechanics/textures/models/tanks/guage/0Fuel.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/0Fuel.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/0Fuel.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/0Lava.png b/src/mods/fluidmechanics/textures/models/tanks/guage/0Lava.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/0Lava.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/0Lava.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/1.png b/src/mods/fluidmechanics/textures/models/tanks/guage/1.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/1.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/1.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/1Fuel.png b/src/mods/fluidmechanics/textures/models/tanks/guage/1Fuel.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/1Fuel.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/1Fuel.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/1Lava.png b/src/mods/fluidmechanics/textures/models/tanks/guage/1Lava.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/1Lava.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/1Lava.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/2.png b/src/mods/fluidmechanics/textures/models/tanks/guage/2.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/2.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/2.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/2Fuel.png b/src/mods/fluidmechanics/textures/models/tanks/guage/2Fuel.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/2Fuel.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/2Fuel.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/2Lava.png b/src/mods/fluidmechanics/textures/models/tanks/guage/2Lava.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/2Lava.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/2Lava.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/3.png b/src/mods/fluidmechanics/textures/models/tanks/guage/3.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/3.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/3.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/3Fuel.png b/src/mods/fluidmechanics/textures/models/tanks/guage/3Fuel.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/3Fuel.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/3Fuel.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/3Lava.png b/src/mods/fluidmechanics/textures/models/tanks/guage/3Lava.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/3Lava.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/3Lava.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/4.png b/src/mods/fluidmechanics/textures/models/tanks/guage/4.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/4.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/4.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/4Fuel.png b/src/mods/fluidmechanics/textures/models/tanks/guage/4Fuel.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/4Fuel.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/4Fuel.png diff --git a/src/minecraft/fluidmech/resource/tanks/guage/4Lava.png b/src/mods/fluidmechanics/textures/models/tanks/guage/4Lava.png similarity index 100% rename from src/minecraft/fluidmech/resource/tanks/guage/4Lava.png rename to src/mods/fluidmechanics/textures/models/tanks/guage/4Lava.png