Improve textures. Remove energy from control pane. Fix wrench render....

Author: aurilisdev

src/main/java/physica/core/common/CoreBlockRegister.java

@@ -61,10 +61,9 @@ public void preInit()
 		GameRegistry.registerTileEntity(TileEnergyCable.class, CoreReferences.PREFIX + "energyCable");
 		GameRegistry.registerBlock(blockTinOre = new BlockOre("tinOre", ConfigCore.TIN_ORE_HARVEST_LEVEL), "tinOre");
 		GameRegistry.registerBlock(blockCopperOre = new BlockOre("copperOre", ConfigCore.COPPER_ORE_HARVEST_LEVEL), "copperOre");
-		GameRegistry.registerBlock(blockLead = new BlockLead(), "blockLead");
 		GameRegistry.registerBlock(blockLeadOre = new BlockOre("leadOre", ConfigCore.LEAD_ORE_HARVEST_LEVEL), "leadOre");
 		GameRegistry.registerBlock(blockSilverOre = new BlockOre("silverOre", ConfigCore.SILVER_ORE_HARVEST_LEVEL), "silverOre");
-
+		GameRegistry.registerBlock(blockLead = new BlockLead(), "blockLead");
 		OreDictionary.registerOre("oreLead", blockLeadOre);
 		OreDictionary.registerOre("oreTin", blockTinOre);
 		OreDictionary.registerOre("oreCopper", blockCopperOre);

src/main/java/physica/core/common/CoreItemRegister.java

@@ -27,7 +27,7 @@ public void preInit()
 		GameRegistry.registerItem(itemEmptyCell = (ItemInformationHolder) new ItemInformationHolder("emptyCell").setMaxStackSize(64), itemEmptyCell.getUnlocalizedName());
 		GameRegistry.registerItem(itemMetaCircuit = new ItemMetaHolder("circuit_basic").addSubItem("circuit_advanced").addSubItem("circuit_elite"), "item.metaCircuit");
 		GameRegistry.registerItem(itemMetaPlate = new ItemMetaHolder("plateIron").addSubItem("plateSteel").addSubItem("plateLead"), "item.metaPlate");
-		GameRegistry.registerItem(itemMetaIngot = new ItemMetaHolder("tinIngot").addSubItem("copperIngot").addSubItem("steelIngot").addSubItem("leadIngot").addSubItem("silverIngot").addSubItem("superConductiveIngot"), "item.metaIngot");
+		GameRegistry.registerItem(itemMetaIngot = new ItemMetaHolder("ingotTin").addSubItem("ingotCopper").addSubItem("ingotSteel").addSubItem("ingotLead").addSubItem("ingotSilver").addSubItem("ingotSuperConductive"), "item.metaIngot");
 		GameRegistry.registerItem(itemMetaBlend = new ItemMetaHolder("blendSuperConductive"), "item.metaBlend");
 		GameRegistry.registerItem(itemWrench = new ItemWrench(), itemWrench.getUnlocalizedName());
 		GameRegistry.registerItem(itemMotor = (ItemInformationHolder) new ItemInformationHolder("motor").setMaxStackSize(64), itemMotor.getUnlocalizedName());

src/main/java/physica/core/common/items/ItemBattery.java

@@ -7,10 +7,10 @@
 public class ItemBattery extends ItemElectric {
 
 	public ItemBattery(String name) {
-		super((int) (250000 / 0.4D));
+		super((int) (250000 / 0.4));
+		setMaxTransfer((int) (2500 / 0.4));
 		setUnlocalizedName(name);
 		setTextureName(CoreReferences.PREFIX + name);
 		setCreativeTab(CoreTabRegister.coreTab);
 	}
-
 }

src/main/java/physica/core/common/items/ItemMultimeter.java

@@ -22,6 +22,12 @@ public ItemMultimeter() {
 		setCreativeTab(CoreTabRegister.coreTab);
 	}
 
