aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-07-10 13:04:13 +1000
committerAlkalus <draknyte1@hotmail.com>2017-07-10 13:04:13 +1000
commit43f3190bd5204a0025c75ee7cabfd0871061211f (patch)
tree00fd6c24dd859985dca6fbde2f9eb0a591803b7e /src/Java/gtPlusPlus/core/item
parentfda314b86ee93b1c2f9651808a91d6eed9fa8394 (diff)
downloadGT5-Unofficial-43f3190bd5204a0025c75ee7cabfd0871061211f.tar.gz
GT5-Unofficial-43f3190bd5204a0025c75ee7cabfd0871061211f.tar.bz2
GT5-Unofficial-43f3190bd5204a0025c75ee7cabfd0871061211f.zip
+ Added Coal gas.
+ Added GT++ Coal Coke. + Added a new handler for burnable items. % Changed up the 4 Coke Oven Recipes. - Removed lots of spam log messages during material creation.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java5
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java38
-rw-r--r--src/Java/gtPlusPlus/core/item/base/CoreItem.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java6
4 files changed, 49 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 9e82297bc3..0ef266a743 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -211,6 +211,8 @@ public final class ModItems {
public static Item itemAirFilter;
+ private static Item itemCoalCoke;
+
public static final void init(){
@@ -232,7 +234,8 @@ public final class ModItems {
-
+ //Register Hydrogen Blobs first, so we can replace old helium blobs.
+ itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "gemCoalCoke", 3200).setTextureName(CORE.MODID + ":itemCoalCoke");
//Register Hydrogen Blobs first, so we can replace old helium blobs.
itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
new file mode 100644
index 0000000000..6f27bfda2f
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
@@ -0,0 +1,38 @@
+package gtPlusPlus.core.item.base;
+
+import cpw.mods.fml.common.IFuelHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.ItemUtils;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+
+public class BaseItemBurnable extends CoreItem implements IFuelHandler{
+
+ final int burnTime;
+
+ public BaseItemBurnable(String unlocalizedName, String displayName, CreativeTabs creativeTab,
+ int stackSize, int maxDmg, String description, String oredictName, int burnTime) {
+ super(unlocalizedName, creativeTab, stackSize, maxDmg, description);
+ this.burnTime = burnTime;
+ this.itemName = displayName;
+
+ if (!oredictName.equals("") || oredictName != null){
+ registerOrdictionary(oredictName);
+ }
+ registerFuel();
+ }
+
+ @Override
+ public int getBurnTime(ItemStack fuel) {
+ return this.burnTime;
+ }
+
+ public void registerFuel(){
+ CORE.burnables.add(this);
+ }
+
+ public void registerOrdictionary(String name){
+ ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), name);
+ }
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index e3e6b57624..62fc5c0160 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -20,7 +20,7 @@ public class CoreItem extends Item
private final EnumRarity rarity;
private final EnumChatFormatting descColour;
private final String itemDescription;
- private String itemName;
+ protected String itemName;
private final boolean hasEffect;
//Replace Item - What does this item turn into when held.
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index fb14c50d04..6e5b1bd976 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -13,6 +13,12 @@ public class CoalTar {
public static void run(){
+ //Create Coal Gas
+ FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
+
+
+
+
//Ethanol
// v - Dehydrate cells to remove water
//Create Ethylene