From 494628481b812277fa23d32d99a73515ccf590cc Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 3 Aug 2015 09:01:13 +0200 Subject: [PATCH] Made Buildcraft Oil always get used if BC is loaded, changed some little crafting stuff, updated Forge --- build.gradle | 2 +- .../java/ellpeck/actuallyadditions/ActuallyAdditions.java | 4 ++-- .../java/ellpeck/actuallyadditions/crafting/ItemCrafting.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e7c952a74..2b7833168 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ group = "ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" minecraft { - version = "1.7.10-10.13.4.1448-1.7.10" + version = "1.7.10-10.13.4.1492-1.7.10" runDir = "idea" } diff --git a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java index 82bc5a721..a89ad0638 100644 --- a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java +++ b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java @@ -32,8 +32,8 @@ import ellpeck.actuallyadditions.recipe.TreasureChestHandler; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.Util; - -@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, canBeDeactivated = false, guiFactory = "ellpeck.actuallyadditions.config.GuiFactory") +// So that BuildCraft Oil always gets used +@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", canBeDeactivated = false, guiFactory = "ellpeck.actuallyadditions.config.GuiFactory") public class ActuallyAdditions{ @Instance(ModUtil.MOD_ID) diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index db1720791..90cef65fc 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -278,8 +278,7 @@ public class ItemCrafting{ if(ConfigCrafting.STICK_CRAFTER.isEnabled()) GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemCrafterOnAStick), new ItemStack(Blocks.crafting_table), - new ItemStack(Items.sign), - "slimeball")); + new ItemStack(Items.sign))); //Tiny Coal GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()),