more fluid API, tank labels (finally)

src/main/java/api/hbm/energy/IEnergyConductor.java

@@ -94,4 +94,14 @@ public interface IEnergyConductor extends IEnergyConnector {
 		
 		return pos;
 	}
+
+	//TODO: check if this standard implementation doesn't break anything (it shouldn't but right now it's a bit redundant) also: remove duplicate implementations
+	@Override
+	public default long transferPower(long power) {
+		
+		if(this.getPowerNet() == null)
+			return power;
+		
+		return this.getPowerNet().transferPower(power);
+	}
 }

src/main/java/api/hbm/fluid/IFluidConductor.java

@@ -7,4 +7,13 @@ public interface IFluidConductor extends IFluidConnector {
 	public IPipeNet getPipeNet(FluidType type);
 	
 	public void setPipeNet(FluidType type, IPipeNet network);
+	
+	@Override
+	public default long transferFluid(FluidType type, long amount) {
+		
+		if(this.getPipeNet(type) == null)
+			return amount;
+
+		return this.getPipeNet(type).transferFluid(amount);
+	}
 }

src/main/java/api/hbm/fluid/IFluidStandardReceiver.java

@@ -0,0 +1,49 @@
+package api.hbm.fluid;
+
+import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+
+/**
+ * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.
+ * Only handles a single input tank of the same type.
+ * Uses standard FluidTanks which use int32.
+ * Don't use this as part of the API!
+ * @author hbm
+ *
+ */
+public interface IFluidStandardReceiver extends IFluidUser {
+	
+	@Override
+	public default long transferFluid(FluidType type, long amount) {
+
+		for(FluidTank tank : getReceivingTanks()) {
+			if(tank.getTankType() == type) {
+				tank.setFill(tank.getFill() + (int) amount);
+				
+				if(tank.getFill() > tank.getMaxFill()) {
+					long overshoot = tank.getFill() - tank.getMaxFill();
+					tank.setFill(tank.getMaxFill());
+					return overshoot;
+				}
+				
+				return 0;
+			}
+		}
+		
+		return amount;
+	}
+
+	public FluidTank[] getReceivingTanks();
+
+	@Override
+	public default long getDemand(FluidType type) {
+		
+		for(FluidTank tank : getReceivingTanks()) {
+			if(tank.getTankType() == type) {
+				return tank.getMaxFill() - tank.getFill();
+			}
+		}
+		
+		return 0;
+	}
+}

src/main/java/api/hbm/fluid/IFluidStandardSender.java

@@ -0,0 +1,40 @@
+package api.hbm.fluid;
+
+import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+
+/**
+ * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.
+ * Only handles a single output tank of the same type.
+ * Uses standard FluidTanks which use int32.
+ * Don't use this as part of the API!
+ * @author hbm
+ *
+ */
+public interface IFluidStandardSender extends IFluidUser {
+
+	public FluidTank[] getSendingTanks();
+	
+	@Override
+	public default long getTotalFluidForSend(FluidType type) {
+		
+		for(FluidTank tank : getSendingTanks()) {
+			if(tank.getTankType() == type) {
+				return tank.getFill();
+			}
+		}
+		
+		return 0;
+	}
+	
+	@Override
+	public default void removeFluidForTransfer(FluidType type, long amount) {
+		
+		for(FluidTank tank : getSendingTanks()) {
+			if(tank.getTankType() == type) {
+				tank.setFill(tank.getFill() - (int) amount);
+				return;
+			}
+		}
+	}
+}

src/main/java/api/hbm/fluid/IFluidUser.java

@@ -54,8 +54,8 @@ public interface IFluidUser extends IFluidConnector {
 		}
 	}
 
