From 162460371501637e2cb3488937620f3c128fbc23 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Feb 2019 00:02:43 -0600 Subject: [PATCH] A pass through functional flowers --- .../functional/SubTileAgricarnation.java | 5 +++-- .../subtile/functional/SubTileBubbell.java | 4 ++-- .../subtile/functional/SubTileClayconia.java | 2 +- .../subtile/functional/SubTileDaffomill.java | 10 ++++----- .../subtile/functional/SubTileExoflame.java | 11 +++++----- .../functional/SubTileFallenKanade.java | 3 ++- .../functional/SubTileHeiseiDream.java | 1 - .../subtile/functional/SubTileHopperhock.java | 22 ++++++++----------- .../subtile/functional/SubTileHyacidus.java | 4 ++-- .../functional/SubTileJadedAmaranthus.java | 4 ++-- .../subtile/functional/SubTileLoonuim.java | 12 +++++----- .../functional/SubTileMarimorphosis.java | 5 ++--- .../subtile/functional/SubTileOrechid.java | 2 +- .../functional/SubTileOrechidIgnem.java | 2 +- .../functional/SubTilePollidisiac.java | 2 +- .../functional/SubTileRannuncarpus.java | 8 ++----- .../functional/SubTileSpectranthemum.java | 20 +++++++++-------- .../subtile/functional/SubTileVinculotus.java | 2 +- 18 files changed, 56 insertions(+), 63 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index 474bd66f5..c450e4995 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -18,6 +18,7 @@ import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; +import net.minecraft.tags.BlockTags; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; @@ -56,7 +57,7 @@ public class SubTileAgricarnation extends SubTileFunctional { if(isPlant(pos) && mana > 5) { Block block = supertile.getWorld().getBlockState(pos).getBlock(); mana -= 5; - supertile.getWorld().scheduleUpdate(pos, block, 1); + supertile.getWorld().getPendingBlockTicks().scheduleTick(pos, block, 1); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playEvent(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); supertile.getWorld().playSound(null, x, y, z, ModSounds.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); @@ -75,7 +76,7 @@ public class SubTileAgricarnation extends SubTileFunctional { private boolean isPlant(BlockPos pos) { IBlockState state = supertile.getWorld().getBlockState(pos); Block block = state.getBlock(); - if(block == Blocks.GRASS || block == Blocks.LEAVES || block == Blocks.LEAVES2 || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) + if(block == Blocks.GRASS || BlockTags.LEAVES.contains(block) || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) return false; Material mat = state.getMaterial(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index ca4c0cc48..70a90df7a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -78,13 +78,13 @@ public class SubTileBubbell extends SubTileFunctional { @Override public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); - cmp.setInteger(TAG_RANGE, range); + cmp.setInt(TAG_RANGE, range); } @Override public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); - range = cmp.getInteger(TAG_RANGE); + range = cmp.getInt(TAG_RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 4cb98f651..dbad61360 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -42,7 +42,7 @@ public class SubTileClayconia extends SubTileFunctional { if(mana >= COST) { BlockPos coords = getCoordsToPut(); if(coords != null) { - supertile.getWorld().setBlockToAir(coords); + supertile.getWorld().removeBlock(coords); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playEvent(2001, coords, Block.getStateId(Blocks.SAND.getDefaultState())); EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.CLAY_BALL)); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 8cb36a7bf..15f658851 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -55,7 +55,7 @@ public class SubTileDaffomill extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(!item.isDead && item.age >= slowdown) { + if(item.isAlive() && item.age >= slowdown) { item.motionX += orientation.getXOffset() * 0.05; item.motionY += orientation.getYOffset() * 0.05; item.motionZ += orientation.getZOffset() * 0.05; @@ -146,16 +146,16 @@ public class SubTileDaffomill extends SubTileFunctional { public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); - cmp.setInteger(TAG_ORIENTATION, orientation.getIndex() - 2); // retain compat with 1.7 saves - cmp.setInteger(TAG_WIND_TICKS, windTicks); + cmp.setInt(TAG_ORIENTATION, orientation.getIndex()); + cmp.setInt(TAG_WIND_TICKS, windTicks); } @Override public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); - orientation = EnumFacing.byIndex(cmp.getInteger(TAG_ORIENTATION) + 2); // retain compat with 1.7 saves - windTicks = cmp.getInteger(TAG_WIND_TICKS); + orientation = EnumFacing.byIndex(cmp.getInt(TAG_ORIENTATION)); + windTicks = cmp.getInt(TAG_WIND_TICKS); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index d8319b180..9d588ac1b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -11,13 +11,12 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; -import net.minecraft.block.BlockFurnace; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.common.crafting.VanillaRecipeTypes; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -43,13 +42,13 @@ public class SubTileExoflame extends SubTileFunctional { TileEntity tile = supertile.getWorld().getTileEntity(pos); Block block = supertile.getWorld().getBlockState(pos).getBlock(); if(tile != null) { - if(tile instanceof TileEntityFurnace && (block == Blocks.FURNACE || block == Blocks.LIT_FURNACE)) { + if(tile instanceof TileEntityFurnace && block == Blocks.FURNACE) { TileEntityFurnace furnace = (TileEntityFurnace) tile; boolean canSmelt = canFurnaceSmelt(furnace); if(canSmelt && mana > 2) { if(furnace.getField(0) < 2) { // Field 0 -> Burn time - if(furnace.getField(0) == 0) - BlockFurnace.setState(true, supertile.getWorld(), pos); + /*if(furnace.getField(0) == 0) todo 1.13 check if necessary now + BlockFurnace.setState(true, supertile.getWorld(), pos);*/ furnace.setField(0, 200); mana = Math.max(0, mana - COST); } @@ -88,7 +87,7 @@ public class SubTileExoflame extends SubTileFunctional { if(furnace.getStackInSlot(0).isEmpty()) return false; else { - ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(furnace.getStackInSlot(0)); + ItemStack itemstack = furnace.getWorld().getRecipeManager().getResult(furnace, furnace.getWorld(), VanillaRecipeTypes.SMELTING);; if(itemstack.isEmpty()) return false; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index ee1499d60..ccfb09b67 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.dimension.EndDimension; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -30,7 +31,7 @@ public class SubTileFallenKanade extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(!supertile.getWorld().isRemote && supertile.getWorld().provider.getDimension() != 1) { + if(!supertile.getWorld().isRemote && !(supertile.getWorld().getDimension() instanceof EndDimension)) { boolean did = false; List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityPlayer player : players) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 8311383e5..39a8b5722 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -21,7 +21,6 @@ import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; import net.minecraft.entity.monster.IMob; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index e438227b4..dbca761c0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -68,7 +68,7 @@ public class SubTileHopperhock extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.age < 60 + slowdown || item.age >= 105 && item.age < 110 || item.isDead || item.getItem().isEmpty()) + if(item.age < 60 + slowdown || item.age >= 105 && item.age < 110 || !item.isAlive() || item.getItem().isEmpty()) continue; ItemStack stack = item.getItem(); @@ -76,7 +76,7 @@ public class SubTileHopperhock extends SubTileFunctional { boolean priorityInv = false; int amountToPutIn = 0; - for(EnumFacing dir : EnumFacing.VALUES) { + for(EnumFacing dir : EnumFacing.BY_INDEX) { BlockPos pos_ = pos.offset(dir); InvWithLocation inv = InventoryHelper.getInventoryWithLocation(supertile.getWorld(), pos_, dir); @@ -104,9 +104,9 @@ public class SubTileHopperhock extends SubTileFunctional { } } - if(invToPutItemIn != null && !item.isDead) { + if(invToPutItemIn != null && item.isAlive()) { SubTileSpectranthemum.spawnExplosionParticles(item, 3); - ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false); + ItemHandlerHelper.insertItem(invToPutItemIn, stack.split(amountToPutIn), false); item.setItem(stack); // Just in case someone subclasses EntityItem and changes something important. pulledAny = true; } @@ -132,13 +132,9 @@ public class SubTileHopperhock extends SubTileFunctional { anyFilter = true; boolean itemEqual = stack.getItem() == filterEntry.getItem(); - boolean damageEqual = stack.getItemDamage() == filterEntry.getItemDamage(); boolean nbtEqual = ItemStack.areItemStackTagsEqual(filterEntry, stack); - if(itemEqual && damageEqual && nbtEqual) - return true; - - if(!stack.getHasSubtypes() && stack.isItemStackDamageable() && stack.getMaxStackSize() == 1 && itemEqual && nbtEqual) + if(itemEqual && nbtEqual) return true; if(stack.getItem() instanceof IManaItem && itemEqual) @@ -160,14 +156,14 @@ public class SubTileHopperhock extends SubTileFunctional { Block chest = supertile.getWorld().getBlockState(pos).getBlock(); if(tileEntity instanceof TileEntityChest) - for(EnumFacing dir : EnumFacing.HORIZONTALS) + for(EnumFacing dir : EnumFacing.BY_HORIZONTAL_INDEX) if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) { filter.addAll(getFilterForInventory(pos.offset(dir), false)); break; } } - for(EnumFacing dir : EnumFacing.HORIZONTALS) { + for(EnumFacing dir : EnumFacing.BY_HORIZONTAL_INDEX) { AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1)); List frames = supertile.getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb); for(EntityItemFrame frame : frames) { @@ -211,14 +207,14 @@ public class SubTileHopperhock extends SubTileFunctional { public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); - cmp.setInteger(TAG_FILTER_TYPE, filterType); + cmp.setInt(TAG_FILTER_TYPE, filterType); } @Override public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); - filterType = cmp.getInteger(TAG_FILTER_TYPE); + filterType = cmp.getInt(TAG_FILTER_TYPE); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 16d903fef..03a19e4b8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -10,8 +10,8 @@ */ package vazkii.botania.common.block.subtile.functional; +import net.minecraft.entity.CreatureAttribute; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; @@ -38,7 +38,7 @@ public class SubTileHyacidus extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityLivingBase entity : entities) { - if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.POISON) == null && mana >= cost && !entity.world.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { + if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.POISON) == null && mana >= cost && !entity.world.isRemote && entity.getCreatureAttribute() != CreatureAttribute.UNDEAD) { entity.addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); mana -= cost; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index cc52bfff1..27d992aef 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -48,8 +48,8 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { IBlockState stateAbove = supertile.getWorld().getBlockState(up); Block blockAbove = stateAbove.getBlock(); if((supertile.getWorld().isAirBlock(up) || blockAbove.isReplaceable(supertile.getWorld(), up)) && stateAbove.getMaterial() != Material.WATER && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), up)) { - EnumDyeColor color = EnumDyeColor.byMetadata(supertile.getWorld().rand.nextInt(16)); - IBlockState state = ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color); + EnumDyeColor color = EnumDyeColor.byId(supertile.getWorld().rand.nextInt(16)); + IBlockState state = ModBlocks.flower.getDefaultState().with(BotaniaStateProps.COLOR, color); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playEvent(2001, up, Block.getStateId(state)); supertile.getWorld().setBlockState(up, state, 1 | 2); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 308d4329f..9ccd5c0f6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -36,9 +36,9 @@ import net.minecraft.world.WorldServer; import net.minecraft.world.storage.loot.LootContext; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -70,7 +70,7 @@ public class SubTileLoonuim extends SubTileFunctional { ItemStack stack; do { - List stacks = world.getLootTableManager().getLootTableFromLocation(lootTable).generateLootForPools(rand, new LootContext.Builder((WorldServer) world).build()); + List stacks = ((WorldServer) world).getServer().getLootTableManager().getLootTableFromLocation(lootTable).generateLootForPools(rand, new LootContext.Builder((WorldServer) world).build()); if (stacks.isEmpty()) return; else { @@ -133,10 +133,10 @@ public class SubTileLoonuim extends SubTileFunctional { entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, entity instanceof EntityCreeper ? 100 : Integer.MAX_VALUE, 0)); entity.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, entity instanceof EntityCreeper ? 100 : Integer.MAX_VALUE, 0)); - NBTTagCompound cmp = stack.writeToNBT(new NBTTagCompound()); + NBTTagCompound cmp = stack.write(new NBTTagCompound()); entity.getEntityData().setTag(TAG_ITEMSTACK_TO_DROP, cmp); - entity.onInitialSpawn(world.getDifficultyForLocation(pos), null); + entity.onInitialSpawn(world.getDifficultyForLocation(pos), null, null); world.spawnEntity(entity); entity.spawnExplosionParticle(); @@ -188,7 +188,7 @@ public class SubTileLoonuim extends SubTileFunctional { EntityLivingBase e = event.getEntityLiving(); if(e.getEntityData().hasKey(TAG_ITEMSTACK_TO_DROP)) { NBTTagCompound cmp = e.getEntityData().getCompoundTag(TAG_ITEMSTACK_TO_DROP); - ItemStack stack = new ItemStack(cmp); + ItemStack stack = ItemStack.read(cmp); event.getDrops().clear(); event.getDrops().add(new EntityItem(e.world, e.posX, e.posY, e.posZ, stack)); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index 5dd841ee0..4faab419a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import gnu.trove.list.array.TIntArrayList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -76,7 +75,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { public IBlockState getStoneToPut(BlockPos coords) { Set types = BiomeDictionary.getTypes(supertile.getWorld().getBiome(coords)); - TIntArrayList values = new TIntArrayList(); + List values = new ArrayList<>(); for(int i = 0; i < TYPES.length; i++) { int times = 1; if(types.contains(TYPES[i])) @@ -88,7 +87,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { int meta = values.get(supertile.getWorld().rand.nextInt(values.size())); BiomeStoneVariant variant = BiomeStoneVariant.values()[meta]; - return ModFluffBlocks.biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant); + return ModFluffBlocks.biomeStoneA.getDefaultState().with(BotaniaStateProps.BIOMESTONE_VARIANT, variant); } private BlockPos getCoordsToPut() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index bc58e9a12..228973e2e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -127,7 +127,7 @@ public class SubTileOrechid extends SubTileFunctional { } public Predicate getReplaceMatcher() { - return state -> state.getBlock() == Blocks.STONE && state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.STONE; + return state -> state.getBlock() == Blocks.STONE; } public int getCost() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index 44dc29868..fc772e8c5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -26,7 +26,7 @@ public class SubTileOrechidIgnem extends SubTileOrechid { @Override public boolean canOperate() { - return supertile.getWorld().provider.isNether(); + return supertile.getWorld().getDimension().isNether(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index c889bd0a2..837e20350 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -44,7 +44,7 @@ public class SubTilePollidisiac extends SubTileFunctional { if(animal.getGrowingAge() == 0 && !animal.isInLove()) { for(EntityItem item : items) { - if(item.age < 60 + slowdown || item.isDead) + if(item.age < 60 + slowdown || !item.isAlive()) continue; ItemStack stack = item.getItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 95d683043..15612b15e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -80,12 +80,12 @@ public class SubTileRannuncarpus extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.age < 60 + slowdown || item.isDead || item.getItem().isEmpty()) + if(item.age < 60 + slowdown || !item.isAlive() || item.getItem().isEmpty()) continue; ItemStack stack = item.getItem(); Item stackItem = stack.getItem(); - if(stackItem instanceof ItemBlock || stackItem instanceof ItemBlockSpecial || stackItem instanceof ItemRedstone || stackItem instanceof IFlowerPlaceable) { + if(stackItem instanceof ItemBlock || stackItem instanceof IFlowerPlaceable) { if(!scanned) { for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-rangePlace, -rangePlaceY, -rangePlace), pos.add(rangePlace, rangePlaceY, rangePlace))) { IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); @@ -115,10 +115,6 @@ public class SubTileRannuncarpus extends SubTileFunctional { stateToPlace = ((ItemBlock) stackItem).getBlock().getStateFromMeta(blockMeta); } - else if(stackItem instanceof ItemBlockSpecial) - stateToPlace = ((ItemBlockSpecial) stackItem).getBlock().getDefaultState(); - else if(stackItem instanceof ItemRedstone) - stateToPlace = Blocks.REDSTONE_WIRE.getDefaultState(); if(stateToPlace != null) { if(stateToPlace.getBlock().canPlaceBlockAt(supertile.getWorld(), coords)) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 84cc23554..fa78539f0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -20,6 +20,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconEntry; @@ -59,7 +61,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.age < 60 + slowdown || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) + if(item.age < 60 + slowdown || !item.isAlive() || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; ItemStack stack = item.getItem(); @@ -98,18 +100,18 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); - cmp.setInteger(TAG_BIND_X, bindPos.getX()); - cmp.setInteger(TAG_BIND_Y, bindPos.getY()); - cmp.setInteger(TAG_BIND_Z, bindPos.getZ()); + cmp.setInt(TAG_BIND_X, bindPos.getX()); + cmp.setInt(TAG_BIND_Y, bindPos.getY()); + cmp.setInt(TAG_BIND_Z, bindPos.getZ()); } @Override public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); bindPos = new BlockPos( - cmp.getInteger(TAG_BIND_X), - cmp.getInteger(TAG_BIND_Y), - cmp.getInteger(TAG_BIND_Z) + cmp.getInt(TAG_BIND_X), + cmp.getInt(TAG_BIND_Y), + cmp.getInt(TAG_BIND_Z) ); } @@ -143,9 +145,9 @@ public class SubTileSpectranthemum extends SubTileFunctional { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public BlockPos getBinding() { - return Minecraft.getMinecraft().player.isSneaking() && bindPos.getY() != -1 ? bindPos : super.getBinding(); + return Minecraft.getInstance().player.isSneaking() && bindPos.getY() != -1 ? bindPos : super.getBinding(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 521862367..0a9d61111 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -13,8 +13,8 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.monster.EntityEnderman; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional;