aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-11-20 17:36:25 +0100
committerDream-Master <dream-master@gmx.net>2018-11-20 17:36:25 +0100
commit82e5f16644dc29b388c48cf2a58f50ff1ff9040e (patch)
treeebfa599de159e3594156258aaf1be3d6777d266f /src/main/java/gregtech/common
parent9ad87cb7246d7ac0980896dfe7b4021a430eea5a (diff)
downloadGT5-Unofficial-82e5f16644dc29b388c48cf2a58f50ff1ff9040e.tar.gz
GT5-Unofficial-82e5f16644dc29b388c48cf2a58f50ff1ff9040e.tar.bz2
GT5-Unofficial-82e5f16644dc29b388c48cf2a58f50ff1ff9040e.zip
New EBF Coils 12k and 15k
Electrum Flux and Awakened Draconium
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings5.java8
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings5.java5
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java8
5 files changed, 29 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
index e97228f5fe..14b0ecd019 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -25,6 +25,8 @@ public class GT_Block_Casings5
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "HSS-G Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Naquadah Alloy Coil Block");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Electrum Flux Coil Block");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Awakened Draconium Coil Block");
ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0));
ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1));
@@ -33,6 +35,8 @@ public class GT_Block_Casings5
ItemList.Casing_Coil_HSSG.set(new ItemStack(this, 1, 4));
ItemList.Casing_Coil_Naquadah.set(new ItemStack(this, 1, 5));
ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 6));
+ ItemList.Casing_Coil_ElectrumFlux.set(new ItemStack(this, 1, 7));
+ ItemList.Casing_Coil_AwakenedDraconium.set(new ItemStack(this, 1, 8));
}
@Override
@SideOnly(Side.CLIENT)
@@ -52,6 +56,10 @@ public class GT_Block_Casings5
return Textures.BlockIcons.MACHINE_COIL_NAQUADAH.getIcon();
case 6:
return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
+ case 7:
+ return Textures.BlockIcons.MACHINE_COIL_ELECTRUMFLUX.getIcon();
+ case 8:
+ return Textures.BlockIcons.MACHINE_COIL_AWAKENEDDRACONIUM.getIcon();
}
return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
index 09d79b75dc..759fcafb5e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
@@ -39,6 +39,11 @@ public class GT_Item_Casings5
case 6:
aList.add(this.mCoil07Tooltip);
break;
+ case 7:
+ aList.add(this.mCoil08Tooltip);
+ break;
+ case 8:
+ aList.add(this.mCoil09Tooltip);
}
}
}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
index 62e64f2680..68aa777d8c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
@@ -20,6 +20,8 @@ public abstract class GT_Item_Casings_Abstract
protected final String mCoil05Tooltip = GT_LanguageManager.addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 5400 Kelvin");
protected final String mCoil06Tooltip = GT_LanguageManager.addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin");
protected final String mCoil07Tooltip = GT_LanguageManager.addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin");
+ protected final String mCoil08Tooltip = GT_LanguageManager.addStringLocalization("gt.coil08tooltip", "Base Heating Capacity = 12000 Kelvin");
+ protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 15000 Kelvin");
protected final String mCoilOverheated1Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated1.tooltip", "These coils are deprecated");
protected final String mCoilOverheated2Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated2.tooltip", "Place in crafting grid to get regular coils");
protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index 2940d4c228..dc458448d3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -241,6 +241,12 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
case 6:
this.mHeatingCapacity = 9001;
break;
+ case 7:
+ this.mHeatingCapacity = 12000;
+ break;
+ case 8:
+ this.mHeatingCapacity = 15000;
+ break;
default:
return false;
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
index 81249ab705..c3f1d9c58a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
@@ -152,6 +152,14 @@ public class GT_MetaTileEntity_MultiFurnace
this.mLevel = 16;
this.mCostDiscount = 8;
break;
+ case 7:
+ this.mLevel = 16;
+ this.mCostDiscount = 16;
+ break;
+ case 8:
+ this.mLevel = 16;
+ this.mCostDiscount = 24;
+ break;
default:
return false;
}