From fc1dd61c53d220b4a2a5b025f4f33dac82974c18 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 29 Jun 2019 14:54:39 -0700 Subject: [PATCH] Another pass through --- .../api/subtile/TileEntitySpecialFlower.java | 4 +- .../botania/common/block/BlockAltGrass.java | 7 ++-- .../botania/common/block/BlockAltar.java | 11 ++---- .../common/block/BlockAnimatedTorch.java | 5 --- .../botania/common/block/BlockAvatar.java | 5 --- .../common/block/BlockBifrostPerm.java | 5 --- .../botania/common/block/BlockCamo.java | 5 --- .../botania/common/block/BlockCocoon.java | 5 --- .../common/block/BlockCraftyCrate.java | 6 +-- .../botania/common/block/BlockFakeAir.java | 2 +- .../botania/common/block/BlockFelPumpkin.java | 3 +- .../block/BlockFloatingSpecialFlower.java | 2 +- .../botania/common/block/BlockForestEye.java | 5 --- .../botania/common/block/BlockHourglass.java | 5 --- .../common/block/BlockIncensePlate.java | 2 +- .../common/block/BlockLightLauncher.java | 7 +--- .../botania/common/block/BlockLightRelay.java | 7 +--- .../botania/common/block/BlockManaBomb.java | 2 +- .../common/block/BlockModDoubleFlower.java | 2 +- .../botania/common/block/BlockModFlower.java | 9 ++++- .../common/block/BlockPistonRelay.java | 14 +++---- .../botania/common/block/BlockPlatform.java | 20 +++++++--- .../botania/common/block/BlockPylon.java | 5 --- .../common/block/BlockSparkChanger.java | 7 +--- .../common/block/BlockTeruTeruBozu.java | 5 --- .../botania/common/block/BlockTinyPlanet.java | 5 --- .../botania/common/block/ModSubtiles.java | 2 +- .../corporea/BlockCorporeaCrystalCube.java | 5 --- .../block/corporea/BlockCorporeaFunnel.java | 2 +- .../block/corporea/BlockCorporeaIndex.java | 5 --- .../block/corporea/BlockCorporeaRetainer.java | 2 +- .../block/decor/BlockFloatingFlower.java | 5 --- .../common/block/decor/BlockManaFlame.java | 5 --- .../common/block/decor/BlockManaGlass.java | 5 --- .../common/block/decor/BlockStarfield.java | 5 --- .../common/block/decor/BlockTinyPotato.java | 5 --- .../block/decor/walls/BlockModWall.java | 5 --- .../common/block/mana/BlockBellows.java | 5 --- .../common/block/mana/BlockBrewery.java | 5 --- .../common/block/mana/BlockDistributor.java | 5 --- .../common/block/mana/BlockForestDrum.java | 30 +++++++-------- .../common/block/mana/BlockManaDetector.java | 13 +++++-- .../botania/common/block/mana/BlockPrism.java | 5 --- .../botania/common/block/mana/BlockPump.java | 5 --- .../common/block/mana/BlockRuneAltar.java | 5 --- .../common/block/mana/BlockSpawnerClaw.java | 5 --- .../common/block/mana/BlockSpreader.java | 5 --- .../common/block/mana/BlockTerraPlate.java | 5 --- .../block/string/BlockRedStringDispenser.java | 2 +- .../functional/SubTileHeiseiDream.java | 10 ++--- .../subtile/functional/SubTileTigerseye.java | 16 ++++---- .../botania/common/block/tile/TileAltar.java | 2 +- .../common/block/tile/TileEnderEye.java | 3 +- .../common/brew/potion/PotionAllure.java | 6 +-- .../common/brew/potion/PotionBloodthirst.java | 13 ++++--- .../common/brew/potion/PotionClear.java | 3 +- .../common/brew/potion/PotionEmptiness.java | 9 +++-- .../common/brew/potion/PotionFeatherfeet.java | 4 +- .../botania/common/brew/potion/PotionMod.java | 8 ++-- .../common/brew/potion/PotionSoulCross.java | 4 +- .../common/core/handler/EquipmentHandler.java | 8 ++-- .../common/core/handler/SleepingHandler.java | 11 ++++-- .../botania/common/core/loot/BindUuid.java | 8 ++-- .../common/entity/EntityDoppleganger.java | 3 +- .../common/entity/EntityThrownItem.java | 37 ++++++------------- .../resources/META-INF/accesstransformer.cfg | 30 ++++++++------- 66 files changed, 170 insertions(+), 296 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index e07f3520d..8c0169ebe 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -184,7 +184,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile IFloatingFlower.IslandType oldType = floatingData.getIslandType(); super.onDataPacket(net, packet); if(oldType != floatingData.getIslandType() && isFloating()) { - world.markBlockRangeForRenderUpdate(pos, pos); + world.markForRerender(pos); } } @@ -232,7 +232,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile /** * Called when a player right clicks this sub tile. */ - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { return false; } + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, double hitX, double hitY, double hitZ) { return false; } /** * Called when this sub tile is added to the world. diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 99436119a..279b6fa7b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -28,6 +28,7 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.PlantType; import net.minecraftforge.common.ToolType; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -64,7 +65,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack held = player.getHeldItem(hand); if(held.getItem() instanceof HoeItem && world.isAirBlock(pos.up())) { - held.damageItem(1, player); + held.damageItem(1, player, e -> e.sendBreakAnimation(hand)); world.setBlockState(pos, Blocks.FARMLAND.getDefaultState(), 1 | 2); return true; } @@ -93,8 +94,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public boolean canSustainPlant(@Nonnull BlockState state, @Nonnull IBlockReader world, BlockPos pos, @Nonnull Direction direction, IPlantable plantable) { - EnumPlantType type = plantable.getPlantType(world, pos.down()); - return type == EnumPlantType.Plains || type == EnumPlantType.Beach || plantable instanceof StemBlock; + PlantType type = plantable.getPlantType(world, pos.down()); + return type == PlantType.Plains || type == PlantType.Beach || plantable instanceof StemBlock; } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index d8c72aef9..5d61aa6a6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -143,7 +143,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { tile.setWater(true); world.updateComparatorOutputLevel(pos, this); - world.checkLight(pos); + world.getChunkProvider().getLightManager().checkBlock(pos); } return true; @@ -154,7 +154,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { tile.setLava(true); tile.setWater(false); world.updateComparatorOutputLevel(pos, this); - world.checkLight(pos); + world.getChunkProvider().getLightManager().checkBlock(pos); return true; } else if(!stack.isEmpty() && stack.getItem() == Items.BUCKET && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { @@ -170,7 +170,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { tile.setLava(false); else tile.setWater(false); world.updateComparatorOutputLevel(pos, this); - world.checkLight(pos); + world.getChunkProvider().getLightManager().checkBlock(pos); return true; } @@ -218,11 +218,6 @@ public class BlockAltar extends BlockMod implements ILexiconable { .orElse(stack); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 63050e1f6..2b11512ed 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -115,11 +115,6 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 7911295ed..df4655587 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -96,11 +96,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getPlacementHorizontalFacing().getOpposite()); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 3de6c25ff..0c0ca565f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -36,11 +36,6 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { super(builder); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @OnlyIn(Dist.CLIENT) @Override public void animateTick(BlockState state, World world, BlockPos pos, Random rand) { diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index e0470af09..a972fab3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -62,11 +62,6 @@ public abstract class BlockCamo extends BlockMod { return false; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 667cc1b44..233ee4b7c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -50,11 +50,6 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return SHAPE; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java index 982f2372a..0b1514c8f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -62,8 +62,8 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { int xc = mc.mainWindow.getScaledWidth() / 2 + 20; int yc = mc.mainWindow.getScaledHeight() / 2 - height / 2; - AbstractGui.drawRect(xc - 6, yc - 6, xc + width + 6, yc + height + 6, 0x22000000); - AbstractGui.drawRect(xc - 4, yc - 4, xc + width + 4, yc + height + 4, 0x22000000); + AbstractGui.fill(xc - 6, yc - 6, xc + width + 6, yc + height + 6, 0x22000000); + AbstractGui.fill(xc - 4, yc - 4, xc + width + 4, yc + height + 4, 0x22000000); for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) { @@ -75,7 +75,7 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { if(craft.getPattern() != CratePattern.NONE) enabled = craft.getPattern().openSlots.get(index); - AbstractGui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000); + AbstractGui.fill(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000); ItemStack item = craft.getItemHandler().getStackInSlot(index); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index ebe69889e..55b4dfdcb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -45,7 +45,7 @@ public class BlockFakeAir extends AirBlock { } @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { if(shouldRemove(world, pos)) world.getPendingBlockTicks().scheduleTick(pos, this, tickRate(world)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 15fed50ac..95fb09fc1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnReason; import net.minecraft.entity.monster.BlazeEntity; import net.minecraft.entity.player.PlayerEntity; @@ -53,7 +54,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { world.setBlockState(pos, Blocks.AIR.getDefaultState()); world.setBlockState(pos.down(), Blocks.AIR.getDefaultState()); world.setBlockState(pos.down(2), Blocks.AIR.getDefaultState()); - BlazeEntity blaze = new BlazeEntity(world); + BlazeEntity blaze = EntityType.BLAZE.create(world); blaze.setLocationAndAngles(pos.getX() + 0.5D, pos.getY() - 1.95D, pos.getZ() + 0.5D, 0.0F, 0.0F); blaze.deathLootTable = LOOT_TABLE; blaze.onInitialSpawn(world, world.getDifficultyForLocation(pos), SpawnReason.EVENT, null, null); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 909e2b5a8..ce3e606d7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -137,7 +137,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ) || super.onBlockActivated(state, world, pos, player, hand, hit); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, hit.getFace(), hit.getHitVec().x, hit.getHitVec().y, hit.getHitVec().z) || super.onBlockActivated(state, world, pos, player, hand, hit); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 65f027ef8..4aca03042 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -40,11 +40,6 @@ public class BlockForestEye extends BlockMod implements ILexiconable { return SHAPE; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasComparatorInputOverride(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index e996abcaa..05610373a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -127,11 +127,6 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, super.onReplaced(state, world, pos, newState, isMoving); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 08e8b3e25..32d20f226 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -68,7 +68,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } else if(!plateStack.isEmpty() && !plate.burning) { if(!stack.isEmpty() && stack.getItem() == Items.FLINT_AND_STEEL) { plate.ignite(); - stack.damageItem(1, player); + stack.damageItem(1, player, e -> e.sendBreakAnimation(hand)); did = true; } else { ItemHandlerHelper.giveItemToPlayer(player, plateStack); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 52b2eac71..3a5a2dce8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -57,12 +57,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { boolean power = world.getRedstonePowerFromNeighbors(pos) > 0|| world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.get(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index fa7874909..76532f67e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -71,7 +71,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { + public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { if(!worldIn.isRemote && variant == LuminizerVariant.TOGGLE) { if(state.get(BotaniaStateProps.POWERED) && !worldIn.isBlockPowered(pos)) worldIn.setBlockState(pos, state.with(BotaniaStateProps.POWERED, false)); @@ -96,11 +96,6 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable && state.get(BotaniaStateProps.POWERED) ? 15 : 0; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 7ad2c0efc..4d90eb797 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -36,7 +36,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!burst.isFake() && !world.isRemote) { world.playEvent(2001, pos, Block.getStateId(getDefaultState())); - world.removeBlock(pos); + world.removeBlock(pos, false); EntityManaStorm storm = new EntityManaStorm(world); storm.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); world.addEntity(storm); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 0607a546c..1bf83ae9d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -67,7 +67,7 @@ public class BlockModDoubleFlower extends TallFlowerBlock implements ILexiconabl List ret = new ArrayList<>(); ret.add(new ItemStack(this)); BlockPos other = world.getBlockState(pos).get(HALF) == DoubleBlockHalf.UPPER ? pos.down() : pos.up(); - world.removeBlock(pos); + world.removeBlock(pos, false); world.destroyBlock(other, false); return ret; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 6a5932532..2f52d43d6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -23,6 +23,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Effect; +import net.minecraft.potion.Effects; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -50,10 +52,15 @@ import java.util.Random; public class BlockModFlower extends FlowerBlock implements ILexiconable, IGrowable { public final DyeColor color; protected BlockModFlower(DyeColor color, Properties builder) { - super(builder); + super(effectForFlower(color), 4, builder); this.color = color; } + private static Effect effectForFlower(DyeColor color) { + // todo 1.14 + return Effects.REGENERATION; + } + @OnlyIn(Dist.CLIENT) @Override public void animateTick(BlockState state, World world, BlockPos pos, Random rand) { diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 90dc833ad..1fc4a16b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -29,6 +29,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ServerWorld; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.storage.WorldSavedData; @@ -120,7 +121,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl world.playSound(null, pos, ModSounds.ding, SoundCategory.BLOCKS, 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); - world.removeBlock(pos); + world.removeBlock(pos, false); world.playEvent(2001, pos, Block.getStateId(getDefaultState())); } @@ -143,8 +144,8 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl private static final String ID = "PistonRelayPairs"; - public WorldData(String id) { - super(id); + public WorldData() { + super(ID); } @Override @@ -174,12 +175,11 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } public static WorldData get(World world) { - WorldData data = world.getSavedData(DimensionType.OVERWORLD, WorldData::new, ID); - + WorldData data = ((ServerWorld) world).getSavedData().get(WorldData::new, ID); if (data == null) { - data = new WorldData(ID); + data = new WorldData(); data.markDirty(); - world.setSavedData(DimensionType.OVERWORLD, ID, data); + ((ServerWorld) world).getSavedData().set(data); } return data; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index ebe0ee54b..ee53c5778 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -25,6 +25,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader; @@ -66,13 +69,20 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, this.variant = v; } - /* todo 1.13 + @Nonnull @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity, boolean isActualState) { - if(variant == Variant.INFRANGIBLE || variant == Variant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof PlayerEntity) || !par7Entity.isSneaking())) - super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity, isActualState); + public VoxelShape getCollisionShape(@Nonnull BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, ISelectionContext context) { + Entity e = context.getEntity(); + if(variant == Variant.INFRANGIBLE + || variant == Variant.ABSTRUSE + && e != null + && e.posY > pos.getY() + 0.9 + && !context.isSneaking()) { + return super.getCollisionShape(state, world, pos, context); + } else { + return VoxelShapes.empty(); + } } - */ @Override public boolean canRenderInLayer(BlockState state, @Nonnull BlockRenderLayer layer) { diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index ca7b3a1a6..d85d16bca 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -50,11 +50,6 @@ public class BlockPylon extends BlockMod implements ILexiconable { return SHAPE; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 0b0b1a23b..cee69d9d9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -56,12 +56,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.get(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 874644fde..39da27487 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -106,11 +106,6 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return world.isRaining() ? 15 : 0; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index d61f549b0..84e63931c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -41,11 +41,6 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl return AABB; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index c1b363fbd..0b6cbd793 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -212,7 +212,7 @@ public class ModSubtiles { public static void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); Block.Properties props = Block.Properties.from(Blocks.POPPY); - Block.Properties floatProps = Block.Properties.create(Material.GROUND).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15); + Block.Properties floatProps = Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15); for (Pair, ResourceLocation> type : TYPES) { register(r, new BlockSpecialFlower(props, type.getLeft()), type.getValue()); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 2f362fefa..fb1db1c5f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -85,11 +85,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return false; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public TileCorporeaBase createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 3dbc063ce..0a535ae65 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -43,7 +43,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab } @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.get(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 513e05d92..c37107758 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -55,11 +55,6 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl super(builder); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 1e95495b3..cbf52bda5 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -42,7 +42,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable { } @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.get(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 7d8aabe4c..8f7c36a3b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -83,11 +83,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable { Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack stack = player.getHeldItem(hand); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index c54b0312c..a453d8613 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -56,11 +56,6 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { return BlockRenderType.INVISIBLE; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if(Botania.gardenOfGlassLoaded) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 916ec625f..e74e6bfd8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -37,11 +37,6 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { super(builder); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @OnlyIn(Dist.CLIENT) @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 96eec6a17..9f5183af3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -51,11 +51,6 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return BlockRenderLayer.CUTOUT_MIPPED; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index bbf6163f2..cc4e8df2b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -127,11 +127,6 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index cc3b92382..a88c2c32d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -36,11 +36,6 @@ public class BlockModWall extends WallBlock implements ILexiconable { super(props); } - @Override - public boolean canPlaceTorchOnTop(BlockState state, IWorldReader world, BlockPos pos) { - return true; - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { return LexiconData.decorativeBlocks; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index df4485ca1..0277f7fab 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -68,11 +68,6 @@ public class BlockBellows extends BlockMod implements ILexiconable { return true; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 24bad69f6..220d289c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -102,11 +102,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 05a2630d9..401ca6180 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -42,11 +42,6 @@ public class BlockDistributor extends BlockMod implements ILexiconable { return SHAPE; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 6e282a683..2ddae6a1f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -65,11 +65,6 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return SHAPE; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(burst.isFake()) @@ -92,15 +87,17 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, new BlockPos(entity))) { shearables.add(entity); } else if(entity instanceof CowEntity) { - List items = world.getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.posX + entity.width, entity.posY + entity.height, entity.posZ + entity.width)); + List items = world.getEntitiesWithinAABB(ItemEntity.class, entity.getBoundingBox()); for(ItemEntity item : items) { ItemStack itemstack = item.getItem(); if(!itemstack.isEmpty() && itemstack.getItem() == Items.BUCKET && !world.isRemote) { while(itemstack.getCount() > 0) { ItemEntity ent = entity.entityDropItem(new ItemStack(Items.MILK_BUCKET), 1.0F); - ent.motionY += world.rand.nextFloat() * 0.05F; - ent.motionX += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; - ent.motionZ += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; + ent.setMotion(ent.getMotion().add( + world.rand.nextFloat() * 0.05F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F + )); itemstack.shrink(1); } item.remove(); @@ -117,13 +114,14 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona break; List stacks = ((IShearable) entity).onSheared(stack, world, new BlockPos(entity), 0); - if(stacks != null) - for(ItemStack wool : stacks) { - ItemEntity ent = entity.entityDropItem(wool, 1.0F); - ent.motionY += world.rand.nextFloat() * 0.05F; - ent.motionX += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; - ent.motionZ += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; - } + for(ItemStack wool : stacks) { + ItemEntity ent = entity.entityDropItem(wool, 1.0F); + ent.setMotion(ent.getMotion().add( + world.rand.nextFloat() * 0.05F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F + )); + } ++sheared; } } 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 9ac309199..07e5986f0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -18,9 +18,12 @@ import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; +import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaCollisionGhost; @@ -55,9 +58,13 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo @Nonnull @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader worldIn, BlockPos pos) { - // todo 1.13 don't collide if it's a burst - return super.getCollisionShape(state, worldIn, pos); + public VoxelShape getCollisionShape(@Nonnull BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, + ISelectionContext context) { + if(context.getEntity() instanceof IManaBurst) { + return VoxelShapes.empty(); + } else { + return super.getCollisionShape(state, world, pos, context); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 7f1c5ee99..55ad4b66f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -70,11 +70,6 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, return BlockRenderLayer.TRANSLUCENT; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 7aba06fd0..1907bc922 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -64,11 +64,6 @@ public class BlockPump extends BlockMod implements ILexiconable { } } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasComparatorInputOverride(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 9a831747a..28d77b87e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -49,11 +49,6 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable return SHAPE; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if(world.isRemote) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index c1d9380a5..3f5679c31 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -50,11 +50,6 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { list.add(new ItemStack(Blocks.SPAWNER)); } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 6872844fc..2178b3dca 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -94,11 +94,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Nonnull @Override public BlockRenderType getRenderType(BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index c48aa6840..b66bc8dce 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -66,11 +66,6 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { return false; } - @Override - public boolean isFullCube(BlockState state) { - return false; - } - @Override public boolean allowsMovement(@Nonnull BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, PathType type) { return false; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index fd735a0f9..4f4615a85 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -41,7 +41,7 @@ public class BlockRedStringDispenser extends BlockRedString { } @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.get(BotaniaStateProps.POWERED); 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 45202ab3b..77bfc6a56 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 @@ -15,7 +15,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.HurtByTargetGoal; -import net.minecraft.entity.ai.goal.GoalSelector.EntityAITaskEntry; +import net.minecraft.entity.ai.goal.PrioritizedGoal; import net.minecraft.entity.monster.IMob; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; @@ -76,11 +76,11 @@ public class SubTileHeiseiDream extends TileEntityFunctionalFlower { entity.setAttackTarget(null); // Move any EntityAIHurtByTarget to highest priority - for (EntityAITaskEntry entry : entity.targetTasks.taskEntries) { - if (entry.action instanceof HurtByTargetGoal) { + for (PrioritizedGoal entry : entity.targetSelector.goals) { + if (entry.func_220772_j() instanceof HurtByTargetGoal) { // Concurrent modification OK since we break out of the loop - entity.targetTasks.removeTask(entry.action); - entity.targetTasks.addTask(-1, entry.action); + entity.targetSelector.removeGoal(entry.func_220772_j()); + entity.targetSelector.addGoal(-1, entry.func_220772_j()); break; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index bbb231077..fe212e4dc 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -14,8 +14,8 @@ import net.minecraft.entity.MobEntity; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.AvoidEntityGoal; import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; -import net.minecraft.entity.ai.goal.GoalSelector.EntityAITaskEntry; import net.minecraft.entity.ai.goal.AvoidEntityGoal; +import net.minecraft.entity.ai.goal.PrioritizedGoal; import net.minecraft.entity.item.EnderCrystalEntity; import net.minecraft.entity.item.EnderCrystalEntity; import net.minecraft.entity.monster.CreeperEntity; @@ -60,17 +60,17 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { List entities = getWorld().getEntitiesWithinAABB(MobEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); for(MobEntity entity : entities) { - List entries = new ArrayList<>(entity.tasks.taskEntries); - entries.addAll(entity.targetTasks.taskEntries); + List entries = new ArrayList<>(entity.goalSelector.goals); + entries.addAll(entity.targetSelector.goals); boolean avoidsOcelots = false; if(shouldAfffect) - for(EntityAITaskEntry entry : entries) { - if(entry.action instanceof AvoidEntityGoal) - avoidsOcelots = messWithRunAwayAI((AvoidEntityGoal) entry.action) || avoidsOcelots; + for(PrioritizedGoal entry : entries) { + if(entry.func_220772_j() instanceof AvoidEntityGoal) + avoidsOcelots = messWithRunAwayAI((AvoidEntityGoal) entry.func_220772_j()) || avoidsOcelots; - if(entry.action instanceof NearestAttackableTargetGoal) - messWithGetTargetAI((NearestAttackableTargetGoal) entry.action); + if(entry.func_220772_j() instanceof NearestAttackableTargetGoal) + messWithGetTargetAI((NearestAttackableTargetGoal) entry.func_220772_j()); } if(entity instanceof CreeperEntity) { 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 7682fbc5e..eb4a0900a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -236,7 +236,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, if(didAny) { player.world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); ServerPlayerEntity mp = (ServerPlayerEntity) player; - mp.inventoryContainer.detectAndSendChanges(); + mp.container.detectAndSendChanges(); } } 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 5c6121152..9583d35d9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.state.BotaniaStateProps; @@ -51,7 +52,7 @@ public class TileEnderEye extends TileMod implements ITickableTileEntity { if(!helm.isEmpty() && helm.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN)) continue; - RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, true, 64); + RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 64); if(pos.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) pos).getPos().equals(getPos())) { looking = true; break; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java index f20c9df81..8ec3e767c 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -13,6 +13,7 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.FishingBobberEntity; +import net.minecraft.potion.EffectType; import vazkii.botania.common.lib.LibPotionNames; import javax.annotation.Nonnull; @@ -20,8 +21,7 @@ import javax.annotation.Nonnull; public class PotionAllure extends PotionMod { public PotionAllure() { - super(false, 0x0034E4, 5); - setBeneficial(); + super(EffectType.BENEFICIAL, 0x0034E4, 5); } @Override @@ -32,7 +32,7 @@ public class PotionAllure extends PotionMod { @Override public void performEffect(@Nonnull LivingEntity living, int amplified) { if(living instanceof PlayerEntity) { - FishingBobberEntity hook = ((PlayerEntity) living).fishEntity; + FishingBobberEntity hook = ((PlayerEntity) living).fishingBobber; if(hook != null) hook.tick(); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 3d2353081..b546f3b24 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -13,6 +13,7 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.eventbus.api.Event; @@ -27,16 +28,18 @@ public class PotionBloodthirst extends PotionMod { private static final int RANGE = 64; public PotionBloodthirst() { - super(false, 0xC30000, 3); - setBeneficial(); + super(EffectType.BENEFICIAL, 0xC30000, 3); } @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getResult() != Event.Result.ALLOW && event.getEntityLiving() instanceof IMob) { - AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, event.getX() + RANGE, event.getY() + RANGE, event.getZ() + RANGE); - for(PlayerEntity player : event.getWorld().getWorld().playerEntities) { - if(player.isPotionActive(ModPotions.bloodthrst) && !player.isPotionActive(ModPotions.emptiness) && player.getBoundingBox().intersects(aabb)) { + AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, + event.getX() + RANGE, event.getY() + RANGE, event.getZ() + RANGE); + for(PlayerEntity player : event.getWorld().getPlayers()) { + if(player.isPotionActive(ModPotions.bloodthrst) + && !player.isPotionActive(ModPotions.emptiness) + && player.getBoundingBox().intersects(aabb)) { event.setResult(Event.Result.ALLOW); return; } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index 9a440c6fb..b056b4500 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -14,13 +14,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.item.Items; import net.minecraft.item.ItemStack; +import net.minecraft.potion.EffectType; import javax.annotation.Nonnull; public class PotionClear extends PotionMod { public PotionClear() { - super(false, 0xFFFFFF, 0); + super(EffectType.NEUTRAL, 0xFFFFFF, 0); } @Override diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 1cc218da9..6f35cbd32 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -13,6 +13,7 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.eventbus.api.Event; @@ -24,15 +25,15 @@ public class PotionEmptiness extends PotionMod { private static final int RANGE = 128; public PotionEmptiness() { - super(false, 0xFACFFF, 2); - setBeneficial(); + super(EffectType.BENEFICIAL, 0xFACFFF, 2); } @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getResult() != Event.Result.ALLOW && event.getEntityLiving() instanceof IMob) { - AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, event.getX() + RANGE, event.getY() + RANGE, event.getZ() + RANGE); - for(PlayerEntity player : event.getWorld().getWorld().playerEntities) { + AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, + event.getX() + RANGE, event.getY() + RANGE, event.getZ() + RANGE); + for(PlayerEntity player : event.getWorld().getPlayers()) { if(player.isPotionActive(ModPotions.emptiness) && player.getBoundingBox().intersects(aabb)) { event.setResult(Event.Result.DENY); return; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index 26650fb4c..ed6f4bb03 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -12,14 +12,14 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity; +import net.minecraft.potion.EffectType; import javax.annotation.Nonnull; public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { - super(false, 0x26ADFF, 1); - setBeneficial(); + super(EffectType.BENEFICIAL, 0x26ADFF, 1); } @Override diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index eb1914637..a94fdcdb1 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -13,6 +13,7 @@ package vazkii.botania.common.brew.potion; import javafx.geometry.Side; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; +import net.minecraft.client.gui.DisplayEffectsScreen; import net.minecraft.client.renderer.BufferBuilder; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -20,6 +21,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.LivingEntity; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.EffectType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -30,14 +32,14 @@ public class PotionMod extends Effect { private static final ResourceLocation resource = new ResourceLocation(LibResources.GUI_POTIONS); private final int iconIndex; - public PotionMod(boolean badEffect, int color, int iconIndex) { - super(badEffect, color); + public PotionMod(EffectType type, int color, int iconIndex) { + super(type, color); this.iconIndex = iconIndex; } @Override @OnlyIn(Dist.CLIENT) - public void renderInventoryEffect(EffectInstance effect, AbstractGui gui, int x, int y, float z) { + public void renderInventoryEffect(EffectInstance effect, DisplayEffectsScreen gui, int x, int y, float z) { render(x + 6, y + 7, 1); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index ffe4671f5..a578aa1dd 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -13,6 +13,7 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity; +import net.minecraft.potion.EffectType; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -23,8 +24,7 @@ import vazkii.botania.common.lib.LibMisc; public class PotionSoulCross extends PotionMod { public PotionSoulCross() { - super(false, 0x47453d, 0); - setBeneficial(); + super(EffectType.BENEFICIAL, 0x47453d, 0); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java index f5353f773..72574c13b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java @@ -84,7 +84,7 @@ public abstract class EquipmentHandler { if(event.phase != TickEvent.Phase.START || event.player.world.isRemote) return; PlayerEntity player = event.player; - player.world.profiler.startSection("botania:tick_wearables"); + player.world.getProfiler().startSection("botania:tick_wearables"); ItemStack[] oldStacks = map.computeIfAbsent(player, p -> { ItemStack[] array = new ItemStack[9]; @@ -99,11 +99,11 @@ public abstract class EquipmentHandler { if(!ItemStack.areItemStacksEqual(old, current)) { if(old.getItem() instanceof ItemBauble) { - player.getAttributeMap().removeAttributeModifiers(((ItemBauble) old.getItem()).getEquippedAttributeModifiers(old)); + player.getAttributes().removeAttributeModifiers(((ItemBauble) old.getItem()).getEquippedAttributeModifiers(old)); ((ItemBauble) old.getItem()).onUnequipped(old, player); } if(canEquip(current, player)) { - player.getAttributeMap().applyAttributeModifiers(((ItemBauble) current.getItem()).getEquippedAttributeModifiers(current)); + player.getAttributes().applyAttributeModifiers(((ItemBauble) current.getItem()).getEquippedAttributeModifiers(current)); ((ItemBauble) current.getItem()).onEquipped(current, player); } oldStacks[i] = current.copy(); // shift-clicking mutates the stack we stored, @@ -114,7 +114,7 @@ public abstract class EquipmentHandler { ((ItemBauble) current.getItem()).onWornTick(current, player); } } - player.world.profiler.endSection(); + player.world.getProfiler().endSection(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java index 9cb1c7496..f3aedfd0f 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java @@ -2,6 +2,7 @@ package vazkii.botania.common.core.handler; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.world.ServerWorld; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -17,10 +18,12 @@ public final class SleepingHandler { @SubscribeEvent public static void trySleep(PlayerSleepInBedEvent event) { World world = event.getEntityPlayer().world; - for(EntityDoppleganger guardian : world.getEntities(EntityDoppleganger.class, e -> true)) { - if(guardian.getPlayersAround().contains(event.getEntityPlayer())) { - event.setResult(PlayerEntity.SleepResult.NOT_SAFE); - } + boolean nearGuardian = ((ServerWorld) world).getEntities() + .filter(e -> e instanceof EntityDoppleganger) + .anyMatch(e -> ((EntityDoppleganger) e).getPlayersAround().contains(event.getEntityPlayer())); + + if(nearGuardian) { + event.setResult(PlayerEntity.SleepResult.NOT_SAFE); } } } diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java index 07d32a06f..d730adf80 100644 --- a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -3,10 +3,12 @@ package vazkii.botania.common.core.loot; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootFunction; +import net.minecraft.world.storage.loot.LootParameters; import net.minecraft.world.storage.loot.conditions.ILootCondition; import net.minecraft.world.storage.loot.functions.ILootFunction; import vazkii.botania.common.item.ModItems; @@ -25,14 +27,14 @@ public class BindUuid extends LootFunction { @Nonnull @Override public ItemStack doApply(@Nonnull ItemStack stack, @Nonnull LootContext context) { - if (context.getKillerPlayer() != null) { - ((ItemRelic) ModItems.dice).bindToUUID(context.getKillerPlayer().getUniqueID(), stack); + if (context.get(LootParameters.KILLER_ENTITY) instanceof PlayerEntity) { + ((ItemRelic) ModItems.dice).bindToUUID(context.get(LootParameters.KILLER_ENTITY).getUniqueID(), stack); } return stack; } - public static class Serializer extends ILootFunction.Serializer { + public static class Serializer extends LootFunction.Serializer { public Serializer() { super(new ResourceLocation(LibMisc.MOD_ID, "bind_uuid"), BindUuid.class); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index eb38d893b..5b29c2b23 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -38,6 +38,7 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.network.play.server.SRemoveEntityEffectPacket; import net.minecraft.particles.ParticleTypes; import net.minecraft.potion.Effect; +import net.minecraft.potion.EffectType; import net.minecraft.potion.Effects; import net.minecraft.potion.EffectInstance; import net.minecraft.tags.BlockTags; @@ -563,7 +564,7 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti private void clearPotions(PlayerEntity player) { List potionsToRemove = player.getActivePotionEffects().stream() - .filter(effect -> effect.getDuration() < 160 && effect.isAmbient() && !effect.getPotion().isBadEffect()) + .filter(effect -> effect.getDuration() < 160 && effect.isAmbient() && effect.getPotion().type != EffectType.HARMFUL) .map(EffectInstance::getPotion) .distinct() .collect(Collectors.toList()); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index fc601bdaf..e4da116c0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -17,7 +17,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.block.Blocks; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.EntityRayTraceResult; +import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -62,7 +64,8 @@ public class EntityThrownItem extends ItemEntity { Vec3d vec3 = new Vec3d(posX, posY, posZ); Vec3d vec31 = getPositionVec().add(getMotion()); - RayTraceResult ray = world.rayTraceBlocks(vec3, vec31); + RayTraceResult ray = world.rayTraceBlocks(new RayTraceContext(vec3, vec31, + RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, this)); if (!world.isRemote) @@ -96,30 +99,22 @@ public class EntityThrownItem extends ItemEntity { if (ray != null) { - if (ray.getType() == net.minecraft.util.math.RayTraceResult.Type.BLOCK && world.getBlockState(ray.getBlockPos()).getBlock() == Blocks.NETHER_PORTAL) + if (ray.getType() == RayTraceResult.Type.BLOCK + && world.getBlockState(((BlockRayTraceResult) ray).getPos()).getBlock() == Blocks.NETHER_PORTAL) { - setPortal(ray.getBlockPos()); + setPortal(((BlockRayTraceResult) ray).getPos()); } else { - if (ray.type != null) { - ray.entity.attackEntityFrom(DamageSource.MAGIC, 2.0F); + if (ray.getType() == RayTraceResult.Type.ENTITY) { + ((EntityRayTraceResult) ray).getEntity().attackEntityFrom(DamageSource.MAGIC, 2.0F); if (!world.isRemote) { Entity item = getItem().getItem().createEntity(world, this, getItem()); if (item == null) { item = new ItemEntity(world, posX, posY, posZ, getItem()); world.addEntity(item); - item.motionX = motionX*0.25F; - item.motionY = motionY*0.25F; - item.motionZ = motionZ*0.25F; - - } - else - { - item.motionX = motionX*0.25F; - item.motionY = motionY*0.25F; - item.motionZ = motionZ*0.25F; } + item.setMotion(getMotion().scale(0.25)); } remove(); @@ -127,23 +122,15 @@ public class EntityThrownItem extends ItemEntity { } } - Vector3 vec3m = new Vector3(motionX, motionY, motionZ); + Vector3 vec3m = new Vector3(getMotion()); if (vec3m.mag() < 1.0F) { if (!world.isRemote) { Entity item = getItem().getItem().createEntity(world, this, getItem()); if (item == null) { item = new ItemEntity(world, posX, posY, posZ, getItem()); world.addEntity(item); - item.motionX = motionX; - item.motionY = motionY; - item.motionZ = motionZ; - } - else - { - item.motionX = motionX; - item.motionY = motionY; - item.motionZ = motionZ; } + item.setMotion(getMotion()); } remove(); } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 103a6a129..5b4d662cb 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -20,18 +20,18 @@ public net.minecraft.entity.LivingEntity field_184628_bn # activeItemStackUseCou public net.minecraft.entity.passive.horse.AbstractHorseEntity field_110271_bv # JUMP_STRENGTH -public net.minecraft.tileentity.MobSpawnerBaseLogic func_98279_f()Z # isActivated -public net.minecraft.tileentity.MobSpawnerBaseLogic func_98273_j()V # resetTimer -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98290_m # spawnRange -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98294_i # spawnCount -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98292_k # maxNearbyEntities -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98293_h # maxSpawnDelay -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98283_g # minSpawnDelay -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98285_e # potentialSpawns -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98286_b # spawnDelay -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98284_d # prevMobRotation -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98287_c # mobRotation -public net.minecraft.tileentity.MobSpawnerBaseLogic field_98282_f # spawnData +public net.minecraft.world.spawner.AbstractSpawner func_98279_f()Z # isActivated +public net.minecraft.world.spawner.AbstractSpawner func_98273_j()V # resetTimer +public net.minecraft.world.spawner.AbstractSpawner field_98290_m # spawnRange +public net.minecraft.world.spawner.AbstractSpawner field_98294_i # spawnCount +public net.minecraft.world.spawner.AbstractSpawner field_98292_k # maxNearbyEntities +public net.minecraft.world.spawner.AbstractSpawner field_98293_h # maxSpawnDelay +public net.minecraft.world.spawner.AbstractSpawner field_98283_g # minSpawnDelay +public net.minecraft.world.spawner.AbstractSpawner field_98285_e # potentialSpawns +public net.minecraft.world.spawner.AbstractSpawner field_98286_b # spawnDelay +public net.minecraft.world.spawner.AbstractSpawner field_98284_d # prevMobRotation +public net.minecraft.world.spawner.AbstractSpawner field_98287_c # mobRotation +public net.minecraft.world.spawner.AbstractSpawner field_98282_f # spawnData public net.minecraft.client.gui.IngameGui field_92017_k # remainingHighlightTicks @@ -49,4 +49,8 @@ public net.minecraft.item.ItemUseContext (Lnet/minecraft/world/World;Lnet/ public net.minecraft.client.renderer.model.ItemOverrideList field_209582_c # overrideBakedModels -public net.minecraft.item.Item func_219968_a(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/RayTraceContext$FluidMode;)Lnet/minecraft/util/math/RayTraceResult; # rayTrace \ No newline at end of file +public net.minecraft.item.Item func_219968_a(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/RayTraceContext$FluidMode;)Lnet/minecraft/util/math/RayTraceResult; # rayTrace + +public net.minecraft.potion.Effect field_220305_b # type + +public net.minecraft.entity.ai.goal.GoalSelector field_220892_d # goals \ No newline at end of file