diff --git a/build.gradle b/build.gradle index 63f5269d..1926f382 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories{ apply plugin: 'forge' -version = "1.2.0-dev"+env.DRONE_BUILD_NUMBER +version = "1.2.0-dev" group= "com.austinv11.peripheralsplusplus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Peripherals++" diff --git a/src/main/java/com/austinv11/peripheralsplusplus/init/Recipes.java b/src/main/java/com/austinv11/peripheralsplusplus/init/Recipes.java index a664dc6d..a6ef3e1b 100644 --- a/src/main/java/com/austinv11/peripheralsplusplus/init/Recipes.java +++ b/src/main/java/com/austinv11/peripheralsplusplus/init/Recipes.java @@ -31,8 +31,8 @@ public static void init(){ if (Config.enableRFCharger) if (Loader.isModLoaded("ThermalExpansion")) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rfCharger), "rlr", "lcl", "rer", 'r', "dustRedstone", 'l', "ingotLead", 'c', new ItemStack(GameRegistry.findItem("ThermalExpansion", "capacitor"), 1, 2), 'e', new ItemStack(GameRegistry.findItem("ThermalExpansion", "material"), 1, 3))); - else if (Loader.isModLoaded("BuildCraft|Core")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rfCharger), "rlr", "lcl", "rer", 'r', "dustRedstone", 'l', "gearIron", 'c', "gearGold", 'e', new ItemStack(GameRegistry.findItem("BuildCraft|Transport", "item.buildcraftPipe.pipepowergold")))); +// else if (Loader.isModLoaded("BuildCraft|Core")) +// GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rfCharger), "rlr", "lcl", "rer", 'r', "dustRedstone", 'l', "gearIron", 'c', "gearGold", 'e', new ItemStack(GameRegistry.findItem("BuildCraft|Transport", "item.buildcraftPipe.pipepowergold")))); if (Config.enableOreDictionary) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.oreDictionary), "isi", "sbs", "isi", 'i', "ingotIron", 's', "stone", 'b', new ItemStack(Items.book))); if (Config.enableAnalyzers && Loader.isModLoaded("Forestry")) { diff --git a/src/main/java/com/austinv11/peripheralsplusplus/proxy/CommonProxy.java b/src/main/java/com/austinv11/peripheralsplusplus/proxy/CommonProxy.java index 84fb50dc..d5d22555 100644 --- a/src/main/java/com/austinv11/peripheralsplusplus/proxy/CommonProxy.java +++ b/src/main/java/com/austinv11/peripheralsplusplus/proxy/CommonProxy.java @@ -25,7 +25,7 @@ public void setupVillagers() { public void registerTileEntities() { GameRegistry.registerTileEntity(TileEntityChatBox.class, TileEntityChatBox.publicName); GameRegistry.registerTileEntity(TileEntityPlayerSensor.class, TileEntityPlayerSensor.publicName); - if (Loader.isModLoaded("ThermalExpansion") || Loader.isModLoaded("BuildCraft|Core")) + if (Loader.isModLoaded("ThermalExpansion")/* || Loader.isModLoaded("BuildCraft|Core")*/) GameRegistry.registerTileEntity(TileEntityRFCharger.class, TileEntityRFCharger.publicName); GameRegistry.registerTileEntity(TileEntityOreDictionary.class, TileEntityOreDictionary.publicName); if (Loader.isModLoaded("Forestry")) { diff --git a/src/main/java/com/austinv11/peripheralsplusplus/tiles/TileEntityRFCharger.java b/src/main/java/com/austinv11/peripheralsplusplus/tiles/TileEntityRFCharger.java index 77864c86..cc6aaedd 100644 --- a/src/main/java/com/austinv11/peripheralsplusplus/tiles/TileEntityRFCharger.java +++ b/src/main/java/com/austinv11/peripheralsplusplus/tiles/TileEntityRFCharger.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -@Optional.Interface(modid = "ThermalExpansion;BuildCraft|Core", iface = "cofh.api.energy.IEnergyReceiver", striprefs = true) +@Optional.Interface(modid = "ThermalExpansion", iface = "cofh.api.energy.IEnergyReceiver", striprefs = true) public class TileEntityRFCharger extends NetworkedTileEntity implements IEnergyReceiver { private EnergyStorage storage = new EnergyStorage(80000);//Leadstone Capacitor