diff --git a/build.gradle b/build.gradle index 27cb63a7b..8ac731fbc 100644 --- a/build.gradle +++ b/build.gradle @@ -22,8 +22,8 @@ buildscript { repositories { mavenCentral() maven { - name = "chickenbones" - url = "http://chickenbones.net/maven/" + name = "thiakil" + url = "http://maven.thiakil.com" } maven { url "http://dvs1.progwml6.com/files/maven" @@ -73,9 +73,7 @@ jar { } dependencies { - compile files( - 'Baubles-deobf.jar' - ) + deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" deobfCompile "mezz.jei:jei_1.12:4.7.0.67" //and a bit more for SCP diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index d2816d734..a767ada85 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; @@ -84,10 +82,4 @@ public class AncientWillRecipe extends IForgeRegistryEntry.Impl impleme public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index 927b674e3..293ad4fcf 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -14,9 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ItemBlackHoleTalisman; import vazkii.botania.common.item.ModItems; @@ -79,10 +77,4 @@ public class BlackHoleTalismanExtractRecipe extends IForgeRegistryEntry.Impl getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index 74664a0e3..b0b8a828e 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -14,9 +14,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.common.item.ModItems; @@ -93,10 +91,4 @@ public class CompositeLensRecipe extends IForgeRegistryEntry.Impl imple public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index 5be4f3b7d..dc721a728 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; @@ -87,10 +85,4 @@ public class CosmeticAttachRecipe extends IForgeRegistryEntry.Impl impl public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index cc0182a16..daf8b7230 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; @@ -75,10 +73,4 @@ public class CosmeticRemoveRecipe extends IForgeRegistryEntry.Impl impl public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 09aa51494..1de4d7796 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -15,10 +15,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; @@ -108,9 +106,8 @@ public class HelmRevealingRecipe extends IForgeRegistryEntry.Impl imple return helmItem == ModItems.manasteelHelm || helmItem == ModItems.terrasteelHelm || helmItem == ModItems.elementiumHelm; } - @Nonnull @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); + public boolean isDynamic() { + return true; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index efd4f90cc..67f875ee8 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; @@ -76,10 +74,4 @@ public class KeepIvyRecipe extends IForgeRegistryEntry.Impl implements public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index 8abf961ad..1bea6f26c 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.mana.ILens; @@ -105,10 +103,4 @@ public class LensDyeingRecipe extends IForgeRegistryEntry.Impl implemen return -1; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index 67208638f..318776ce7 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ModItems; @@ -82,10 +80,4 @@ public class ManaGunClipRecipe extends IForgeRegistryEntry.Impl impleme public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index 280897cf8..282c09c09 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; @@ -89,10 +87,4 @@ public class ManaGunLensRecipe extends IForgeRegistryEntry.Impl impleme public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index b568ca774..8ec6dd5fc 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ItemManaGun; @@ -74,10 +72,4 @@ public class ManaGunRemoveLensRecipe extends IForgeRegistryEntry.Impl i public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index 1d925a422..f6e7025db 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; @@ -77,10 +75,4 @@ public class PhantomInkRecipe extends IForgeRegistryEntry.Impl implemen public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index e2542f7be..540a17fcb 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -14,9 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -78,10 +76,4 @@ public class SpecialFloatingFlowerRecipe extends IForgeRegistryEntry.Impl getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index 592dd3b11..206684a45 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -14,9 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; @@ -82,10 +80,4 @@ public class SpellClothRecipe extends IForgeRegistryEntry.Impl implemen public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index 2e2e877c7..c4e1253ae 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -13,9 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; @@ -79,10 +77,4 @@ public class TerraPickTippingRecipe extends IForgeRegistryEntry.Impl im public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } - - @Nonnull - @Override - public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } }