aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/general
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-10-25 23:47:58 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-10-25 23:47:58 +1000
commitf2a89339d7f6f875d34d4a7bb1868a1d4a3cf644 (patch)
tree114d97fb80a7a6310ea0a6f77030607f83bed627 /src/Java/gtPlusPlus/core/item/general
parente5e1581403e9f6e9d76e362c5e4861b4258af7cc (diff)
downloadGT5-Unofficial-f2a89339d7f6f875d34d4a7bb1868a1d4a3cf644.tar.gz
GT5-Unofficial-f2a89339d7f6f875d34d4a7bb1868a1d4a3cf644.tar.bz2
GT5-Unofficial-f2a89339d7f6f875d34d4a7bb1868a1d4a3cf644.zip
+ Tried improving the handling of Blast Smelting.
+ Tried adding shapeless dust recipes for all of my alloys. (The shapeless recipe system is dumb) + Added a custom GUI for NEI recipes for the Blast Smelter. % Refactored some Utils classes.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/general')
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java12
4 files changed, 12 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java
index efecb03d9f..3c8e09e9e5 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java
@@ -4,7 +4,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.interfaces.IItemBlueprint;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.player.PlayerUtils;
@@ -87,7 +87,7 @@ public class ItemBlueprint extends Item implements IItemBlueprint{
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer par3Entity) {
//Let the player know what blueprint is held
if (itemStack.hasTagCompound()) {
- PlayerUtils.messagePlayer(par3Entity, "This Blueprint holds NBT data. "+"|"+getNBT(itemStack, "mID")+"|"+getNBT(itemStack, "mBlueprint")+"|"+getNBT(itemStack, "mName")+"|"+UtilsItems.getArrayStackNames(readItemsFromNBT(itemStack)));
+ PlayerUtils.messagePlayer(par3Entity, "This Blueprint holds NBT data. "+"|"+getNBT(itemStack, "mID")+"|"+getNBT(itemStack, "mBlueprint")+"|"+getNBT(itemStack, "mName")+"|"+ItemUtils.getArrayStackNames(readItemsFromNBT(itemStack)));
}
else {
createNBT(itemStack);
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
index 04503c5a62..c5f383955c 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.general;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
@@ -38,7 +38,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(1);
this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice");
- this.thisStack = UtilsItems.getSimpleStack(this);
+ this.thisStack = ItemUtils.getSimpleStack(this);
this.charge(thisStack, charge, 3, true, false);
if (charge == 10000*20*500){
this.setDamage(thisStack, 13);
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index aa67e0f10c..4f1d7f4ecf 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.item.general;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.player.PlayerUtils;
import ic2.api.item.ElectricItem;
@@ -37,7 +37,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(1);
this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice");
- this.thisStack = UtilsItems.getSimpleStack(this);
+ this.thisStack = ItemUtils.getSimpleStack(this);
GameRegistry.registerItem(this, unlocalizedName);
}
diff --git a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
index f1141e1ef4..7844d96f3f 100644
--- a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
+++ b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.general;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
@@ -44,7 +44,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(1);
this.setTextureName(CORE.MODID + ":" + "itemIngot");
- this.thisStack = UtilsItems.getSimpleStack(this);
+ this.thisStack = ItemUtils.getSimpleStack(this);
GameRegistry.registerItem(this, unlocalizedName);
}
@@ -206,7 +206,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public double discharge(ItemStack stack, double amount, int tier,
boolean ignoreTransferLimit, boolean externally, boolean simulate) {
if ((stack.stackTagCompound == null) || (!stack.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}
@@ -254,7 +254,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate)
{
if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}
@@ -277,7 +277,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public int extractEnergy(ItemStack container, int maxExtract, boolean simulate)
{
if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}
@@ -299,7 +299,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
public int getEnergyStored(ItemStack container)
{
if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- double euCharge = getCharge(UtilsItems.getSimpleStack(this));
+ double euCharge = getCharge(ItemUtils.getSimpleStack(this));
if (euCharge != 0 && euCharge >= 1){
return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU));
}