Merge pull request #576 from Muramasa-/UBCSupport

UBC Support / Ore System Restructure

4 files changed, 10 insertions, 9 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
index c0fa372c94..09a644a055 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
@@ -10,10 +10,9 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.objects.ItemData;
-import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores;
+import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import ic2.core.Ic2Items;
 import net.minecraft.block.Block;
@@ -74,7 +73,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
                     for (int f = -2; f < 3; f++) {
                         for (int g = -2; g < 3; g++) {
                             Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(f, -i, g);
-                            if ((tBlock instanceof GT_Block_Ores)) {
+                            if ((tBlock instanceof GT_Block_Ores_Abstract)) {
                                 TileEntity tTileEntity = getBaseMetaTileEntity().getWorld().getTileEntity(getBaseMetaTileEntity().getXCoord() + f, getBaseMetaTileEntity().getYCoord() + (-i), getBaseMetaTileEntity().getZCoord() + g);
                                 if ((tTileEntity instanceof GT_TileEntity_Ores)) {
                                 	if(((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000){
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
index 9fc7bafc94..b825a5c50a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
@@ -16,6 +16,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -104,7 +105,7 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas
                     for (int f = -48; f < 49; f++) {
                         Block tBlock = getBaseMetaTileEntity().getBlockOffset(i, yLevel - getBaseMetaTileEntity().getYCoord(), f);
                         int tMetaID = getBaseMetaTileEntity().getMetaIDOffset(i, yLevel - getBaseMetaTileEntity().getYCoord(), f);
-                        if (tBlock == GregTech_API.sBlockOres1) {
+                        if (tBlock instanceof GT_Block_Ores_Abstract) {
                             TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(i, yLevel - getBaseMetaTileEntity().getYCoord(), f);
                             if ((tTileEntity!=null) && (tTileEntity instanceof GT_TileEntity_Ores) && ((GT_TileEntity_Ores) tTileEntity).mNatural == true && !mMineList.contains(new ChunkPosition(i, yLevel - getBaseMetaTileEntity().getYCoord(), f))) {
                                 mMineList.add(new ChunkPosition(i, yLevel - getBaseMetaTileEntity().getYCoord(), f));
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 bdeaa4f2df..91a14333e9 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
@@ -39,8 +39,8 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 "Controller Block for the Blast Furnace",

                 "Size(WxHxD): 3x4x3 (Hollow), Controller (Front middle bottom)",

                 "16x Heating Coils (Two middle Layers, hollow)",

-                "1x Input (Any bottom layer casing)",

-                "1x Output (Any bottom layer casing)",

+                "1x Input Hatch/Bus (Any bottom layer casing)",

+                "1x Output Hatch/Bus (Any bottom layer casing)",

                 "1x Energy Hatch (Any bottom layer casing)",

                 "1x Maintenance Hatch (Any bottom layer casing)",

                 "1x Muffler Hatch (Top middle)",

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 51715a54c1..30a6dd1496 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -37,10 +37,11 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 "Produces "+(getEUt()*40)*(runtimeBoost(20)/20f)+"L of Steam/sec for 1 Coal",

                 "Size(WxHxD): 3x5x3, Controller (Front middle in Fireboxes)",

                 "3x1x3 of Fire Boxes (Bottom layer, Min 3)",

-                "3x4x3 of Casing (Above Fireboxes, hollow, Min 24!)",

+                "3x4x3 of Casings (Above Fireboxes, hollow, Min 24!)",

                 "3 Pipe Casing Blocks (Inside the Hollow Casing)",

-                "1x Input Hatch/Bus (Any Firebox)",

-                "1x Output Hatch (Any Firebox)",

+                "1x Input Fuel Hatch/Bus (Any Firebox)",

+                "1x Input Water Hatch (Any Firebox)",

+                "1x Output Hatch (Any Casing)",

                 "1x Maintenance Hatch (Any Firebox)",

                 "1x Muffler Hatch (Any Firebox)",

                 "Refined liquid fuels have 1/4 efficiency"};