aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/forestry/bees
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/forestry/bees')
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
index f087ad75f4..bf632ef039 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
@@ -18,12 +18,12 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.apiculture.MaterialBeehive;
import forestry.apiculture.multiblock.TileAlvearyPlain;
-import forestry.core.blocks.BlockStructure;
+import forestry.core.blocks.BlockForestry;
import forestry.core.render.TextureManager;
import gtPlusPlus.GTplusplus;
import gtPlusPlus.core.creative.AddToCreativeTab;
-public class FR_BlockAlveary extends BlockStructure
+public class FR_BlockAlveary extends BlockForestry
{
public static enum Type
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index 51d0dea31b..f3d751690e 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -41,8 +41,6 @@ public class FR_ItemRegistry {
public static MB_ItemFrame hiveFrameClay;
public static MB_ItemFrame hiveFrameNova;
- //Alveary Stuff
- public static FR_BlockAlveary alveary;
public static void Register() {
@@ -68,7 +66,8 @@ public class FR_ItemRegistry {
hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, "");
hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, "");
hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame.");
- if (CORE.configSwitches.enableCustomAlvearyBlocks){
+ if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff
+ FR_BlockAlveary alveary;
alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
}
}