tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

v4.3 Ninjafix #1

Browse source 
*Fixed bad version number.
*Fixed incorrect creative tab label name.
*Fixed IEnergizedItem javadoc.
*Fixed machines having infinite energy when an energy device runs empty.
*Fixed sounds not working for machines.
*Fixed packets getting called every tick, increased timer packets to
once per second.
This commit is contained in:
Aidan Brady 2012-10-30 00:14:25 -04:00
parent e885dd64d4
commit fe1fdd5130
6 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/net/uberkat/obsidian/common/ObsidianIngots.java
View file

@ -39,7 +39,7 @@ import cpw.mods.fml.common.registry.TickRegistry;
* @author AidanBrady
*
*/
@Mod(modid = "ObsidianIngots", name = "Obsidian Ingots", version = "4.2.4")
@Mod(modid = "ObsidianIngots", name = "Obsidian Ingots", version = "4.3")
@NetworkMod(channels = { "ObsidianIngots" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class ObsidianIngots
{
@ -61,7 +61,7 @@ public class ObsidianIngots
public static Configuration configuration;
/** Obsidian Ingots version number */
public static Version versionNumber = new Version(4, 2, 4);
public static Version versionNumber = new Version(4, 3, 0);
/** Obsidian Ingots creative tab */
public static CreativeTabOI tabOBSIDIAN = new CreativeTabOI();
@ -1029,7 +1029,7 @@ public class ObsidianIngots
proxy.loadUtilities();
proxy.loadTickHandler();
LanguageRegistry.instance().addStringLocalization(tabOBSIDIAN.getTabLabel(), "Obsidian Ingots");
LanguageRegistry.instance().addStringLocalization(tabOBSIDIAN.getTranslatedTabLabel(), "Obsidian Ingots");
//Attempt to load server commands
try {

4
src/common/net/uberkat/obsidian/common/TileEntityAdvancedElectricMachine.java
View file

@ -68,6 +68,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM
public void onUpdate()
{
super.onUpdate();
boolean testActive = operatingTicks > 0;
if(inventory[3] != null)
@ -85,8 +86,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM
}
else if(item.getRate() > energyNeeded)
{
item.setEnergy(inventory[3], (item.getEnergy(inventory[3]) - energyNeeded));
received = energyNeeded;
received = item.discharge(inventory[3], energyNeeded);
}
setEnergy(energyStored + received);

3
src/common/net/uberkat/obsidian/common/TileEntityElectricBlock.java
View file

@ -67,11 +67,12 @@ public abstract class TileEntityElectricBlock extends TileEntityDisableable impl
sendPacketWithRange();
}
else {
if(packetTick % 100 == 0)
if(packetTick % 20 == 0)
{
sendPacketWithRange();
}
}
packetTick++;
}
}

4
src/common/net/uberkat/obsidian/common/TileEntityElectricMachine.java
View file

@ -47,6 +47,7 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine
public void onUpdate()
{
super.onUpdate();
boolean testActive = operatingTicks > 0;
if(inventory[1] != null)
@ -64,8 +65,7 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine
}
else if(item.getRate() > energyNeeded)
{
item.setEnergy(inventory[1], (item.getEnergy(inventory[1]) - energyNeeded));
received = energyNeeded;
received = item.discharge(inventory[1], energyNeeded);
}
setEnergy(energyStored + received);

16
src/common/net/uberkat/obsidian/common/TileEntityPowerUnit.java
View file

@ -87,7 +87,7 @@ public class TileEntityPowerUnit extends TileEntityElectricBlock implements IEne
{
if(inventory[0].getItem() instanceof IEnergizedItem)
{
IEnergizedItem item = (IEnergizedItem)inventory[1].getItem();
IEnergizedItem item = (IEnergizedItem)inventory[0].getItem();
int sendingEnergy = 0;
if(item.getRate() <= energyStored)
@ -99,7 +99,7 @@ public class TileEntityPowerUnit extends TileEntityElectricBlock implements IEne
sendingEnergy = energyStored;
}
int rejects = item.charge(inventory[1], sendingEnergy);
int rejects = item.charge(inventory[0], sendingEnergy);
setEnergy(energyStored - (sendingEnergy - rejects));
}
else if(inventory[0].getItem() instanceof IItemElectric)
@ -120,8 +120,18 @@ public class TileEntityPowerUnit extends TileEntityElectricBlock implements IEne
{
if(inventory[1].getItem() instanceof IEnergizedItem)
{
int received = 0;
int energyNeeded = MAX_ENERGY - energyStored;
IEnergizedItem item = (IEnergizedItem)inventory[1].getItem();
int received = item.discharge(inventory[1], item.getRate());
if(item.getRate() <= energyNeeded)
{
received = item.discharge(inventory[1], item.getRate());
}
else if(item.getRate() > energyNeeded)
{
received = item.discharge(inventory[1], energyNeeded);
}
setEnergy(energyStored + received);
}
else if(inventory[1].getItem() instanceof IItemElectric)

2
src/common/obsidian/api/IEnergizedItem.java
View file

@ -47,7 +47,7 @@ public interface IEnergizedItem
* Removes the defined amount of energy from the item.
* @param itemstack
* @param amount
* @return leftover energy
* @return energy discharged
*/
public int discharge(ItemStack itemstack, int amount);