From da1a2233bb71a4bf1bbf437a35e5f3a84abf1304 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 30 Jul 2013 19:30:24 +1000 Subject: [PATCH] Ripped out poor integration for BC pumps. Closes #24 --- .../integration/BCIntegration.java | 25 ------------------- .../integration/BOPCrossIntegration.java | 11 -------- 2 files changed, 36 deletions(-) diff --git a/src/minecraft/biomesoplenty/integration/BCIntegration.java b/src/minecraft/biomesoplenty/integration/BCIntegration.java index 397f412e3..51158db9b 100644 --- a/src/minecraft/biomesoplenty/integration/BCIntegration.java +++ b/src/minecraft/biomesoplenty/integration/BCIntegration.java @@ -1,10 +1,7 @@ package biomesoplenty.integration; -import java.lang.reflect.Method; - import biomesoplenty.api.Biomes; import biomesoplenty.api.BlockReferences; -import biomesoplenty.api.Fluids; import cpw.mods.fml.common.event.FMLInterModComms; public class BCIntegration { @@ -15,11 +12,6 @@ public class BCIntegration { excludeOilGeneration(); } - public static void postInit() - { - addLiquids(); - } - private static void excludeOilGeneration() { FMLInterModComms.sendMessage("BuildCraft|Energy", "oil-gen-exclude", Integer.toString(Biomes.promisedLandForest.get().biomeID)); @@ -88,23 +80,6 @@ public class BCIntegration { FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", getBID("giantFlowerRed") + "@" + getBMeta("giantFlowerRed")); FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", getBID("giantFlowerYellow") + "@" + getBMeta("giantFlowerYellow")); } - - private static void addLiquids() - { - try - { - Class bcUtils = Class.forName("buildcraft.core.utils.Utils"); - - Method method = bcUtils.getMethod("liquidId", int.class); - - method.invoke(bcUtils, Fluids.springWaterFluid.get().getBlockID()); - method.invoke(bcUtils, Fluids.liquidPoisonFluid.get().getBlockID()); - } - catch (Exception e) - { - e.printStackTrace(); - } - } private static int getBID(String name) { return BlockReferences.getBlockID(name); diff --git a/src/minecraft/biomesoplenty/integration/BOPCrossIntegration.java b/src/minecraft/biomesoplenty/integration/BOPCrossIntegration.java index 03aeb0e7c..7f6fa6eca 100644 --- a/src/minecraft/biomesoplenty/integration/BOPCrossIntegration.java +++ b/src/minecraft/biomesoplenty/integration/BOPCrossIntegration.java @@ -46,17 +46,6 @@ public class BOPCrossIntegration { public static void postInit() { - if (Loader.isModLoaded("BuildCraft|Transport")) - { - try { - BCIntegration.postInit(); - } - catch (Exception e) { - System.out.println("[BiomesOPlenty] There was an error while integrating BuildCraft|Transport with Biomes O' Plenty!"); - e.printStackTrace(System.err); - } - } - if (Loader.isModLoaded("Thaumcraft")) { try {