upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove useless mathutils class, move idrawbridgelogic to TMech

Browse Source
This commit is contained in:
Progwml6 committed 2013-12-09 05:14:03 -05:00
1 parent 3744f8a886
commit e79d411131
4 files changed
+4 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/library/armor/ArmorCore.java
+2 -3
View File
@@ -1,6 +1,5 @@
package tconstruct.library.armor;
import tconstruct.library.util.MathUtils;
import net.minecraft.block.BlockDispenser;
import net.minecraft.dispenser.IBehaviorDispenseItem;
import net.minecraft.entity.*;
@@ -152,7 +151,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
if (tags == null || !tags.hasKey("Energy"))
return 0;
int energy = tags.getInteger("Energy");
int energyReceived = MathUtils.minInt(capacity - energy, MathUtils.minInt(this.maxReceive, maxReceive));
int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
if (!simulate)
{
energy += energyReceived;
@@ -172,7 +171,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
return 0;
}
int energy = tags.getInteger("Energy");
int energyExtracted = MathUtils.minInt(energy, MathUtils.minInt(this.maxExtract, maxExtract));
int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
if (!simulate)
{
energy -= energyExtracted;
src/main/java/tconstruct/library/blocks/IDrawbridgeLogicBase.java
-8
View File
@@ -1,8 +0,0 @@
package tconstruct.library.blocks;
public interface IDrawbridgeLogicBase
{
public boolean hasExtended ();
}
src/main/java/tconstruct/library/tools/ToolCore.java
+2 -3
View File
@@ -26,7 +26,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.util.MathUtils;
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -922,7 +921,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
if (tags == null || !tags.hasKey("Energy"))
return 0;
int energy = tags.getInteger("Energy");
int energyReceived = MathUtils.minInt(capacity - energy, MathUtils.minInt(this.maxReceive, maxReceive));
int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
if (!simulate)
{
energy += energyReceived;
@@ -942,7 +941,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
return 0;
}
int energy = tags.getInteger("Energy");
int energyExtracted = MathUtils.minInt(energy, MathUtils.minInt(this.maxExtract, maxExtract));
int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
if (!simulate)
{
energy -= energyExtracted;
src/main/java/tconstruct/library/util/MathUtils.java
-14
View File
@@ -1,14 +0,0 @@
package tconstruct.library.util;
public class MathUtils
{
/**
* finds smaller of 2 valid int's
* based on COFH's minI method
*/
public static int minInt (int a, int b)
{
return a < b ? a : b;
}
}