Permalink
Browse files

Some 1.8.8 fixes before merging upstream

  • Loading branch information...
1 parent 5211ed9 commit b8a1a9cd5deb6c47b197dd831509c177c345fa94 @williewillus williewillus committed Dec 21, 2015
Showing with 193 additions and 196 deletions.
  1. BIN ForgeGradle-2.1-20151213.034144-13.jar.1
  2. +20 −14 build.gradle
  3. +2 −2 build.properties
  4. +4 −2 src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java
  5. +1 −1 src/main/java/vazkii/botania/client/core/handler/HUDHandler.java
  6. +1 −1 src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java
  7. +3 −3 src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java
  8. +3 −3 src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java
  9. +1 −1 src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java
  10. +3 −2 src/main/java/vazkii/botania/client/render/item/RenderLexicon.java
  11. +1 −1 src/main/java/vazkii/botania/common/block/BlockEnderEye.java
  12. +3 −3 src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java
  13. +1 −1 src/main/java/vazkii/botania/common/block/BlockHourglass.java
  14. +2 −2 src/main/java/vazkii/botania/common/block/BlockLightLauncher.java
  15. +1 −1 src/main/java/vazkii/botania/common/block/BlockLightRelay.java
  16. +1 −1 src/main/java/vazkii/botania/common/block/BlockPistonRelay.java
  17. +2 −2 src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java
  18. +1 −1 src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java
  19. +0 −1 src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java
  20. +1 −0 src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java
  21. +1 −1 src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java
  22. +1 −1 src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java
  23. +0 −1 src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java
  24. +0 −1 src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java
  25. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java
  26. +3 −3 src/main/java/vazkii/botania/common/block/tile/TileAltar.java
  27. +3 −3 src/main/java/vazkii/botania/common/block/tile/TileAvatar.java
  28. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileBifrost.java
  29. +3 −3 src/main/java/vazkii/botania/common/block/tile/TileBrewery.java
  30. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileCocoon.java
  31. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java
  32. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java
  33. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileForestEye.java
  34. +3 −3 src/main/java/vazkii/botania/common/block/tile/TileHourglass.java
  35. +3 −3 src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java
  36. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java
  37. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java
  38. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java
  39. +3 −3 src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java
  40. +2 −2 src/main/java/vazkii/botania/common/block/tile/TilePylon.java
  41. +3 −3 src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java
  42. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java
  43. +1 −1 src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java
  44. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java
  45. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java
  46. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java
  47. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileStarfield.java
  48. +5 −4 src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java
  49. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java
  50. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java
  51. +2 −2 src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java
  52. +3 −3 src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java
  53. +1 −1 src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java
  54. +3 −3 src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java
  55. +1 −1 src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java
  56. +2 −2 src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java
  57. +2 −2 src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java
  58. +5 −3 src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java
  59. +2 −2 src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java
  60. +1 −1 src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java
  61. +2 −2 src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java
  62. +2 −2 src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java
  63. +3 −3 src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java
  64. +2 −2 src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java
  65. +2 −2 src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java
  66. +5 −5 src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java
  67. +2 −2 src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java
  68. +1 −1 src/main/java/vazkii/botania/common/core/command/CommandShare.java
  69. +3 −2 src/main/java/vazkii/botania/common/core/handler/AliasHandler.java
  70. +3 −3 src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java
  71. +2 −2 src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java
  72. +2 −1 src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java
  73. +2 −1 src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java
  74. +3 −3 src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java
  75. +1 −1 src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java
  76. +1 −1 src/main/java/vazkii/botania/common/item/ItemBottledMana.java
  77. +3 −3 src/main/java/vazkii/botania/common/item/ItemTwigWand.java
  78. +1 −1 src/main/java/vazkii/botania/common/item/ItemWorldSeed.java
  79. +2 −1 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java
  80. +2 −2 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java
  81. +0 −17 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java
  82. +2 −3 src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java
  83. +1 −1 src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java
  84. +2 −2 src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java
  85. +4 −3 src/main/java/vazkii/botania/common/item/lens/LensInfluence.java
  86. +2 −2 src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java
  87. +2 −2 src/main/java/vazkii/botania/common/item/relic/ItemRelic.java
Binary file not shown.
View
@@ -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'
View
@@ -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
@@ -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<ICorporeaSpark> sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1)));
- return sparks.isEmpty() ? null : sparks.get(0);
+ List<Entity> 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));
}
/**
@@ -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);
@@ -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;
@@ -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;
}
@@ -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;
}
@@ -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);
@@ -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;
@@ -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));
}
@@ -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
@@ -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;
}
@@ -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<Entity> 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<Entity>) entities)) {
TileLightRelay relay = relays.get(world.rand.nextInt(relays.size()));
relay.mountEntity(entity);
}
@@ -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;
}
@@ -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));
@@ -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
@@ -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;
}
@@ -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;
@@ -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;
@@ -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;
}
@@ -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;
}
@@ -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;
@@ -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;
@@ -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),
@@ -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;
}
Oops, something went wrong.

0 comments on commit b8a1a9c

Please sign in to comment.