Anvilcraft
/
equivalent-exchange-3
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increment the API version, switch EnergyValue to only accept a float (over Number, small performance increase), and better protection of learning Ores

This commit is contained in:
pahimar 2015-05-04 08:18:15 -04:00
parent 42cc381970
commit d1621fbf82
8 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/pahimar/ee3/api/EnergyValue.java
View File

@ -17,9 +17,9 @@ public final class EnergyValue implements Comparable<EnergyValue>, JsonDeseriali
this(0);
}
public EnergyValue(Number energyValue)
public EnergyValue(float energyValue)
{
this.energyValue = energyValue.floatValue();
this.energyValue = energyValue;
}
@Override

12
src/main/java/com/pahimar/ee3/api/EnergyValueRegistryProxy.java
View File

@ -10,9 +10,9 @@ public final class EnergyValueRegistryProxy
@Mod.Instance("EE3")
private static Object ee3Mod;
public static void addPreAssignedEnergyValue(Object object, Number energyValue)
public static void addPreAssignedEnergyValue(Object object, float energyValue)
{
addPreAssignedEnergyValue(object, new EnergyValue(energyValue.floatValue()));
addPreAssignedEnergyValue(object, new EnergyValue(energyValue));
}
public static void addPreAssignedEnergyValue(Object object, EnergyValue energyValue)
@ -25,9 +25,9 @@ public final class EnergyValueRegistryProxy
}
}
public static void addPostAssignedEnergyValue(Object object, Number energyValue)
public static void addPostAssignedEnergyValue(Object object, float energyValue)
{
addPostAssignedEnergyValue(object, new EnergyValue(energyValue.floatValue()));
addPostAssignedEnergyValue(object, new EnergyValue(energyValue));
}
public static void addPostAssignedEnergyValue(Object object, EnergyValue energyValue)
@ -91,9 +91,9 @@ public final class EnergyValueRegistryProxy
return null;
}
public static List getStacksInRange(Number start, Number finish)
public static List getStacksInRange(float start, float finish)
{
return getStacksInRange(new EnergyValue(start.floatValue()), new EnergyValue(finish.floatValue()));
return getStacksInRange(new EnergyValue(start), new EnergyValue(finish));
}
public static List getStacksInRange(EnergyValue start, EnergyValue finish)

2
src/main/java/com/pahimar/ee3/api/package-info.java
View File

@ -1,3 +1,3 @@
@API(owner = "EE3", apiVersion = "1.0", provides = "EE3|API") package com.pahimar.ee3.api;
@API(owner = "EE3", apiVersion = "1.1", provides = "EE3|API") package com.pahimar.ee3.api;
import cpw.mods.fml.common.API;

4
src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java
View File

@ -51,12 +51,12 @@ public class CommandSetEnergyValue extends CommandBase
else
{
Item item = getItemByText(commandSender, args[2]);
double energyValue = 0;
float energyValue = 0;
int metaData = 0;
if (args.length >= 4)
{
energyValue = parseDoubleWithMin(commandSender, args[3], 0);
energyValue = (float) parseDoubleWithMin(commandSender, args[3], 0);
}
else if (args.length >= 5)
{

4
src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java
View File

@ -47,11 +47,11 @@ public class CommandSetEnergyValueCurrentItem extends CommandBase
}
else
{
double energyValue = 0;
float energyValue = 0;
if (args.length >= 3)
{
energyValue = parseDoubleWithMin(commandSender, args[2], 0);
energyValue = (float) parseDoubleWithMin(commandSender, args[2], 0);
}
ItemStack itemStack = ((EntityPlayer) commandSender).getCurrentEquippedItem();

4
src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
View File

@ -49,7 +49,7 @@ public class EnergyValueRegistry implements JsonSerializer<EnergyValueRegistry>,
return energyValueRegistry;
}
public void addPreAssignedEnergyValue(Object object, Number energyValue)
public void addPreAssignedEnergyValue(Object object, float energyValue)
{
addPreAssignedEnergyValue(object, new EnergyValue(energyValue));
}
@ -85,7 +85,7 @@ public class EnergyValueRegistry implements JsonSerializer<EnergyValueRegistry>,
}
}
public void addPostAssignedExactEnergyValue(Object object, Number energyValue)
public void addPostAssignedExactEnergyValue(Object object, float energyValue)
{
addPostAssignedExactEnergyValue(object, new EnergyValue(energyValue));
}

5
src/main/java/com/pahimar/ee3/init/Abilities.java
View File

@ -1,6 +1,7 @@
package com.pahimar.ee3.init;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.exchange.CachedOreDictionary;
import com.pahimar.ee3.exchange.OreStack;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@ -14,6 +15,10 @@ public class Abilities
{
if (oreName.startsWith("ore"))
{
for (ItemStack itemStack : CachedOreDictionary.getInstance().getItemStacksForOreName(oreName))
{
AbilityRegistryProxy.setAsNotLearnable(itemStack);
}
AbilityRegistryProxy.setAsNotLearnable(new OreStack(oreName));
}
}

2
src/main/java/com/pahimar/ee3/init/EnergyValues.java
View File

@ -80,7 +80,7 @@ public class EnergyValues
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.brown_mushroom, 32);
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.red_mushroom, 32);
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.red_mushroom, 32);
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.snow_layer, 0.125);
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.snow_layer, 0.125f);
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.cactus, 8);
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.vine, 8);
EnergyValueRegistryProxy.addPreAssignedEnergyValue(Blocks.waterlily, 16);