+	@Override
+	public boolean isFull3D()
+	{
+		return false;
+	}
+
 	@Override
 	public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
 	{

src/main/java/physica/core/common/items/ItemWrench.java

@@ -8,19 +8,37 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import physica.CoreReferences;
 import physica.core.common.CoreTabRegister;
 
 public class ItemWrench extends Item implements IToolWrench, IToolHammer, IMekWrench, IAEWrench {
 
 	public ItemWrench() {
-
 		setUnlocalizedName("wrench");
 		setTextureName(CoreReferences.PREFIX + "wrench");
 		setMaxStackSize(1);
 		setCreativeTab(CoreTabRegister.coreTab);
 	}
 
+	@Override
+	public boolean isFull3D()
+	{
+		return true;
+	}
+
+	@Override
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int hitSide, float hitX, float hitY, float hitZ)
+	{
+		return true;
+	}
+
+	@Override
+	public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player)
+	{
+		return true;
+	}
+
 	@Override
 	public boolean canUseWrench(EntityPlayer player, int x, int y, int z)
 	{

src/main/java/physica/core/common/tile/TileBlastFurnace.java

@@ -21,7 +21,7 @@
 
 public class TileBlastFurnace extends TileBaseContainer implements IGuiInterface {
 
-	public static final int		TOTAL_BURN_TIME			= 500;
+	public static final int		TOTAL_BURN_TIME			= 200;
 
 	public static final int		SLOT_INPUT				= 0;
 	public static final int		SLOT_INPUTFUEL			= 1;

src/main/java/physica/library/energy/ElectricityDisplay.java

@@ -20,10 +20,6 @@ public static String getDisplay(double value, Unit unit, int decimalPlaces, bool
 		{
 			return value + " " + unitName;
 		}
-		if (value <= Measurement.MILLI.value)
-		{
-			return IBaseUtilities.roundPreciseStatic(Measurement.MICRO.process(value), decimalPlaces) + " " + Measurement.MICRO.getName(isShort) + unitName;
-		}
 		if (value < 1.0D)
 		{
 			return IBaseUtilities.roundPreciseStatic(Measurement.MILLI.process(value), decimalPlaces) + " " + Measurement.MILLI.getName(isShort) + unitName;

src/main/java/physica/library/energy/base/Measurement.java

@@ -1,7 +1,7 @@
 package physica.library.energy.base;
 
 public enum Measurement {
-	MICRO("Micro", "µ", 1.0E-6D), MILLI("Milli", "m", 0.001D), KILO("Kilo", "k", 1E3), MEGA("Mega", "M", 1.0E6), GIGA("Giga", "G", 1.0E9);
+	MILLI("Milli", "m", 0.001D), KILO("Kilo", "k", 1E3), MEGA("Mega", "M", 1.0E6), GIGA("Giga", "G", 1.0E9);
 
 	public String	name;
 	public String	symbol;

src/main/java/physica/library/item/ItemElectric.java

@@ -63,15 +63,15 @@ public double getDurabilityForDisplay(ItemStack container)
 	@Override
 	public boolean showDurabilityBar(ItemStack stack)
 	{
-		return true;
+		return getEnergyStored(stack) < getMaxEnergyStored(stack);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List info, boolean par4)
 	{
 		super.addInformation(stack, player, info, par4);
-		info.add(EnumChatFormatting.AQUA + "Energy Stored: " + EnumChatFormatting.GRAY + ElectricityDisplay.getDisplay(ElectricityUtilities.convertEnergy(getEnergyStored(stack), Unit.RF, Unit.WATT), Unit.WATT));
+		info.add(EnumChatFormatting.AQUA + "Power Stored: " + EnumChatFormatting.GRAY + ElectricityDisplay.getDisplay(ElectricityUtilities.convertEnergy(getEnergyStored(stack), Unit.RF, Unit.WATT), Unit.WATT));
 	}
 
 	@Override
@@ -101,7 +101,7 @@ public void setEnergyStored(ItemStack container, int amount)
 
 		int energyStored = (int) Math.max(Math.min(amount, getMaxEnergyStored(container)), 0.0D);
 		container.stackTagCompound.setInteger(ENERGY_NBT_DATA, energyStored);
-		container.setItemDamage((int) Math.max(1, Math.abs(energyStored / (float) getMaxEnergyStored(container) * 100 - 100)));
+		container.setItemDamage((int) Math.max(0, Math.abs(energyStored / (float) getMaxEnergyStored(container) * 100 - 100)));
 	}
 
 	@Override

src/main/resources/assets/physica/lang/en_US.lang

@@ -18,12 +18,12 @@ tile.physica:blastFurnace.gui=Blast Furnace
 item.emptyCell.name=Empty Cell
 item.motor.name=Motor
 item.multimeter.name=Multimeter
-item.tinIngot.name=Tin Ingot
-item.copperIngot.name=Copper Ingot
-item.steelIngot.name=Steel Ingot
-item.leadIngot.name=Lead Ingot
-item.silverIngot.name=Silver Ingot
-item.superConductiveIngot.name=Superconductive Ingot
+item.ingotTin.name=Tin Ingot
+item.ingotCopper.name=Copper Ingot
+item.ingotSteel.name=Steel Ingot
+item.ingotLead.name=Lead Ingot
+item.ingotSilver.name=Silver Ingot
+item.ingotSuperConductive.name=Superconductive Ingot
 item.blendSuperConductive.name=Superconductive Blend
 item.plateIron.name=Iron Plate
 item.plateSteel.name=Steel Plate