Revert "Close #441 Add Underground Biomes Constructs integration"

This reverts commit b3b1a6a415.

Conflicts:
	lang
	src/main/java/forestry/Forestry.java
	src/main/java/forestry/plugins/PluginManager.java

(cherry picked from commit 1ca041a29f)

Conflicts:
	src/main/java/forestry/plugins/PluginManager.java

build.gradle

@@ -197,7 +197,6 @@ task mainJarSigned ( type: Jar, dependsOn: 'reobf' ) {
 	from (zipTree(jar.getArchivePath())) {
 		exclude '**/api/**'
 		exclude '**/codechicken/**'
-		exclude '**/undergroundBiomes/**'
 	}
 
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -224,7 +223,6 @@ task mainJar ( type: Zip, dependsOn: mainJarSigned ) {
 	from (zipTree(jar.getArchivePath())) {
 		include '**'
 		exclude '**/codechicken/**'
-		exclude '**/undergroundBiomes/**'
 	}
 
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -237,7 +235,6 @@ task devJarSigned ( type: Jar, dependsOn: 'classes' ) {
 	from(sourceSets.main.output) {
 		exclude '**/api/**'
 		exclude '**/codechicken/**'
-		exclude '**/undergroundBiomes/**'
 	}
 
 	destinationDir = file("build/tmp")
@@ -263,13 +260,11 @@ task devJar ( type: Zip, dependsOn: devJarSigned ) {
 	from(sourceSets.main.allSource) {
 		include '**'
 		exclude '**/codechicken/**'
-		exclude '**/undergroundBiomes/**'
 	}
 
 	from(sourceSets.main.output) {
 		include '**'
 		exclude '**/codechicken/**'
-		exclude '**/undergroundBiomes/**'
 	}
 
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE

src/main/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java

@@ -1,11 +0,0 @@
-package exterminatorJeff.undergroundBiomes.api;
-
-/**
- * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API
- * @author Zeno410
- */
-public class UBAPIHook {
-    public static final UBAPIHook ubAPIHook = new UBAPIHook();
-    //public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes
-    public UBOreTexturizer ubOreTexturizer;
-}

src/main/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java

@@ -1,65 +0,0 @@
-package exterminatorJeff.undergroundBiomes.api;
-
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import net.minecraft.block.Block;
-import net.minecraft.world.World;
-
-/**
- * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API
- * This is an interface for the class that can create Underground Biomes versions of arbitary ores
- * It creates three new blocks for each texturized ore.
- * @author Zeno410
- */
-public interface UBOreTexturizer {
-    // usage: Block is the ore block.
-    // Overlay name is the fully qualified name, e.g. modname:overlayName
-    // that static vars are fully qualified names for all the textures in the UB pack, just pass as is
-    // the event isn't needed per se, but if this is called anytime else, the blocks will not "stick"
-    public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event);
-    public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event);
-    public void setupUBOre(Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event);
-
-    public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet;
-    public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet;
-    public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) throws BlocksAreAlreadySet;
-    public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld) ;
-
-    public static String amber_overlay = "undergroundbiomes:amber_overlay";
-    public static String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay";
-    public static String coal_overlay = "undergroundbiomes:coal_overlay";
-    public static String copper_overlay = "undergroundbiomes:copper_overlay";
-    public static String diamond_overlay = "undergroundbiomes:diamond_overlay";
-    public static String emerald_overlay = "undergroundbiomes:emerald_overlay";
-    public static String gold_overlay = "undergroundbiomes:gold_overlay";
-    public static String iron_overlay = "undergroundbiomes:iron_overlay";
-    public static String lapis_overlay = "undergroundbiomes:lapis_overlay";
-    public static String lead_overlay = "undergroundbiomes:lead_overlay";
-    public static String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay";
-    public static String redstone_overlay = "undergroundbiomes:redstone_overlay";
-    public static String ruby_overlay = "undergroundbiomes:ruby_overlay";
-    public static String sapphire_overlay = "undergroundbiomes:sapphire_overlay";
-    public static String tin_overlay = "undergroundbiomes:tin_overlay";
-    public static String uranium_overlay = "undergroundbiomes:uranium_overlay";
-
-    public class BlocksAreAlreadySet extends RuntimeException {
-        // this is thrown if UB has already run its pre-initialization step and can no longer register blocks
-        public final Block oreBlock;
-        public final String overlayName;
-
-        public BlocksAreAlreadySet(Block oreBlock, String overlayName) {
-            this.oreBlock = oreBlock;
-            this.overlayName = overlayName;
-        }
-
-        @Override
-        public String toString() {
-            String blockDescription = "undefined block";
-            String overlayDescription = "undefined overlay";
-            if (oreBlock != null) blockDescription = oreBlock.getUnlocalizedName();
-            if (overlayName != null) overlayDescription = overlayName;
-            return "Attempt to create Underground Biomes ore for "+blockDescription+" with "+overlayDescription +
-                    " after blocks have already been defined";
-        }
-
-    }
-}

src/main/java/forestry/Forestry.java

@@ -60,8 +60,7 @@ import forestry.core.utils.StringUtil;
 				+ "after:Buildcraft|Core@[6.1.7,);"
 				+ "after:ExtrabiomesXL;"
 				+ "after:BiomesOPlenty;"
