diff --git a/ForgeGradle-2.1-20151213.034144-13.jar.1 b/ForgeGradle-2.1-20151213.034144-13.jar.1 new file mode 100644 index 000000000..68587665d Binary files /dev/null and b/ForgeGradle-2.1-20151213.034144-13.jar.1 differ diff --git a/build.gradle b/build.gradle index 38d6b7270..1a561c020 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,8 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' } } @@ -22,8 +23,8 @@ repositories { } } -apply plugin: 'forge' -apply plugin: 'curseforge' +apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'com.matthewprenger.cursegradle' ext.configFile = file('build.properties') @@ -36,8 +37,9 @@ archivesBaseName = config.mod_name minecraft { version = "${config.mc_version}-${config.forge_version}" - assetDir = "eclipse/assets" + runDir = "eclipse/assets" + mappings = "snapshot_20151128" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -60,9 +62,9 @@ dependencies { compile files( 'Baubles-deobf.jar' ) - compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev" - compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev" - compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" + //compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev" + //compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev" + //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" //compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev" //and a bit more for SCP @@ -207,14 +209,18 @@ jar { archiveName = "${baseName} ${version}.${extension}" } -curse { +curseforge { apiKey = priv.cfkey - projectId = "225643" - changelog = """ - See http://botaniamod.net/changelog.php#${version} - """ - releaseType = "release" - relatedProject 'baubles': 'requiredLibrary' + project { + id = "225643" + changelog = """ + See http://botaniamod.net/changelog.php#${version} + """ + releaseType = "release" + relations { + requiredLibrary 'baubles' + } + } } defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' diff --git a/build.properties b/build.properties index 07e4fe7ab..94e996974 100644 --- a/build.properties +++ b/build.properties @@ -2,8 +2,8 @@ #Sun Dec 13 01:59:42 GMT 2015 version=r1.8 dir_output=../Build Output/Botania/ -mc_version=1.8 -forge_version=11.14.3.1468 +mc_version=1.8.8 +forge_version=11.15.0.1635-1.8.8 dir_repo=./ build_number=244 mod_name=Botania diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index daf353b30..b3601d37f 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -17,6 +17,8 @@ import java.util.WeakHashMap; import java.util.regex.Pattern; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -246,8 +248,8 @@ public static ICorporeaSpark getSparkForInventory(IInventory inv) { * in are for the block that the spark will be on, not the coords of the spark itself. */ public static ICorporeaSpark getSparkForBlock(World world, BlockPos pos) { - List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1))); - return sparks.isEmpty() ? null : sparks.get(0); + List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1)), Predicates.instanceOf(ICorporeaSpark.class)); + return sparks.isEmpty() ? null : ((ICorporeaSpark) sparks.get(0)); } /** diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index cd76a22b4..c9172dd6a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -280,7 +280,7 @@ private void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack int y = res.getScaledHeight() / 2 + 10; int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; - int v = mc.thePlayer.getCommandSenderName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; + int v = mc.thePlayer.getName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 89203afe8..b7871192a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -56,7 +56,7 @@ public static void render() { if(slot != null && slot.getHasStack()) { ItemStack stack = slot.getStack(); if(stack != null) { - ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + ScaledResolution res = new ScaledResolution(mc); FontRenderer font = mc.fontRendererObj; int mouseX = Mouse.getX() * res.getScaledWidth() / mc.displayWidth; int mouseY = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight; diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 2e0495c7a..94cd95403 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -111,7 +111,7 @@ public ItemStack decrStackSize(int i, int j) { } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { return getStackInSlot(i); } @@ -163,7 +163,7 @@ public boolean hasCustomName() { @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } @Override @@ -177,7 +177,7 @@ public void closeInventory(EntityPlayer player) { } @Override - public String getCommandSenderName() { + public String getName() { return LibItemNames.FLOWER_BAG; } diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index b878c81c9..5d59fe39e 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -111,7 +111,7 @@ public ItemStack decrStackSize(int i, int j) { } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { return getStackInSlot(i); } @@ -162,7 +162,7 @@ public boolean hasCustomName() { @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } @Override @@ -176,7 +176,7 @@ public void closeInventory(EntityPlayer player) { } @Override - public String getCommandSenderName() { + public String getName() { return LibItemNames.BAUBLE_BOX; } 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 095fcba2d..c917be4c6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -225,7 +225,7 @@ public void drawScreen(int par1, int par2, float par3) { bookmarksNeedPopulation = false; } - if(mc.thePlayer.getCommandSenderName().equals("haighyorkie")) { + if(mc.thePlayer.getName().equals("haighyorkie")) { GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left - 19, top + 42, 67, 180, 19, 26); diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java index a816e8bf8..0c98afcce 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java @@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.model.ModelBook; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; @@ -75,8 +76,8 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.3F, -0.21F, -0.07F); GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); - boolean bevo = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("BevoLJ"); - boolean saice = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("saice"); + boolean bevo = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("BevoLJ"); + boolean saice = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("saice"); String title = ModItems.lexicon.getItemStackDisplayName(null); String origTitle = title; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 0d2513684..6bd133987 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -59,7 +59,7 @@ public boolean canProvidePower() { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Integer) state.getValue(BotaniaStateProps.POWER)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index a43404df8..2a3c39a03 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -76,13 +76,13 @@ public int getComparatorInputOverride(World world, BlockPos pos) { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return isProvidingWeakPower(world, pos, state, side); + public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + return getWeakPower(world, pos, state, side); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 9549af714..bff3801cc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -114,7 +114,7 @@ public boolean canProvidePower() { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 0 : 15; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index ccb02bc33..31539d5c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -85,11 +85,11 @@ public void pickUpEntities(World world, BlockPos pos) { if(!relays.isEmpty()) { AxisAlignedBB aabb = new AxisAlignedBB(pos, pos.add(1, 1, 1)); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); if(!entities.isEmpty()) { - for(Entity entity : entities) { + for(Entity entity : ((List) entities)) { TileLightRelay relay = relays.get(world.rand.nextInt(relays.size())); relay.mountEntity(entity); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index df896c2aa..d8bd6c4b0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -147,7 +147,7 @@ public boolean canProvidePower() { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT && ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 8a0f6c0af..e12ccf6d2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -132,7 +132,7 @@ public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, B return false; if(!player.isSneaking()) { - playerPositions.put(player.getCommandSenderName(), getCoordsAsString(world.provider.getDimensionId(), pos)); + playerPositions.put(player.getName(), getCoordsAsString(world.provider.getDimensionId(), pos)); world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 7847e1c57..96c5e7538 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -152,13 +152,13 @@ public int getComparatorInputOverride(World world, BlockPos pos) { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return isProvidingWeakPower(world, pos, state, side); + return getWeakPower(world, pos, state, side); } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index b4c5aa6d0..d2dcda75f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -65,7 +65,7 @@ public boolean canProvidePower() { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index fe5f87d2a..46825a6b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; 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 9f0b22008..47a3c212f 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 @@ -19,6 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 715e98217..c9e18f5bf 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -67,7 +67,7 @@ public boolean canProvidePower() { } @Override - public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index d281d6d1e..8c4223ca6 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -71,7 +71,7 @@ public boolean canProvidePower() { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 4b261a7c4..fcd2a5f16 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -13,7 +13,6 @@ import java.util.List; import com.google.common.base.Predicate; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 1c7490228..4352c2ea2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.subtile.functional; import com.google.common.base.Predicate; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index b6c0806cd..bd8c091fd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -19,7 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -44,7 +44,7 @@ import com.google.common.base.Function; -public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { +public class TileAlfPortal extends TileMod implements ITickable { private static final BlockPos[] LIVINGWOOD_POSITIONS = { new BlockPos(-1, 0, 0), new BlockPos(1, 0, 0), new BlockPos(-2, 1, 0), diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 814ba088f..ab001f87c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -28,7 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -46,7 +46,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; -public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary, IUpdatePlayerListBox { +public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary, ITickable { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); @@ -279,7 +279,7 @@ public void readCustomNBT(NBTTagCompound cmp) { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.ALTAR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 5f0241589..63d376274 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -13,13 +13,13 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.common.lib.LibBlockNames; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory, IUpdatePlayerListBox { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory, ITickable { private static final int MAX_MANA = 6400; @@ -100,7 +100,7 @@ public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.AVATAR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index f3bdbb9a2..2edaf85b9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -11,10 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileBifrost extends TileMod implements IUpdatePlayerListBox { +public class TileBifrost extends TileMod implements ITickable { private static final String TAG_TICKS = "ticks"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 545ca0e44..12f061455 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -20,7 +20,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; @@ -36,7 +36,7 @@ import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar -public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver, IUpdatePlayerListBox { +public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; @@ -200,7 +200,7 @@ public AxisAlignedBB getRenderBoundingBox() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.RUNE_ALTAR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index e7c4907fe..c3600b9b1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -22,10 +22,10 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraftforge.fml.common.registry.VillagerRegistry; -public class TileCocoon extends TileMod implements IUpdatePlayerListBox { +public class TileCocoon extends TileMod implements ITickable { private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; 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 e7b3dd264..b6f2afb1c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -49,7 +49,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdatePlayerListBox { +public class TileEnchanter extends TileMod implements ISparkAttachable, ITickable { private static final String TAG_STAGE = "stage"; private static final String TAG_STAGE_TICKS = "stageTicks"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 0c4da460f..f71f78f30 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -16,13 +16,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; -public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { +public class TileEnderEye extends TileMod implements ITickable { @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index b5346daf0..6153d71a8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -11,10 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; -public class TileForestEye extends TileMod implements IUpdatePlayerListBox { +public class TileForestEye extends TileMod implements ITickable { public int entities = 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index aeed83d55..25adb17d8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -19,7 +19,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; @@ -30,7 +30,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; -public class TileHourglass extends TileSimpleInventory implements IUpdatePlayerListBox { +public class TileHourglass extends TileSimpleInventory implements ITickable { private static final String TAG_TIME = "time"; private static final String TAG_TIME_FRACTION = "timeFraction"; @@ -172,7 +172,7 @@ public void renderHUD(ScaledResolution res) { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.HOURGLASS; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index 1205c4f59..ae07b0307 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -19,7 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; @@ -30,7 +30,7 @@ import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; -public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory, IUpdatePlayerListBox { +public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory, ITickable { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; @@ -107,7 +107,7 @@ public int getSizeInventory() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.INCENSE_PLATE; } 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 ed69a1afe..3c89cc627 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -37,7 +37,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -public class TileLightRelay extends TileMod implements IWandBindable, IUpdatePlayerListBox { +public class TileLightRelay extends TileMod implements IWandBindable, ITickable { private static final int MAX_DIST = 20; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 76d854dad..fb6cce005 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -12,12 +12,12 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -public class TileManaBeacon extends TileMod implements IUpdatePlayerListBox { +public class TileManaBeacon extends TileMod implements ITickable { @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 68a571370..69b215961 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -11,11 +11,11 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; -public class TileManaFlame extends TileMod implements IUpdatePlayerListBox { +public class TileManaFlame extends TileMod implements ITickable { private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index cae077b5a..874b323de 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -14,13 +14,13 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileOpenCrate extends TileSimpleInventory implements IUpdatePlayerListBox { +public class TileOpenCrate extends TileSimpleInventory implements ITickable { @Override public int getSizeInventory() { @@ -28,7 +28,7 @@ public int getSizeInventory() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.OPEN_CRATE; } 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 f669a3f9c..5a38110e3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -15,7 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; @@ -25,7 +25,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; -public class TilePylon extends TileEntity implements IUpdatePlayerListBox { +public class TilePylon extends TileEntity implements ITickable { boolean activated = false; BlockPos centerPos; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index b2fd13271..5c25b6c26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -22,7 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; @@ -44,7 +44,7 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver, IUpdatePlayerListBox { +public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; @@ -304,7 +304,7 @@ public AxisAlignedBB getRenderBoundingBox() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.RUNE_ALTAR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index e8ba54d1a..7ce6c6c8e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -78,7 +78,7 @@ public ItemStack decrStackSize(int i, int j) { } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { return getStackInSlot(i); } @@ -137,6 +137,6 @@ public void clear() { @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index bc162d464..6acc2d432 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -84,7 +84,7 @@ public void markDirty() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.SPARK_CHANGER; } 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 f20023109..a96de1dd2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -18,7 +18,7 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; @@ -29,7 +29,7 @@ import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; -public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePlayerListBox { +public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index c272cff6d..76f96ec60 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -21,7 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos; @@ -35,7 +35,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer, IUpdatePlayerListBox { +public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer, ITickable { private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index e401e7454..faee5505e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -10,10 +10,10 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileSpiritShrine extends TileMod implements IUpdatePlayerListBox { +public class TileSpiritShrine extends TileMod implements ITickable { int ticks; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 13de5ce71..68bbcd447 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -public class TileStarfield extends TileMod implements IUpdatePlayerListBox { +public class TileStarfield extends TileMod implements ITickable { @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 9a4ec8407..b64614045 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -12,13 +12,14 @@ import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -33,7 +34,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; -public class TileTerraPlate extends TileMod implements ISparkAttachable, IUpdatePlayerListBox { +public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; @@ -227,9 +228,9 @@ public void attachSpark(ISparkEntity entity) { @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1))); + List sparks = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); if(sparks.size() == 1) { - Entity e = (Entity) sparks.get(0); + Entity e = sparks.get(0); return (ISparkEntity) e; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 95b41c283..74157b72a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -10,9 +10,9 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; -public class TileTeruTeruBozu extends TileMod implements IUpdatePlayerListBox { +public class TileTeruTeruBozu extends TileMod implements ITickable { public boolean wasRaining = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 3c5f1c78c..6ffa2e6cb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod implements IManaCollisionGhost, IUpdatePlayerListBox { +public class TileTinyPlanet extends TileMod implements IManaCollisionGhost, ITickable { @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index bf398f2a6..e8f7f3ab1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -11,10 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; -public class TileTinyPotato extends TileMod implements IUpdatePlayerListBox { +public class TileTinyPotato extends TileMod implements ITickable { private static final String TAG_NAME = "name"; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index c16e4b511..3645474fd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -15,14 +15,14 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.lib.LibBlockNames; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IUpdatePlayerListBox { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, ITickable { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -131,7 +131,7 @@ public boolean isItemValidForSlot(int i, ItemStack itemstack) { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_CRYSTAL_CUBE; } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 89d8302ba..7345b60d5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -80,7 +80,7 @@ public int getSizeInventory() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_FUNNEL; } 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 366c42040..7cac8d098 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 @@ -24,7 +24,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; @@ -45,7 +45,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, IUpdatePlayerListBox { +public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, ITickable { public static final double RADIUS = 2.5; @@ -196,7 +196,7 @@ public int getSizeInventory() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_INDEX; } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index f873137d4..936316499 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -39,7 +39,7 @@ public int getSizeInventory() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_INTERCEPTOR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index c85db3c6a..61a367998 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -13,7 +13,7 @@ import net.minecraft.block.BlockFurnace; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; @@ -23,7 +23,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; -public class TileBellows extends TileMod implements IUpdatePlayerListBox { +public class TileBellows extends TileMod implements ITickable { private static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index fab39e870..2a5486981 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -22,7 +22,7 @@ import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibMisc; -public class TileDistributor extends TileMod implements IManaReceiver, IUpdatePlayerListBox { +public class TileDistributor extends TileMod implements IManaReceiver, ITickable { List validPools = new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index b3d738994..8690a1d97 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.tile.mana; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; @@ -18,13 +20,13 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -public class TileManaDetector extends TileMod implements IManaCollisionGhost, IUpdatePlayerListBox { +public class TileManaDetector extends TileMod implements IManaCollisionGhost, ITickable { @Override public void update() { if(!worldObj.isRemote) { boolean state = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); - boolean expectedState = worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))).size() != 0; + boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(state != expectedState) worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index fa187a4d4..6f4460ffb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; @@ -62,7 +62,7 @@ import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; -public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, IUpdatePlayerListBox { +public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, ITickable { public static final int MAX_MANA = 1000000; public static final int MAX_MANA_DILLUTED = 10000; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index c95ac821a..4181709db 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -61,7 +61,7 @@ public int getSizeInventory() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.PRISM; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index f1714046a..e16f1c53c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -11,12 +11,12 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod implements IUpdatePlayerListBox { +public class TilePump extends TileMod implements ITickable { private static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index a6eb3e27b..a9f713222 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -25,7 +25,7 @@ import java.util.Map; @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") -public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection, IUpdatePlayerListBox { +public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection, ITickable { private static final int CONVERSION_RATE = 10; private static final int MAX_MANA = 1280 * CONVERSION_RATE; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 073f9493e..a0ffffa23 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.BlockPos; @@ -58,7 +58,7 @@ import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; import vazkii.botania.common.lib.LibBlockNames; -public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, IUpdatePlayerListBox { +public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable { private static final int MAX_MANA = 1000; private static final int ULTRA_MAX_MANA = 6400; @@ -600,7 +600,7 @@ public int getSizeInventory() { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.SPREADER; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 99591955d..b231a287c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -16,7 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; @@ -26,7 +26,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TileTurntable extends TileMod implements IUpdatePlayerListBox { +public class TileTurntable extends TileMod implements ITickable { private static final String TAG_SPEED = "speed"; private static final String TAG_BACKWARDS = "backwards"; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 61e54503c..224ecdbf2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -12,7 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -21,7 +21,7 @@ import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; -public abstract class TileRedString extends TileMod implements ITileBound, IUpdatePlayerListBox { +public abstract class TileRedString extends TileMod implements ITileBound, ITickable { private BlockPos binding; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 3e3a5434e..a54ed25c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -49,9 +49,9 @@ public ItemStack decrStackSize(int slot, int count) { } @Override - public ItemStack getStackInSlotOnClosing(int slot) { + public ItemStack removeStackFromSlot(int slot) { IInventory inv = getInventory(); - return inv != null ? inv.getStackInSlotOnClosing(slot) : null; + return inv != null ? inv.removeStackFromSlot(slot) : null; } @Override @@ -62,9 +62,9 @@ public void setInventorySlotContents(int slot, ItemStack stack) { } @Override - public String getCommandSenderName() { + public String getName() { IInventory inv = getInventory(); - return inv != null ? inv.getCommandSenderName() : LibBlockNames.RED_STRING_CONTAINER; + return inv != null ? inv.getName() : LibBlockNames.RED_STRING_CONTAINER; } @Override @@ -76,7 +76,7 @@ public boolean hasCustomName() { @Override public IChatComponent getDisplayName() { IInventory inv = getInventory(); - return inv != null ? inv.getDisplayName() : new ChatComponentText(getCommandSenderName()); + return inv != null ? inv.getDisplayName() : new ChatComponentText(getName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 40bd40b44..d5a3bc949 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -15,12 +15,12 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -public class TileRedStringInterceptor extends TileRedString implements IUpdatePlayerListBox { +public class TileRedStringInterceptor extends TileRedString implements ITickable { public static List interceptors = new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index d1d322d7e..a5d135359 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -32,7 +32,7 @@ public String getCommandUsage(ICommandSender p_71518_1_) { @Override public void processCommand(ICommandSender sender, String[] args) { String json = StatCollector.translateToLocal("botaniamisc.shareMsg"); - json = json.replaceAll("%name%", sender.getCommandSenderName()); + json = json.replaceAll("%name%", sender.getName()); json = json.replaceAll("%entry%", args[0]); json = json.replaceAll("%entryname%", StatCollector.translateToLocal(args[0])); diff --git a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java index e1ccd195e..4deb16d15 100644 --- a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; @@ -44,7 +45,7 @@ private static void remapBlock(MissingMapping mapping, Block block) { private static Item getItem(String name) { for(Object o : Item.itemRegistry.getKeys()) { - Item i = (Item) Item.itemRegistry.getObject(o); + Item i = (Item) Item.itemRegistry.getObject(new ResourceLocation(o)); if(i.getUnlocalizedName().substring("item.".length()).equals(name)) return i; } @@ -54,7 +55,7 @@ private static Item getItem(String name) { private static Block getBlock(String name) { for(Object o : Block.blockRegistry.getKeys()) { - Block b = (Block) Block.blockRegistry.getObject(o); + Block b = (Block) Block.blockRegistry.getObject(new ResourceLocation(o)); if(b.getUnlocalizedName().substring("tile.".length()).equals(name)) return b; } diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index beb00941f..1983fdd86 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -261,7 +261,7 @@ public ItemStack getStackInSlot(Enum i) { } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { if(i >= inventoryContents.length) return null; @@ -358,7 +358,7 @@ public List contents() { } @Override - public String getCommandSenderName() { + public String getName() { return null; } @@ -369,7 +369,7 @@ public boolean hasCustomName() { @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } @Override diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index 4db165e9b..e96dca7cd 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -13,8 +13,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import vazkii.botania.common.core.handler.ConfigHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; public final class AdaptorNotifier { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c1889f9b2..088259672 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -2168,7 +2169,7 @@ else addOreDictRecipe(new ItemStack(ModItems.cacophonium), // Revealing Helmet Recipes if(Botania.thaumcraftLoaded) { - Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); + Item goggles = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft:ItemGoggles")); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manasteelHelmRevealing), new ItemStack(ModItems.manasteelHelm), goggles); recipeHelmetOfRevealing = BotaniaAPI.getLatestAddedRecipe(); //We want manasteel to show in the Lexicon GameRegistry.addShapelessRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), new ItemStack(ModItems.terrasteelHelm), goggles); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 34f8197de..7f1877a3b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -17,6 +17,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.common.Botania; @@ -74,7 +75,7 @@ public static void init() { tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.potato), 1337); if(Botania.thaumcraftLoaded) { - Item inkwell = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemInkwell"); + Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft:ItemInkwell")); manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 041350ce1..e2a81c230 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -357,8 +357,8 @@ public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; - if(!playersWhoAttacked.contains(player.getCommandSenderName())) - playersWhoAttacked.add(player.getCommandSenderName()); + if(!playersWhoAttacked.contains(player.getName())) + playersWhoAttacked.add(player.getName()); float dmg = par2; boolean crit = false; @@ -380,7 +380,7 @@ public static boolean isTruePlayer(Entity e) { EntityPlayer player = (EntityPlayer) e; - String name = player.getCommandSenderName(); + String name = player.getName(); return !(player instanceof FakePlayer || FAKE_PLAYER_PATTERN.matcher(name).matches()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 1e1b81e10..7b6eb6ecc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -318,7 +318,7 @@ public void writeEntityToNBT(NBTTagCompound tagCompound) if ((this.throwerName == null || this.throwerName.length() == 0) && this.thrower instanceof EntityPlayer) { - this.throwerName = this.thrower.getCommandSenderName(); + this.throwerName = this.thrower.getName(); } tagCompound.setString("ownerName", this.throwerName == null ? "" : this.throwerName); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 386267e83..fb518cdb4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -167,7 +167,7 @@ public void effect(EntityPlayer player, int id) { if(!player.worldObj.isRemote) { player.attackEntityFrom(DamageSource.magic, player.getHealth() - 1); ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", player.getCommandSenderName()); + ItemNBTHelper.setString(stack, "SkullOwner", player.getName()); player.dropPlayerItemWithRandomChoice(stack, true); } break; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 803dbb741..6d6324f06 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -132,11 +132,11 @@ else if(TileEnchanter.canEnchanterExist(par3World, pos, EnumFacing.Axis.Z)) } return wanded; - } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName()) && !par3World.isRemote) { - String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getCommandSenderName()); + } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getName()) && !par3World.isRemote) { + String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getName()); String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.getDimensionId(), pos); - BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName()); + BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(par3World).markDirty(); diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 9c8ae52b7..2713ecaed 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -33,7 +33,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla player.rotationYaw = 0F; player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while(!world.getCollidingBoundingBoxes(player, player.getBoundingBox()).isEmpty()) + while(!world.getCollidingBoundingBoxes(player, player.getEntityBoundingBox()).isEmpty()) player.setPositionAndUpdate(player.posX, player.posY + 1, player.posZ); world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index fa4b304b3..3bf997eea 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -12,6 +12,7 @@ import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; @@ -60,7 +61,7 @@ public void onEntityDamaged(LivingHurtEvent event) { if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range)); + List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1) { if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { if(event.entityLiving instanceof EntityCreeper) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 43915808e..aad7a5d61 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -88,7 +88,7 @@ public void onWornTick(ItemStack stack, EntityLivingBase entity) { } private void addIceBlock(EntityPlayer player, BlockPos coords) { - String user = player.getCommandSenderName(); + String user = player.getName(); if(!playerIceBlocks.containsKey(user)) playerIceBlocks.put(user, new ArrayList()); @@ -102,7 +102,7 @@ private void addIceBlock(EntityPlayer player, BlockPos coords) { } private void tickIceRemovers(EntityPlayer player) { - String user = player.getCommandSenderName(); + String user = player.getName(); if(!playerIceBlocks.containsKey(user)) return; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 0fb9081a8..50dc76d14 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -14,13 +14,11 @@ import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import vazkii.botania.api.BotaniaAPI; @@ -43,8 +41,6 @@ public class ItemMagnetRing extends ItemBauble { - IIcon iconOff; - private static final String TAG_COOLDOWN = "cooldown"; private static final List BLACKLIST = Arrays.asList(new String[] { @@ -63,19 +59,6 @@ public ItemMagnetRing(String name, int range) { this.range = range; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - iconOff = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconIndex(ItemStack stack) { - return getCooldown(stack) <= 0 ? itemIcon : iconOff; - } - @SubscribeEvent public void onTossItem(ItemTossEvent event) { InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.player); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 0b6a3c929..50d414f38 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -15,7 +15,6 @@ import java.util.Random; import com.google.common.base.Predicate; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; @@ -62,11 +61,11 @@ public boolean apply(Entity e) { Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; for(int i = 0; i < 4; i++) { - List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); + List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); if(entities.isEmpty()) break; - EntityLivingBase target = entities.get(rand.nextInt(entities.size())); + EntityLivingBase target = ((EntityLivingBase) entities.get(rand.nextInt(entities.size()))); if(attacker instanceof EntityPlayer) target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg); else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 13adbbec1..647dffbb5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -50,7 +50,7 @@ else if(event.entityLiving instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 addDrop(event, new ItemStack(Items.skull, 1, 4)); else if(event.entityLiving instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer)event.entityLiving).getCommandSenderName()); + ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer)event.entityLiving).getName()); addDrop(event, stack); } else if(event.entityLiving instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) addDrop(event, new ItemStack(ModItems.gaiaHead)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 1258fd90c..c6aac93b3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -85,7 +85,7 @@ public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { burst.setMotion(burst.motionX * motionModifier, burst.motionY * motionModifier, burst.motionZ * motionModifier); ItemStack lens = stack.copy(); - ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getCommandSenderName()); + ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getName()); burst.setSourceLens(lens); return burst; } @@ -108,7 +108,7 @@ public void updateBurst(IManaBurst burst, ItemStack stack) { String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (((EntityPlayer) living).getCommandSenderName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) + if(living instanceof EntityPlayer && (((EntityPlayer) living).getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) continue; if(living.hurtTime == 0) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 9e3d84bca..c2730607c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -12,6 +12,7 @@ import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityItem; @@ -29,13 +30,13 @@ public class LensInfluence extends Lens { public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { if(!burst.isFake()) { double range = 3.5; - List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); + List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityArrow.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityFallingBlock.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range), Predicates.instanceOf(IManaBurst.class))); - for(Entity movable : movables) { + for(Entity movable : ((List) movables)) { if(movable == burst) continue; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 09de0621e..528dfa26a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -139,7 +139,7 @@ public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { burst.setMotion(burst.motionX * motionModifier, burst.motionY * motionModifier, burst.motionZ * motionModifier); ItemStack lens = stack.copy(); - ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getCommandSenderName()); + ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getName()); burst.setSourceLens(lens); return burst; } @@ -190,7 +190,7 @@ public void updateBurst(IManaBurst burst, ItemStack stack) { } for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (((EntityPlayer) living).getCommandSenderName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) + if(living instanceof EntityPlayer && (((EntityPlayer) living).getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) continue; if(living.hurtTime == 0) { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 0285c8f7a..88f93bfeb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -106,7 +106,7 @@ public static void updateRelic(ItemStack stack, EntityPlayer player) { } public static void bindToPlayer(EntityPlayer player, ItemStack stack) { - bindToUsernameS(player.getCommandSenderName(), stack); + bindToUsernameS(player.getName(), stack); } public static void bindToUsernameS(String username, ItemStack stack) { @@ -114,7 +114,7 @@ public static void bindToUsernameS(String username, ItemStack stack) { } public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { - return isRightPlayer(player.getCommandSenderName(), stack); + return isRightPlayer(player.getName(), stack); } public static boolean isRightPlayer(String player, ItemStack stack) {