diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index d6576c1a1..8355b6f8e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -31,7 +31,7 @@ public class GuiButtonHistory extends GuiButtonLexicon { } @Override - public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { + public void drawButton(@Nonnull Minecraft mc, int par2, int par3, float partialTicks) { gui.drawBookmark(x, y, displayString, false); hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 369093080..73106494f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -51,7 +51,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { } @Override - public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3, float partialTicks) { if(enableDog) { dogPos += ClientTickHandler.delta * 10; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index ff46edfb0..0ce589428 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -29,7 +29,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { } @Override - public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3, float partialTicks) { hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index abd4a56aa..13391994c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -67,7 +67,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 9; i++) - list.add(new ItemStack(item, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index f4da34ca9..99b33d7a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -30,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.ChunkCache; @@ -58,13 +59,14 @@ import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { public BlockFloatingSpecialFlower() { super(LibBlockNames.FLOATING_SPECIAL_FLOWER); - GameRegistry.addRecipe(new SpecialFloatingFlowerRecipe()); + GameRegistry.register(new SpecialFloatingFlowerRecipe(), new ResourceLocation(LibMisc.MOD_ID, "special_floating_flower")); RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); } @@ -125,11 +127,11 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { + public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { - stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), s)); + stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(this), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) - stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), BotaniaAPI.miniFlowers.get(s))); + stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(this), BotaniaAPI.miniFlowers.get(s))); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 8d9d672db..8a60873a4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -97,9 +97,9 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 4; i++) - list.add(new ItemStack(item, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index e1585ade0..179797391 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -84,9 +84,9 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { + public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < LivingRockVariant.values().length; i++) - stacks.add(new ItemStack(item, 1, i)); + stacks.add(new ItemStack(this, 1, i)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index b7f354346..9bb74d151 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -175,9 +175,9 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { + public void getSubBlocks(CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < COUNT; ++i) - stacks.add(new ItemStack(item, 1, i)); + stacks.add(new ItemStack(this, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 34fccf087..4201639af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -109,9 +109,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { + public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < CrateVariant.values().length; i++) - stacks.add(new ItemStack(item, 1, i)); + stacks.add(new ItemStack(this, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 86cee153e..2ab618762 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -76,7 +76,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { @Override public void getSubBlocks(CreativeTabs par2, NonNullList par3) { for(int i = 0; i < StorageVariant.values().length; i++) - par3.add(new ItemStack(item, 1, i)); + par3.add(new ItemStack(this, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 3720c43d7..e5998bd29 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -63,8 +63,6 @@ public class TileLightRelay extends TileMod implements IWandBindable { e.startRiding(mover); if(!(e instanceof EntityItem)) { mover.playSound(BotaniaSoundEvents.lightRelay, 0.2F, (float) Math.random() * 0.3F + 0.7F); - if(e instanceof EntityPlayer) - ((EntityPlayer) e).addStat(ModAchievements.luminizerRide, 1); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index c01bda203..94c172026 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -20,10 +20,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; -public class AesirRingRecipe implements IRecipe { +public class AesirRingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -86,8 +87,8 @@ public class AesirRingRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 3; } @Nonnull @@ -101,5 +102,4 @@ public class AesirRingRecipe implements IRecipe { public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } - } 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 c94f7700c..739ab56c2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -18,10 +18,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; -public class AncientWillRecipe implements IRecipe { +public class AncientWillRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -69,8 +70,8 @@ public class AncientWillRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width > 1 || height > 1; } @Nonnull 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 644e80edf..c597a7542 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -19,10 +19,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.item.ItemBlackHoleTalisman; import vazkii.botania.common.item.ModItems; -public class BlackHoleTalismanExtractRecipe implements IRecipe { +public class BlackHoleTalismanExtractRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -64,8 +65,8 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height > 0; } @Nonnull 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 5af0ad9c1..a037dd996 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -18,10 +18,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; -public class CosmeticAttachRecipe implements IRecipe { +public class CosmeticAttachRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -72,8 +73,8 @@ public class CosmeticAttachRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 a7a06247d..3c55dac79 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -18,10 +18,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; -public class CosmeticRemoveRecipe implements IRecipe { +public class CosmeticRemoveRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -60,8 +61,8 @@ public class CosmeticRemoveRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height > 0; } @Nonnull 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 0b3655918..80b03ff11 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -21,10 +21,11 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; -public class HelmRevealingRecipe implements IRecipe { +public class HelmRevealingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -92,8 +93,8 @@ public class HelmRevealingRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 1ef87b0e1..a03d65edc 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -18,11 +18,12 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ModItems; -public class KeepIvyRecipe implements IRecipe { +public class KeepIvyRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -61,8 +62,8 @@ public class KeepIvyRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 e14175089..4ee9cd4cd 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -21,12 +21,13 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.lib.LibOreDict; -public class LensDyeingRecipe implements IRecipe { +public class LensDyeingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { private static final List DYES = Arrays.asList("dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL); @@ -80,8 +81,8 @@ public class LensDyeingRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 2b6a353e3..64654a3f3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -18,10 +18,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ModItems; -public class ManaGunClipRecipe implements IRecipe { +public class ManaGunClipRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -67,8 +68,8 @@ public class ManaGunClipRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 d050127b5..72f9fc845 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -18,11 +18,12 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.common.item.ItemManaGun; -public class ManaGunLensRecipe implements IRecipe { +public class ManaGunLensRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -73,10 +74,9 @@ public class ManaGunLensRecipe implements IRecipe { return gunCopy; } - @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 0c148643c..c21c5b47a 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -18,9 +18,10 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.item.ItemManaGun; -public class ManaGunRemoveLensRecipe implements IRecipe { +public class ManaGunRemoveLensRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -59,8 +60,8 @@ public class ManaGunRemoveLensRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height > 0; } @Nonnull 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 b09676b7f..c0cff73b3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -18,10 +18,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; -public class PhantomInkRecipe implements IRecipe { +public class PhantomInkRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -62,8 +63,8 @@ public class PhantomInkRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 8a9ae7b2f..fe6abba31 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -19,10 +19,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -public class SpecialFloatingFlowerRecipe implements IRecipe { +public class SpecialFloatingFlowerRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -63,8 +64,8 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 cc62146e7..902e22637 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -19,9 +19,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; -public class SpellClothRecipe implements IRecipe { +public class SpellClothRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -67,8 +68,8 @@ public class SpellClothRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull 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 e63b8cb38..8f795eb87 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -18,10 +18,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; -public class TerraPickTippingRecipe implements IRecipe { +public class TerraPickTippingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -64,8 +65,8 @@ public class TerraPickTippingRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Nonnull diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 9012ff5e3..c2eb64f6b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -439,11 +439,6 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { public void onDeath(@Nonnull DamageSource source) { super.onDeath(source); EntityLivingBase entitylivingbase = getAttackingEntity(); - if(entitylivingbase instanceof EntityPlayer) { - ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianKill, 1); - if(!anyWithArmor) - ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianNoArmor, 1); - } playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D); @@ -472,8 +467,8 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { { // Save true killer, they get extra loot if ("player".equals(source.getDamageType()) - && source.getEntity() instanceof EntityPlayer) { - trueKiller = (EntityPlayer) source.getEntity(); + && source.getTrueSource() instanceof EntityPlayer) { + trueKiller = (EntityPlayer) source.getTrueSource(); } // Drop equipment and clear it so multiple calls to super don't do it again diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 33768f25e..3ca79e024 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -90,7 +90,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final DataParameter MANA_LOSS_PER_TICK = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.FLOAT); private static final DataParameter GRAVITY = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.FLOAT); private static final DataParameter SOURCE_COORDS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.BLOCK_POS); - private static final DataParameter SOURCE_LENS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.OPTIONAL_ITEM_STACK); + private static final DataParameter SOURCE_LENS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.ITEM_STACK); float accumulatedManaLoss = 0; boolean fake = false; @@ -191,7 +191,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(!world.isRemote) { // Botania - only do entity colliding on server Entity entity = null; - List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expandXyz(1.0D)); + List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().offset(motionX, motionY, motionZ).grow(1.0D)); double d0 = 0.0D; for (int i = 0; i < list.size(); ++i) { @@ -208,7 +208,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } else { - AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expandXyz(0.30000001192092896D); + AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().grow(0.30000001192092896D); RayTraceResult raytraceresult1 = axisalignedbb.calculateIntercept(vec3d, vec3d1); if (raytraceresult1 != null) diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 192636eaa..fc3df1a24 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -104,7 +104,7 @@ public class EntityPixie extends EntityFlying { @Override public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { - if(getType() == 0 && par1DamageSource.getEntity() != summoner || getType() == 1 && par1DamageSource.getEntity() instanceof EntityPlayer) + if(getType() == 0 && par1DamageSource.getTrueSource() != summoner || getType() == 1 && par1DamageSource.getTrueSource() instanceof EntityPlayer) return super.attackEntityFrom(par1DamageSource, par2); return false; } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 0d0cf4ae9..09a2f86fd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -30,6 +31,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemAncientWill extends ItemMod { @@ -40,7 +42,7 @@ public class ItemAncientWill extends ItemMod { setHasSubtypes(true); setMaxStackSize(1); - GameRegistry.addRecipe(new AncientWillRecipe()); + GameRegistry.register(new AncientWillRecipe(), new ResourceLocation(LibMisc.MOD_ID, "ancient_will_attach")); RecipeSorter.register("botania:ancientWill", AncientWillRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 9df2e2489..445d5e0f2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -31,6 +31,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -48,6 +49,7 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @@ -60,7 +62,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { setMaxStackSize(1); setHasSubtypes(true); - GameRegistry.addRecipe(new BlackHoleTalismanExtractRecipe()); + GameRegistry.register(new BlackHoleTalismanExtractRecipe(), new ResourceLocation(LibMisc.MOD_ID, "black_hole_talisman_extract")); RecipeSorter.register("botania:blackHoleTalismanExtract", BlackHoleTalismanExtractRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 2575079e7..e55c87202 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -17,6 +17,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -27,6 +28,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemKeepIvy extends ItemMod { @@ -38,7 +40,7 @@ public class ItemKeepIvy extends ItemMod { public ItemKeepIvy() { super(LibItemNames.KEEP_IVY); - GameRegistry.addRecipe(new KeepIvyRecipe()); + GameRegistry.register(new KeepIvyRecipe(), new ResourceLocation(LibMisc.MOD_ID, "keep_ivy_attach")); RecipeSorter.register("botania:keepIvy", KeepIvyRecipe.class, Category.SHAPELESS, ""); MinecraftForge.EVENT_BUS.register(ItemKeepIvy.class); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 8edf69059..c55be0b26 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -31,6 +31,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -52,6 +53,7 @@ import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemManaGun extends ItemMod implements IManaUsingItem { @@ -68,9 +70,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { setMaxStackSize(1); setNoRepair(); - GameRegistry.addRecipe(new ManaGunLensRecipe()); - GameRegistry.addRecipe(new ManaGunRemoveLensRecipe()); - GameRegistry.addRecipe(new ManaGunClipRecipe()); + GameRegistry.register(new ManaGunLensRecipe(), new ResourceLocation(LibMisc.MOD_ID, "mana_gun_add_lens")); + GameRegistry.register(new ManaGunRemoveLensRecipe(), new ResourceLocation(LibMisc.MOD_ID, "mana_gun_remove_lens")); + GameRegistry.register(new ManaGunClipRecipe(), new ResourceLocation(LibMisc.MOD_ID, "mana_gun_add_clip")); RecipeSorter.register("botania:manaGunLens", ManaGunLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); @@ -99,9 +101,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { if(burst != null && ManaItemHandler.requestManaExact(stack, player, burst.getMana(), true)) { if(!world.isRemote) { world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); - player.addStat(ModAchievements.manaBlasterShoot, 1); - if(isSugoiKawaiiDesuNe(stack)) - player.addStat(ModAchievements.desuGun, 1); world.spawnEntity(burst); } else { player.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index 41fb357f3..6916038e8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -10,17 +10,19 @@ */ package vazkii.botania.common.item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemPhantomInk extends ItemMod { public ItemPhantomInk() { super(LibItemNames.PHANTOM_INK); - GameRegistry.addRecipe(new PhantomInkRecipe()); + GameRegistry.register(new PhantomInkRecipe(), new ResourceLocation(LibMisc.MOD_ID, "phantom_ink")); RecipeSorter.register("botania:phantomInk", PhantomInkRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 59c8efaea..74aa549a9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -143,7 +143,6 @@ public class ItemSpawnerMover extends ItemMod { world.playSound(null, pos, Blocks.MOB_SPAWNER.getSoundType().getPlaceSound(), SoundCategory.BLOCKS, (Blocks.MOB_SPAWNER.getSoundType().getVolume() + 1.0F) / 2.0F, Blocks.MOB_SPAWNER.getSoundType().getPitch() * 0.8F); player.renderBrokenItemStack(itemstack); itemstack.shrink(1); - player.addStat(ModAchievements.spawnerMoverUse, 1); for(int i = 0; i < 100; i++) Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index a1d636eb2..ab9e0c590 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -13,11 +13,13 @@ package vazkii.botania.common.item; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemSpellCloth extends ItemMod { @@ -27,7 +29,7 @@ public class ItemSpellCloth extends ItemMod { setMaxStackSize(1); setNoRepair(); - GameRegistry.addRecipe(new SpellClothRecipe()); + GameRegistry.register(new SpellClothRecipe(), new ResourceLocation(LibMisc.MOD_ID, "cleanse_enchants")); RecipeSorter.register("botania:spellCloth", SpellClothRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 11a7bd3be..4958fc6fe 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -47,6 +48,7 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @@ -68,8 +70,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { super(LibItemNames.COSMETIC); setHasSubtypes(true); - GameRegistry.addRecipe(new CosmeticAttachRecipe()); - GameRegistry.addRecipe(new CosmeticRemoveRecipe()); + GameRegistry.register(new CosmeticAttachRecipe(), new ResourceLocation(LibMisc.MOD_ID, "cosmetic_attach")); + GameRegistry.register(new CosmeticRemoveRecipe(), new ResourceLocation(LibMisc.MOD_ID, "cosmetic_remove")); RecipeSorter.register("botania:cosmeticAttach", CosmeticAttachRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:cosmeticRemove", CosmeticRemoveRecipe.class, Category.SHAPELESS, ""); renderStack = new ItemStack(this); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 97f29e667..805d6304a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -149,7 +149,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); } else if(cooldown > 0) { if(maxCd - cooldown < 2) - player.moveRelative(0F, 1F, 5F); + player.func_191958_b(0F, 0F, 1F, 5F); // todo 1.12 recheck else if(maxCd - cooldown < 10) player.setSprinting(false); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, cooldown - 2); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 5939a82ca..e69906cf3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -57,6 +57,7 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { @@ -79,7 +80,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ public ItemTerraPick() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_PICK); - GameRegistry.addRecipe(new TerraPickTippingRecipe()); + GameRegistry.register(new TerraPickTippingRecipe(), new ResourceLocation(LibMisc.MOD_ID, "terra_pick_tipping")); RecipeSorter.register("botania:terraPickTipping", TerraPickTippingRecipe.class, Category.SHAPELESS, ""); addPropertyOverride(new ResourceLocation("botania", "tipped"), (itemStack, world, entityLivingBase) -> isTipped(itemStack) ? 1 : 0); addPropertyOverride(new ResourceLocation("botania", "enabled"), (itemStack, world, entityLivingBase) -> isEnabled(itemStack) ? 1 : 0); @@ -194,8 +195,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ Vec3i endDiff = new Vec3i(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0); ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, null, MATERIALS, silk, fortune, isTipped(stack)); - if(origLevel == 5) - player.addStat(ModAchievements.rankSSPick, 1); } @Override diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index bdb85ca56..8efbbbbc1 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; @@ -24,6 +25,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), @@ -32,7 +34,7 @@ public class ItemManasteelHelmRevealing extends ItemManasteelHelm implements IGo public ItemManasteelHelmRevealing() { super(LibItemNames.MANASTEEL_HELM_R); - GameRegistry.addRecipe(new HelmRevealingRecipe()); //Manasteel is the base so it gets the recipe added in its constructor so that ModItems can call it + GameRegistry.register(new HelmRevealingRecipe(), new ResourceLocation(LibMisc.MOD_ID, "helm_revealing")); //Manasteel is the base so it gets the recipe added in its constructor so that ModItems can call it RecipeSorter.register("botania:helmRevealing", HelmRevealingRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 6cd1eb895..45bee9d85 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -25,6 +25,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -47,6 +48,7 @@ import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { @@ -152,8 +154,8 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens setMaxStackSize(1); setHasSubtypes(true); - GameRegistry.addRecipe(new CompositeLensRecipe()); - GameRegistry.addRecipe(new LensDyeingRecipe()); + GameRegistry.register(new CompositeLensRecipe(), new ResourceLocation(LibMisc.MOD_ID, "composite_lens")); + GameRegistry.register(new LensDyeingRecipe(), new ResourceLocation(LibMisc.MOD_ID, "lens_dye")); RecipeSorter.register("botania:compositeLens", CompositeLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:lensDying", LensDyeingRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 3282f82b4..2196b8483 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -25,6 +25,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; @@ -37,6 +38,7 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordinateListProvider { @@ -44,7 +46,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina public ItemAesirRing() { super(LibItemNames.AESIR_RING); - GameRegistry.addRecipe(new AesirRingRecipe()); + GameRegistry.register(new AesirRingRecipe(), new ResourceLocation(LibMisc.MOD_ID, "aesir_ring")); RecipeSorter.register("botania:aesirRing", AesirRingRecipe.class, Category.SHAPELESS, ""); MinecraftForge.EVENT_BUS.register(this); }