-	public long getTotalFluidForSend(FluidType type);
-	public void removeFluidForTransfer(FluidType type, long amount);
+	public default long getTotalFluidForSend(FluidType type) { return 0; }
+	public default void removeFluidForTransfer(FluidType type, long amount) { }
 	
 	public default void updateStandardPipes(FluidType type, World world, int x, int y, int z) {
 		

src/main/java/com/hbm/blocks/fluid/GenericFluid.java

@@ -8,7 +8,7 @@ import net.minecraftforge.fluids.Fluid;
 public class GenericFluid extends Fluid {
 
 	public GenericFluid(String name) {
-		super("corium_fluid");
+		super(name);
 	}
 
 	@Override

src/main/java/com/hbm/items/ModItems.java

@@ -938,6 +938,7 @@ public class ModItems {
 	public static Item can_luna;
 	public static Item can_bepis;
 	public static Item can_breen;
+	public static Item can_mug;
 	public static Item mucho_mango;
 	public static Item bottle_empty;
 	public static Item bottle_nuka;
@@ -3458,8 +3459,9 @@ public class ModItems {
 		can_mrsugar = new ItemEnergy().setUnlocalizedName("can_mrsugar").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_mrsugar");
 		can_overcharge = new ItemEnergy().setUnlocalizedName("can_overcharge").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_overcharge");
 		can_luna = new ItemEnergy().setUnlocalizedName("can_luna").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_luna");
-		can_bepis = new ItemEnergy().setUnlocalizedName("can_bepis").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_bepis");;
+		can_bepis = new ItemEnergy().setUnlocalizedName("can_bepis").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_bepis");
 		can_breen = new ItemEnergy().setUnlocalizedName("can_breen").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_breen");
+		can_mug = new ItemEnergy().setUnlocalizedName("can_mug").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_mug");
 		bottle_empty = new Item().setUnlocalizedName("bottle_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_empty");
 		bottle_nuka = new ItemEnergy().setUnlocalizedName("bottle_nuka").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_nuka");
 		bottle_cherry = new ItemEnergy().setUnlocalizedName("bottle_cherry").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_cherry");
@@ -7602,6 +7604,7 @@ public class ModItems {
 		GameRegistry.registerItem(can_luna, can_luna.getUnlocalizedName());
 		GameRegistry.registerItem(can_bepis, can_bepis.getUnlocalizedName());
 		GameRegistry.registerItem(can_breen, can_breen.getUnlocalizedName());
+		GameRegistry.registerItem(can_mug, can_mug.getUnlocalizedName());
 		
 		//Coffee
 		GameRegistry.registerItem(coffee, coffee.getUnlocalizedName());

src/main/java/com/hbm/items/machine/ItemStamp.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import com.hbm.items.ModItems;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -29,7 +28,7 @@ public class ItemStamp extends Item {
 	
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
-		if(this.type == StampType.PLATE || this.type == StampType.WIRE || this.type == StampType.CIRCUIT)
+		if((this.type == StampType.PLATE || this.type == StampType.WIRE || this.type == StampType.CIRCUIT) && this.getMaxDamage() > 0)
 			list.add("[CREATED USING TEMPLATE FOLDER]");
 	}
 	

src/main/java/com/hbm/items/tool/ItemCraftingDegradation.java

@@ -10,6 +10,7 @@ public class ItemCraftingDegradation extends Item {
 	public ItemCraftingDegradation(int durability) {
 		this.setMaxStackSize(1);
 		this.setMaxDamage(durability);
+		this.setNoRepair();
 	}
 
 	@Override

src/main/java/com/hbm/render/tileentity/RenderFluidTank.java

@@ -14,68 +14,52 @@ import net.minecraftforge.client.model.IModelCustom;
 
 public class RenderFluidTank extends TileEntitySpecialRenderer {
 
-    @Override
-	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
-    {
-        GL11.glPushMatrix();
-        GL11.glTranslated(x + 0.5D, y, z + 0.5D);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_CULL_FACE);
+	@Override
+	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) {
+		GL11.glPushMatrix();
+		GL11.glTranslated(x + 0.5D, y, z + 0.5D);
+		GL11.glEnable(GL11.GL_LIGHTING);
+		GL11.glDisable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		GL11.glRotatef(180, 0F, 1F, 0F);
 		GL11.glRotatef(90, 0F, 1F, 0F);
-		switch(tileEntity.getBlockMetadata())
-		{
-		case 2:
-			GL11.glRotatef(90, 0F, 1F, 0F); break;
-		case 4:
-			GL11.glRotatef(180, 0F, 1F, 0F); break;
-		case 3:
-			GL11.glRotatef(270, 0F, 1F, 0F); break;
-		case 5:
-			GL11.glRotatef(0, 0F, 1F, 0F); break;
+		switch(tileEntity.getBlockMetadata()) {
+		case 2: GL11.glRotatef(90, 0F, 1F, 0F); break;
+		case 4: GL11.glRotatef(180, 0F, 1F, 0F); break;
+		case 3: GL11.glRotatef(270, 0F, 1F, 0F); break;
+		case 5: GL11.glRotatef(0, 0F, 1F, 0F); break;
 		}
 
-        bindTexture(ResourceManager.tank_tex);
+		bindTexture(ResourceManager.tank_tex);
 		ResourceManager.fluidtank.renderPart("Tank");
 
 		GL11.glShadeModel(GL11.GL_FLAT);
-        GL11.glPopMatrix();
-        
-        renderTileEntityAt2(tileEntity, x, y, z, f);
-    }
-    
-	public void renderTileEntityAt2(TileEntity tileEntity, double x, double y, double z, float f)
-    {
-        GL11.glPushMatrix();
-        GL11.glTranslated(x + 0.5D, y, z + 0.5D);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_CULL_FACE);
+		GL11.glPopMatrix();
+
+		renderTileEntityAt2(tileEntity, x, y, z, f);
+	}
+
+	public void renderTileEntityAt2(TileEntity tileEntity, double x, double y, double z, float f) {
+		GL11.glPushMatrix();
+		GL11.glTranslated(x + 0.5D, y, z + 0.5D);
+		GL11.glEnable(GL11.GL_LIGHTING);
+		GL11.glDisable(GL11.GL_CULL_FACE);
 		GL11.glRotatef(180, 0F, 1F, 0F);
 		GL11.glRotatef(90, 0F, 1F, 0F);
-		switch(tileEntity.getBlockMetadata())
-		{
-		case 2:
-			GL11.glRotatef(90, 0F, 1F, 0F); break;
-	        //GL11.glTranslated(0.5D, 0.0D, 0.0D);
-		case 4:
-			GL11.glRotatef(180, 0F, 1F, 0F); break;
-	        //GL11.glTranslated(0.5D, 0.0D, 0.0D);
-		case 3:
-			GL11.glRotatef(270, 0F, 1F, 0F); break;
-	        //GL11.glTranslated(0.5D, 0.0D, 0.0D);
-		case 5:
-			GL11.glRotatef(0, 0F, 1F, 0F); break;
-	        //GL11.glTranslated(0.5D, 0.0D, 0.0D);
+		switch(tileEntity.getBlockMetadata()) {
+		case 2: GL11.glRotatef(90, 0F, 1F, 0F); break;
+		case 4: GL11.glRotatef(180, 0F, 1F, 0F); break;
+		case 3: GL11.glRotatef(270, 0F, 1F, 0F); break;
+		case 5: GL11.glRotatef(0, 0F, 1F, 0F); break;
 		}
 
 		String s = "NONE";
 		if(tileEntity instanceof TileEntityMachineFluidTank)
-			s = ((TileEntityMachineFluidTank)tileEntity).tank.getTankType().name();
-		
-        bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/tank_" + s + ".png"));
-        ResourceManager.fluidtank.renderPart("Label");
+			s = ((TileEntityMachineFluidTank) tileEntity).tank.getTankType().name();
 
-        GL11.glPopMatrix();
-    }
+		bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/tank_label/tank_" + s + ".png"));
+		ResourceManager.fluidtank.renderPart("Label");
+
+		GL11.glPopMatrix();
+	}
 }