diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 6953721f3..14ef6a4af 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -53,7 +53,7 @@ public final class ColorHandler { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); } else { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; + return state.getValue(BotaniaStateProps.COLOR).getColorValue(); } }, ModBlocks.pool @@ -73,7 +73,7 @@ public final class ColorHandler { // Petal Block blocks.registerBlockColorHandler((state, world, pos, tintIndex) -> { int meta = ModBlocks.petalBlock.getMetaFromState(state); - return EnumDyeColor.byMetadata(meta).getMapColor().colorValue; + return EnumDyeColor.byMetadata(meta).getColorValue(); }, ModBlocks.petalBlock ); @@ -102,12 +102,12 @@ public final class ColorHandler { ModItems.manaResource); items.registerItemColorHandler((s, t) -> - t == 1 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor1(s)).getMapColor().colorValue - : t == 2 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor2(s)).getMapColor().colorValue + t == 1 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor1(s)).getColorValue() + : t == 2 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor2(s)).getColorValue() : -1, ModItems.twigWand); - items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getMapColor().colorValue, ModItems.dye, ModItems.petal); + items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getColorValue(), ModItems.dye, ModItems.petal); items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t), ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader); diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 581337ff2..c40269968 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -59,7 +59,7 @@ public class CorporeaAutoCompleteHandler { if(item != null && item.getCreativeTab() != null) { curList.clear(); try { - item.getSubItems(item, null, curList); + item.getSubItems(null, curList); for(ItemStack stack : curList) itemNames.add(CorporeaHelper.stripControlCodes(stack.getDisplayName().trim())); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 23955f16e..a1cad92c3 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -190,7 +190,7 @@ public class ClientProxy implements IProxy { private static final ModelBiped EMPTY_MODEL = new ModelBiped(); static { - EMPTY_MODEL.setInvisible(true); + EMPTY_MODEL.setVisible(false); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 663d56fb6..ab24be5b4 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Queue; +import net.minecraft.client.gui.advancements.GuiScreenAdvancements; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -52,7 +53,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.proxy.ClientProxy; -import vazkii.botania.client.gui.GuiAchievementsHacky; import vazkii.botania.client.gui.GuiBotaniaConfig; import vazkii.botania.client.gui.lexicon.button.GuiButtonAchievement; import vazkii.botania.client.gui.lexicon.button.GuiButtonBookmark; @@ -435,7 +435,9 @@ public class GuiLexicon extends GuiScreen { mc.displayGuiScreen(new GuiBotaniaConfig(this)); break; case -2 : - mc.displayGuiScreen(new GuiAchievementsHacky(this, mc.player.getStatFileWriter())); + // todo 1.12 switch to botania tab + if(mc.player != null) + this.mc.displayGuiScreen(new GuiScreenAdvancements(this.mc.player.connection.func_191982_f())); break; case -3 : mc.displayGuiScreen(new GuiLexiconChallengesList()); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 5352b18dd..0353e56b8 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -29,7 +29,7 @@ public class GuiButtonAchievement 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/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 3942eeaca..1688a4c4d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -28,7 +28,7 @@ public class GuiButtonBack 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(enabled) { 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/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 93d15c3a4..f5254534b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -21,7 +21,7 @@ public class GuiButtonBookmark 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/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index d7ab8d14f..3ea5ff615 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -74,7 +74,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { } @Override - public void drawButton(@Nonnull Minecraft mc, int mx, int my) { + public void drawButton(@Nonnull Minecraft mc, int mx, int my, float partialTicks) { boolean inside = mx >= x && my >= y && mx < x + width && my < y + height; if(inside) ticksHovered = Math.min(time, ticksHovered + gui.timeDelta); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index f3d9230fb..e9a7f603b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -32,7 +32,7 @@ public class GuiButtonChallengeIcon 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/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index c4d40a456..2d099ad64 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -30,7 +30,7 @@ public class GuiButtonChallengeInfo 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/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 556dfba43..4c519c0c7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -29,7 +29,7 @@ public class GuiButtonChallenges 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/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 720ff16cc..0c35847ec 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -33,7 +33,7 @@ public class GuiButtonDoot 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/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 6701d39ee..5882340e0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -32,7 +32,7 @@ public class GuiButtonNotes 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/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index f75a3e910..f19ec30ca 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -30,7 +30,7 @@ public class GuiButtonPage 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(enabled) { 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/GuiButtonScaleChange.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java index 3f07594e7..cf89bab7d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java @@ -29,7 +29,7 @@ public class GuiButtonScaleChange 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/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 6b41c8b6d..4f395ecb4 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -29,7 +29,7 @@ public class GuiButtonShare 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/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index a97e25efd..85ce9d7ed 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -31,7 +31,7 @@ public class GuiButtonUpdateWarning 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(!visible || !enabled) return; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 7a585376e..502df9a45 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -29,7 +29,7 @@ public class GuiButtonViewOnline 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/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index d747c8faa..fbcf0e5f2 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -16,7 +16,6 @@ import org.apache.logging.log4j.Logger; import net.minecraft.entity.Entity; import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.entity.boss.EntityDragonPart; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.item.EntityItemFrame; @@ -42,7 +41,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModMultiblocks; diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 0c69a0b4a..8df182993 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -28,7 +28,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -85,8 +84,6 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { boolean did = ((TileAlfPortal) world.getTileEntity(pos)).onWanded(); - if(did && player != null) - player.addStat(ModAchievements.elfPortalOpen, 1); return did; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index da55f5bc7..c7793db08 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -90,9 +90,9 @@ public class BlockAltGrass extends BlockMod implements 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 < 6; 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/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 0a16a32f3..c1391ab67 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -88,9 +88,9 @@ public class BlockLivingwood 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 < LivingWoodVariant.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/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index bf131f652..80cc26ee2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -14,22 +14,18 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; -import vazkii.botania.common.achievement.ICraftAchievement; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityManaStorm; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable, ICraftAchievement { +public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable { public BlockManaBomb() { super(Material.WOOD, LibBlockNames.MANA_BOMB); @@ -52,10 +48,4 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaBomb; } - - @Override - public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { - return ModAchievements.manaBombIgnite; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index b8f5b9eba..b7f354346 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -184,7 +184,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @SideOnly(Side.CLIENT) public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { state = getActualState(state, world, pos); - int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; + int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getColorValue(); int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index b73985ee7..f62e32b01 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -29,7 +29,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -46,8 +45,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.IPickupAchievement; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -55,7 +52,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IModelRegister { +public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowable, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -82,7 +79,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { - return AABB.move(state.getOffset(world, pos)); + return AABB.offset(state.getOffset(world, pos)); } @Nonnull @@ -123,9 +120,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @SideOnly(Side.CLIENT) @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 < 16; i++) - stacks.add(new ItemStack(item, 1, i)); + stacks.add(new ItemStack(this, 1, i)); } @Override @@ -136,7 +133,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; + int hex = state.getValue(BotaniaStateProps.COLOR).getColorValue(); int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; @@ -150,11 +147,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return LexiconData.flowers; } - @Override - public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { - return ModAchievements.flowerPickup; - } - @Override public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, boolean fuckifiknow) { return world.isAirBlock(pos.up()); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 0d4cf8e1d..9ae12501d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -125,9 +125,9 @@ public class BlockPlatform extends BlockCamo 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 < PlatformVariant.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/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index bdd914025..caed897e1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -100,9 +100,9 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { + public void getSubBlocks(CreativeTabs par2, NonNullList par3) { for(int i = 0; i < PylonVariant.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/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index ecc71b8b5..3a40ae678 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -136,7 +136,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { - return AABB.move(state.getOffset(world, pos)); + return AABB.offset(state.getOffset(world, pos)); } @Nonnull @@ -207,7 +207,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { + public void getSubBlocks(CreativeTabs tab, @Nonnull NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { stacks.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 7e5f81ca8..86cee153e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -74,7 +74,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { + public void getSubBlocks(CreativeTabs par2, NonNullList par3) { for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index b05d51d29..a32b08cdc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -115,7 +115,6 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(player, hand, player.getHeldItem(hand), par6); - player.addStat(ModAchievements.tinyPotatoPet, 1); world.spawnParticle(EnumParticleTypes.HEART, pos.getX() + AABB.minX + Math.random() * (AABB.maxX - AABB.minX), pos.getY() + AABB.maxY, pos.getZ() + AABB.minZ + Math.random() * (AABB.maxZ - AABB.minZ), 0, 0 ,0); } return true; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index cbd5d9ddf..edf989481 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -78,9 +78,9 @@ public class BlockBiomeStoneWall extends BlockModWall { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull NonNullList list) { + public void getSubBlocks(CreativeTabs tabs, @Nonnull NonNullList list) { for(int i = 0; i < 8; 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/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 7f3a61499..788191777 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -24,6 +24,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; @@ -139,8 +140,7 @@ public class TileCraftCrate extends TileOpenCrate { craft.setInventorySlotContents(i, stack.copy()); } - List recipes = CraftingManager.getInstance().getRecipeList(); - for(IRecipe recipe : recipes) + for(IRecipe recipe : ForgeRegistries.RECIPES) if(recipe.matches(craft, world)) { itemHandler.setStackInSlot(9, recipe.getCraftingResult(craft)); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 24aa74502..034eb8c31 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -30,6 +30,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.ItemEnchantedBook; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -124,8 +125,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(EntityItem entity : items) { ItemStack item = entity.getItem(); if(item.getItem() == Items.ENCHANTED_BOOK) { - NBTTagList enchants = Items.ENCHANTED_BOOK.getEnchantments(item); - if(enchants != null && enchants.tagCount() > 0) { + NBTTagList enchants = ItemEnchantedBook.getEnchantments(item); + if(enchants.tagCount() > 0) { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short id = enchant.getShort("id"); if(isEnchantmentValid(Enchantment.getEnchantmentByID(id))) { @@ -176,8 +177,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(EntityItem entity : items) { ItemStack item = entity.getItem(); if(item.getItem() == Items.ENCHANTED_BOOK) { - NBTTagList enchants = Items.ENCHANTED_BOOK.getEnchantments(item); - if(enchants != null && enchants.tagCount() > 0) { + NBTTagList enchants = ItemEnchantedBook.getEnchantments(item); + if(enchants.tagCount() > 0) { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short enchantId = enchant.getShort("id"); short enchantLvl = enchant.getShort("lvl"); @@ -206,11 +207,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { manaRequired = 0; for(EnchantmentData data : enchants) { manaRequired += (int) - (5000F * ((15 - Math.min(15, data.enchantmentobj.getRarity().getWeight())) - * 1.05F) - * ((3F + data.enchantmentLevel * data.enchantmentLevel) * 0.25F) + (5000F * ((15 - Math.min(15, data.enchantment.getRarity().getWeight())) + * 1.05F) + * ((3F + data.enchantmentLevel * data.enchantmentLevel) + * 0.25F) * (0.9F + enchants.size() * 0.05F) - * (data.enchantmentobj.isTreasureEnchantment() ? 1.25F : 1F)); + * (data.enchantment.isTreasureEnchantment() ? 1.25F : 1F)); } } else if(mana >= manaRequired) { manaRequired = 0; @@ -239,8 +241,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { case DO_ENCHANT : { // Enchant if(stageTicks >= 100) { for(EnchantmentData data : enchants) - if(EnchantmentHelper.getEnchantmentLevel(data.enchantmentobj, itemToEnchant) == 0) - itemToEnchant.addEnchantment(data.enchantmentobj, data.enchantmentLevel); + if(EnchantmentHelper.getEnchantmentLevel(data.enchantment, itemToEnchant) == 0) + itemToEnchant.addEnchantment(data.enchantment, data.enchantmentLevel); enchants.clear(); manaRequired = -1; @@ -332,7 +334,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { cmp.setTag(TAG_ITEM, itemCmp); String enchStr = enchants.stream() - .map(e -> Enchantment.REGISTRY.getNameForObject(e.enchantmentobj) + "=" + e.enchantmentLevel) + .map(e -> Enchantment.REGISTRY.getNameForObject(e.enchantment) + "=" + e.enchantmentLevel) .collect(Collectors.joining(",")); cmp.setString(TAG_ENCHANTS, enchStr); } @@ -363,7 +365,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { private boolean hasEnchantAlready(Enchantment enchant) { for(EnchantmentData data : enchants) - if(data.enchantmentobj == enchant) + if(data.enchantment == enchant) return true; return false; @@ -374,7 +376,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { return false; for(EnchantmentData data : enchants) { - Enchantment otherEnch = data.enchantmentobj; + Enchantment otherEnch = data.enchantment; if (!ench.func_191560_c(otherEnch)) return false; } 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 f840a6182..3720c43d7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -39,7 +39,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; @@ -104,7 +103,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { if(endpoint != null) { AxisAlignedBB aabb = ModBlocks.lightRelay.getBoundingBox(world.getBlockState(pos), world, pos).offset(pos); float range = 0.5F; - List enderPearls = world.getEntitiesWithinAABB(EntityEnderPearl.class, aabb.expandXyz(range)); + List enderPearls = world.getEntitiesWithinAABB(EntityEnderPearl.class, aabb.grow(range)); for(EntityEnderPearl pearl : enderPearls) { pearl.setPositionAndUpdate( endpoint.getX() + pearl.posX - pos.getX(), diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 62d4824e0..e0d620ad9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -72,7 +72,7 @@ public class TilePylon extends TileEntity implements ITickable { Block block = world.getBlockState(pos.down()).getBlock(); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { - int hex = world.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; + int hex = world.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).getColorValue(); int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index d1f830627..244425ab3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -93,7 +93,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { return; } - int k = world.getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(blockpos.getX(), blockpos.getY(), blockpos.getZ(), blockpos.getX() + 1, blockpos.getY() + 1, blockpos.getZ() + 1).expandXyz(spawnRange)).size(); + int k = world.getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(blockpos.getX(), blockpos.getY(), blockpos.getZ(), blockpos.getX() + 1, blockpos.getY() + 1, blockpos.getZ() + 1).grow(spawnRange)).size(); if (k >= maxNearbyEntities) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 487488c52..e8b921c81 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -39,7 +39,6 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.MathHelper; public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { @@ -267,8 +266,6 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ index.doCorporeaRequest(name, count, spark); event.getPlayer().sendMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); - if(CorporeaHelper.lastRequestExtractions >= 50000) - event.getPlayer().addStat(ModAchievements.superCorporeaRequest, 1); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 2ef10ae3c..63422eded 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -49,7 +49,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final DataParameter MASTER = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.BOOLEAN); private static final DataParameter NETWORK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); private static final DataParameter ITEM_DISPLAY_TICKS = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); - private static final DataParameter DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.OPTIONAL_ITEM_STACK); + private static final DataParameter DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.ITEM_STACK); private ICorporeaSpark master; private List connections = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 3d6685e78..9012ff5e3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -89,7 +89,6 @@ import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -383,7 +382,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { @Override public boolean attackEntityFrom(@Nonnull DamageSource source, float par2) { - Entity e = source.getEntity(); + Entity e = source.getTrueSource(); if (e instanceof EntityPlayer && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; @@ -418,7 +417,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { protected void damageEntity(@Nonnull DamageSource par1DamageSource, float par2) { super.damageEntity(par1DamageSource, par2); - Entity attacker = par1DamageSource.getEntity(); + Entity attacker = par1DamageSource.getImmediateSource(); if(attacker != null) { Vector3 thisVector = Vector3.fromEntityCenter(this); Vector3 playerVector = Vector3.fromEntityCenter(attacker); @@ -946,7 +945,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(origPos.squareDistanceTo(newPos) > 1) { for(EntityPlayer player : getPlayersAround()) { - RayTraceResult rtr = player.getEntityBoundingBox().expandXyz(0.25).calculateIntercept(origPos, newPos); + RayTraceResult rtr = player.getEntityBoundingBox().grow(0.25).calculateIntercept(origPos, newPos); if(rtr != null) player.attackEntityFrom(DamageSource.causeMobDamage(this), 6); } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index b765ac273..ff0ee3583 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -52,7 +52,7 @@ public class EntitySignalFlare extends Entity { int color = getColor(); if(color < 16 && color >= 0) { - int hex = EnumDyeColor.byMetadata(color).getMapColor().colorValue; + int hex = EnumDyeColor.byMetadata(color).getColorValue(); int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 56ef7a22f..a724212be 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -208,7 +208,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile } 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; boolean flag = false; @@ -230,7 +230,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile else { flag = false; - 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/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 70fbf69af..4b8ea7f44 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -64,7 +64,7 @@ public class EntityThrownItem extends EntityItem { if (!world.isRemote) { Entity entity = null; - List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); + List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().offset(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; for (Entity entity1 : list) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index cb5b5a8f1..7860ef338 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -27,10 +27,8 @@ import net.minecraft.entity.monster.EntitySlime; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -45,8 +43,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ICraftAchievement; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index d6e969628..52f7841d6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -34,7 +34,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -60,8 +59,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ICraftAchievement; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; @@ -160,7 +157,7 @@ public class ItemCraftingHalo extends ItemMod { for(int i = 0; i < 9; i++) fakeInv.setInventorySlotContents(i, recipe[i]); - ItemStack result = CraftingManager.getInstance().findMatchingRecipe(fakeInv, player.world); + ItemStack result = CraftingManager.findMatchingResult(fakeInv, player.world); if(result.isEmpty()) { assignRecipe(stack, recipe[9], slot); return null; @@ -327,7 +324,7 @@ public class ItemCraftingHalo extends ItemMod { NBTTagCompound cmp = new NBTTagCompound(); NBTTagCompound cmp1 = new NBTTagCompound(); - ItemStack result = CraftingManager.getInstance().findMatchingRecipe((InventoryCrafting) event.craftMatrix, event.player.world); + ItemStack result = CraftingManager.findMatchingResult((InventoryCrafting) event.craftMatrix, event.player.world); if(!result.isEmpty()) { cmp1 = result.writeToNBT(cmp1); cmp.setTag(TAG_ITEM_PREFIX + 9, cmp1); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 26da760fb..ecee5d3c9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -96,7 +96,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet ItemStack stack = player.getHeldItem(hand); spawnBurstFirst(world, pos, stack); if(stack.getItemDamage() == 19) - player.addStat(ModAchievements.l20ShardUse, 1); + ; stack.shrink(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index efaa2c866..b4f6f0228 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -179,7 +179,6 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } Botania.proxy.setLexiconStack(stack); - player.addStat(ModAchievements.lexiconUse, 1); player.openGui(Botania.instance, LibGuiIDs.LEXICON, world, 0, 0, 0); if(!world.isRemote && !skipSound) world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index fa56e4955..8edf69059 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -46,7 +46,6 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe; import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; @@ -190,7 +189,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { ItemStack lens = getLens(par1ItemStack); if(!lens.isEmpty()) { - List tooltip = lens.getTooltip(Minecraft.getMinecraft().player, false); + List tooltip = lens.getTooltip(Minecraft.getMinecraft().player, ITooltipFlag.TooltipFlags.NORMAL); if(tooltip.size() > 1) stacks.addAll(tooltip.subList(1, tooltip.size())); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 7e8d5d51d..0dd361782 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -29,7 +29,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; @@ -57,7 +56,6 @@ public class ItemPinkinator extends ItemMod { world.spawnEntity(pink); pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); } - player.addStat(ModAchievements.pinkinator, 1); world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); stack.shrink(1); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 825eb4190..59c8efaea 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -35,7 +35,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.lib.LibItemNames; public class ItemSpawnerMover extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 5af85f246..19d7b6de1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -50,7 +50,6 @@ import vazkii.botania.api.wand.ITileBound; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockPistonRelay; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileEnchanter; @@ -120,7 +119,6 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(axis != null) { if(!world.isRemote) { world.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); - player.addStat(ModAchievements.enchanterMake, 1); world.playSound(null, pos, BotaniaSoundEvents.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); } else { for(int i = 0; i < 50; i++) { 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 69fc6ead9..97f29e667 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 @@ -36,10 +36,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraftforge.common.MinecraftForge; @@ -60,8 +57,6 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ICraftAchievement; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.StringObfuscator; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index b9852ad3a..4a7554c23 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -81,7 +81,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs if(player.world.isRemote) { if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.WATER)) { float speed = beltItem.getSpeed(belt); - player.moveRelative(0F, 1F, player.capabilities.isFlying ? speed : speed); + player.func_191958_b(0F, 0F, 1F, player.capabilities.isFlying ? speed : speed); // todo 1.12 verify beltItem.onMovedTick(belt, player); if(player.ticksExisted % COST_INTERVAL == 0) 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 605c21ee3..5939a82ca 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 @@ -48,7 +48,6 @@ import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; import vazkii.botania.common.item.ItemTemperanceStone; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 8ec44272a..a19cdd70b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -54,7 +54,7 @@ public class LensFlare extends Lens { if(storedColor == 16) { hex = Color.HSBtoRGB(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); } else if(storedColor >= 0) { - hex = EnumDyeColor.byMetadata(storedColor).getMapColor().colorValue; + hex = EnumDyeColor.byMetadata(storedColor).getColorValue(); } float r = ((hex & 0xFF0000) >> 16) / 255F; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 300fc057c..c05fd95d1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -24,7 +24,6 @@ import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModMultiblocks; import vazkii.botania.common.brew.ModBrews;