-				+ "after:IC2@[2.0.140,);"
-				+ "before:UndergroundBiomes")
+				+ "after:IC2@[2.0.140,);")
 //, certificateFingerprint = Version.FINGERPRINT)
 public class Forestry {
 

src/main/java/forestry/apiculture/worldgen/HiveGen.java

@@ -1,29 +1,29 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.apiculture.worldgen;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.world.World;
-
-import forestry.api.apiculture.hives.IHiveGen;
-
-public abstract class HiveGen implements IHiveGen {
-
-	@Override
-	public boolean canReplace(World world, int x, int y, int z) {
-		Block block = world.getBlock(x, y, z);
-		Material material = block.getMaterial();
-		return (material.isReplaceable() && !material.isLiquid()) ||
-				material == Material.air ||
-				material == Material.plants;
-	}
-}
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ ******************************************************************************/
+package forestry.apiculture.worldgen;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.world.World;
+
+import forestry.api.apiculture.hives.IHiveGen;
+
+public abstract class HiveGen implements IHiveGen {
+
+	@Override
+	public boolean canReplace(World world, int x, int y, int z) {
+		Block block = world.getBlock(x, y, z);
+		Material material = block.getMaterial();
+		return (material.isReplaceable() && !material.isLiquid()) ||
+				material == Material.air ||
+				material == Material.plants;
+	}
+}

src/main/java/forestry/apiculture/worldgen/HiveGenHelper.java

@@ -1,31 +1,31 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.apiculture.worldgen;
-
-import net.minecraft.block.Block;
-
-import forestry.api.apiculture.hives.IHiveGen;
-import forestry.api.apiculture.hives.IHiveGenHelper;
-
-public class HiveGenHelper implements IHiveGenHelper {
-
-	private static final IHiveGen treeGen = new HiveGenTree();
-
-	@Override
-	public IHiveGen ground(Block... validGroundBlocks) {
-		return new HiveGenGround(validGroundBlocks);
-	}
-
-	@Override
-	public IHiveGen tree() {
-		return treeGen;
-	}
-}
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ ******************************************************************************/
+package forestry.apiculture.worldgen;
+
+import net.minecraft.block.Block;
+
+import forestry.api.apiculture.hives.IHiveGen;
+import forestry.api.apiculture.hives.IHiveGenHelper;
+
+public class HiveGenHelper implements IHiveGenHelper {
+
+	private static final IHiveGen treeGen = new HiveGenTree();
+
+	@Override
+	public IHiveGen ground(Block... validGroundBlocks) {
+		return new HiveGenGround(validGroundBlocks);
+	}
+
+	@Override
+	public IHiveGen tree() {
+		return treeGen;
+	}
+}

src/main/java/forestry/core/config/Config.java

@@ -110,7 +110,7 @@ public class Config {
 	public static float getBeehivesRate() {
 		return generateBeehivesRate;
 	}
-
+	
 	public static boolean isExUtilEnderLilyEnabled() {
 		return ExUtilEnderLily;
 	}

src/main/java/forestry/core/utils/BlockUtil.java

@@ -42,7 +42,7 @@ public class BlockUtil {
 		if (!(tile instanceof IEnergyReceiver)) {
 			return false;
 		}
-
+		
 		IEnergyReceiver receptor = (IEnergyReceiver) tile;
 		return receptor.canConnectEnergy(side);
 	}

src/main/java/forestry/plugins/PluginManager.java

@@ -94,8 +94,7 @@ public class PluginManager {
 		HARVESTCRAFT(new PluginHarvestCraft()),
 		MAGICALCROPS(new PluginMagicalCrops()),
 		NATURA(new PluginNatura()),
-		PLANTMEGAPACK(new PluginPlantMegaPack()),
-		UNDERGROUND_BIOMES(new PluginUndergroundBiomes());
+		PLANTMEGAPACK(new PluginPlantMegaPack());
 
 		private final ForestryPlugin instance;
 		private final boolean canBeDisabled;

src/main/java/forestry/plugins/PluginUndergroundBiomes.java

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.plugins;
-
-import cpw.mods.fml.common.Optional;
-
-import forestry.core.config.Defaults;
-import forestry.core.config.ForestryBlock;
-import forestry.core.proxy.Proxies;
-
-import exterminatorJeff.undergroundBiomes.api.UBAPIHook;
-import exterminatorJeff.undergroundBiomes.api.UBOreTexturizer;
-
-@Plugin(pluginID = "UndergroundBiomes", name = "UndergroundBiomes", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.undergroundBiomes.description")
-public class PluginUndergroundBiomes extends ForestryPlugin {
-
-	public boolean isAvailable() {
-		return Proxies.common.isModLoaded("UndergroundBiomes");
-	}
-
-	public String getFailMessage() {
-		return "UndergroundBiomes is not found.";
-	}
-
-	@Optional.Method(modid = "UndergroundBiomes")
-	@Override
-	protected void preInit() {
-		registerBlock(0, "apatite");
-		registerBlock(1, "copper");
-		registerBlock(2, "tin");
-	}
-
-	@Optional.Method(modid = "UndergroundBiomes")
-	private void registerBlock(int meta, String textureName) {
-		try {
-			String blockName = ForestryBlock.resources.getItemStack(1, meta).getUnlocalizedName();
-			UBAPIHook.ubAPIHook.ubOreTexturizer.requestUBOreSetup(ForestryBlock.resources.block(), meta, "forestry:ores/" + textureName + "_overlay", blockName);
-		} catch (UBOreTexturizer.BlocksAreAlreadySet exception) {
-			Proxies.log.severe(exception.toString());
-		} catch (Throwable throwable) {
-			Proxies.log.severe("Underground Biomes crashed.");
-		}
-	}
-}