From c75abe2562d0b326819a68f17ef0ddba77ff92a2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 Dec 2019 21:44:27 -0600 Subject: [PATCH] Make explicit whether true or effective position of a special flower is used. Fixes #3071 and other issues when flowers are spoofed --- .../api/subtile/TileEntitySpecialFlower.java | 19 +++++++++++++++---- .../common/block/subtile/SubTileManastar.java | 4 ++-- .../block/subtile/SubTilePureDaisy.java | 14 +++++++------- .../functional/BergamuteEventHandler.java | 2 +- .../functional/SubTileAgricarnation.java | 8 ++++---- .../subtile/functional/SubTileBellethorn.java | 4 ++-- .../subtile/functional/SubTileBergamute.java | 5 ++--- .../subtile/functional/SubTileBubbell.java | 6 +++--- .../subtile/functional/SubTileClayconia.java | 4 ++-- .../subtile/functional/SubTileDaffomill.java | 16 ++++++++-------- .../subtile/functional/SubTileExoflame.java | 6 +++--- .../functional/SubTileFallenKanade.java | 4 ++-- .../functional/SubTileHeiseiDream.java | 4 ++-- .../subtile/functional/SubTileHopperhock.java | 4 ++-- .../subtile/functional/SubTileHyacidus.java | 4 ++-- .../functional/SubTileJadedAmaranthus.java | 8 ++++---- .../subtile/functional/SubTileLoonuim.java | 8 ++++---- .../functional/SubTileMarimorphosis.java | 6 +++--- .../subtile/functional/SubTileMedumone.java | 4 ++-- .../subtile/functional/SubTileOrechid.java | 6 +++--- .../functional/SubTilePollidisiac.java | 6 +++--- .../functional/SubTileRannuncarpus.java | 8 ++++---- .../subtile/functional/SubTileSolegnolia.java | 6 ++---- .../functional/SubTileSpectranthemum.java | 6 +++--- .../functional/SubTileTangleberrie.java | 8 ++++---- .../subtile/functional/SubTileTigerseye.java | 4 ++-- .../subtile/functional/SubTileVinculotus.java | 9 +++++---- .../subtile/generating/SubTileArcaneRose.java | 6 +++--- .../generating/SubTileDandelifeon.java | 6 +++--- .../subtile/generating/SubTileEndoflame.java | 12 ++++++------ .../generating/SubTileEntropinnyum.java | 4 ++-- .../generating/SubTileGourmaryllis.java | 12 ++++++------ .../generating/SubTileHydroangeas.java | 16 ++++++++-------- .../subtile/generating/SubTileKekimurus.java | 6 +++--- .../subtile/generating/SubTileMunchdew.java | 4 ++-- .../subtile/generating/SubTileNarslimmus.java | 4 ++-- .../subtile/generating/SubTileRafflowsia.java | 4 ++-- .../subtile/generating/SubTileShulkMeNot.java | 4 ++-- .../subtile/generating/SubTileSpectrolus.java | 6 +++--- .../subtile/generating/SubTileThermalily.java | 4 ++-- 40 files changed, 140 insertions(+), 131 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 9db3ff23a..c55e330b8 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -82,6 +82,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile public boolean overgrowth = false; /** true if this flower is working on Enchanted Soil and this is the second tick **/ public boolean overgrowthBoost = false; + private BlockPos positionOverride; public static final String TAG_TICKS_EXISTED = "ticksExisted"; private static final String TAG_FLOATING_DATA = "floating"; @@ -96,13 +97,15 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile if(tileBelow instanceof TileRedStringRelay) { BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding(); if(coords != null) { - BlockPos currPos = pos; - setPos(coords); + positionOverride = coords; tickFlower(); - setPos(currPos); return; + } else { + positionOverride = null; } + } else { + positionOverride = null; } boolean special = isOnSpecialSoil(); @@ -141,7 +144,15 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile } } - public void tickFlower() { + /** + * @return Where this flower's effects are centered at. This can differ from the true TE location due to + * red string spoofers. + */ + public final BlockPos getEffectivePos() { + return positionOverride != null ? positionOverride : getPos(); + } + + protected void tickFlower() { ticksExisted++; // todo 1.14 this isn't being markDirtied, but do we even want to keep this field around? } diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index d03bfb5aa..a216ded72 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -44,12 +44,12 @@ public class SubTileManastar extends TileEntitySpecialFlower { float r = state == INCREASING ? 0.05F : 1F; float b = state == INCREASING ? 1F : 0.05F; WispParticleData data = WispParticleData.wisp((float) Math.random() / 7, r, 0.05F, b, 1); - world.addParticle(data, getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0, (float) Math.random() / 50, 0); + world.addParticle(data, getEffectivePos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getEffectivePos().getY() + 0.75 + Math.random() * 0.2 - 0.1, getEffectivePos().getZ() + 0.5, 0, (float) Math.random() / 50, 0); } } else { int mana = 0; for(Direction dir : MathHelper.HORIZONTALS) { - BlockPos pos = getPos().offset(dir); + BlockPos pos = getEffectivePos().offset(dir); if(getWorld().isBlockLoaded(pos)) { TileEntity tile = getWorld().getTileEntity(pos); if(tile instanceof IManaPool) diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 56a352915..471f42d96 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -66,10 +66,10 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { if(getWorld().isRemote) { for (int i = 0; i < POSITIONS.length; i++) { if ((activePositions >>> i & 1) > 0) { - BlockPos coords = getPos().add(POSITIONS[i]); - SparkleParticleData data = SparkleParticleData.sparkle((float) Math.random(), 1F, 1F, 1F, 5); - world.addParticle(data, coords.getX() + Math.random(), coords.getY() + Math.random(), coords.getZ() + Math.random(), 0, 0, 0); - } + BlockPos coords = getEffectivePos().add(POSITIONS[i]); + SparkleParticleData data = SparkleParticleData.sparkle((float) Math.random(), 1F, 1F, 1F, 5); + world.addParticle(data, coords.getX() + Math.random(), coords.getY() + Math.random(), coords.getZ() + Math.random(), 0, 0, 0); + } } return; @@ -80,7 +80,7 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { positionAt = 0; BlockPos acoords = POSITIONS[positionAt]; - BlockPos coords = getPos().add(acoords); + BlockPos coords = getEffectivePos().add(acoords); World world = getWorld(); if(!world.isAirBlock(coords)) { world.getProfiler().startSection("findRecipe"); @@ -138,7 +138,7 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { case UPDATE_ACTIVE_EVENT: activePositions = param; return true; case RECIPE_COMPLETE_EVENT: { if (getWorld().isRemote) { - BlockPos coords = getPos().add(POSITIONS[param]); + BlockPos coords = getEffectivePos().add(POSITIONS[param]); for(int i = 0; i < 25; i++) { double x = coords.getX() + Math.random(); double y = coords.getY() + Math.random() + 0.5; @@ -157,7 +157,7 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), 1); + return new RadiusDescriptor.Square(getEffectivePos(), 1); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index f27548988..f17621b26 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -46,7 +46,7 @@ public class BergamuteEventHandler { if (RAND.nextBoolean()) { Color color = TilePool.PARTICLE_COLOR; - BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getEffectivePos().getX() + 0.3 + Math.random() * 0.5, berg.getEffectivePos().getY() + 0.5 + Math.random() * 0.5, berg.getEffectivePos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } } } 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 38a670f99..040cdebb8 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 @@ -56,11 +56,11 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower { if(ticksExisted % 6 == 0 && redstoneSignal == 0) { int range = getRange(); - int x = getPos().getX() + getWorld().rand.nextInt(range * 2 + 1) - range; - int z = getPos().getZ() + getWorld().rand.nextInt(range * 2 + 1) - range; + int x = getEffectivePos().getX() + getWorld().rand.nextInt(range * 2 + 1) - range; + int z = getEffectivePos().getZ() + getWorld().rand.nextInt(range * 2 + 1) - range; for(int i = 4; i > -2; i--) { - int y = getPos().getY() + i; + int y = getEffectivePos().getY() + i; BlockPos pos = new BlockPos(x, y, z); if(getWorld().isAirBlock(pos)) continue; @@ -112,7 +112,7 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), getRange()); + return new RadiusDescriptor.Square(getEffectivePos(), getRange()); } public static class Mini extends SubTileAgricarnation { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 85da54d3f..2eebb6d08 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -64,7 +64,7 @@ public class SubTileBellethorn extends TileEntityFunctionalFlower { if(ticksExisted % 5 == 0) { int range = getRange(); - List entities = getWorld().getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getPos().add(-range, -range, -range), getPos().add(range + 1, range + 1, range + 1)), getSelector()::test); + List entities = getWorld().getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getEffectivePos().add(-range, -range, -range), getEffectivePos().add(range + 1, range + 1, range + 1)), getSelector()); for(LivingEntity entity : entities) { if(entity.hurtTime == 0 && getMana() >= manaToUse) { @@ -99,7 +99,7 @@ public class SubTileBellethorn extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), getRange()); + return new RadiusDescriptor.Square(getEffectivePos(), getRange()); } public static class Mini extends SubTileBellethorn { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index 1e98d71e9..32c6ac11b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -36,8 +36,7 @@ public class SubTileBergamute extends TileEntityFunctionalFlower { protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) - .filter(f -> f.getWorld().getTileEntity(f.getPos()) == f) - .filter(f -> f.getDistanceSq(x, y, z) <= RANGE * RANGE) + .filter(f -> f.getEffectivePos().distanceSq(x, y, z, false) <= RANGE * RANGE) .findAny().orElse(null); } @@ -58,7 +57,7 @@ public class SubTileBergamute extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(getPos(), RANGE); + return new RadiusDescriptor.Circle(getEffectivePos(), RANGE); } } 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 e7715780c..a19f53dc1 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 @@ -60,8 +60,8 @@ public class SubTileBubbell extends TileEntityFunctionalFlower { if(ticksExisted % 10 == 0 && range < getRange()) range++; - for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-range, -range, -range), getPos().add(range, range, range))) { - if(getPos().distanceSq(pos) < range * range) { + for(BlockPos pos : BlockPos.getAllInBoxMutable(getEffectivePos().add(-range, -range, -range), getEffectivePos().add(range, range, range))) { + if(getEffectivePos().distanceSq(pos) < range * range) { BlockState state = getWorld().getBlockState(pos); if(state.getMaterial() == Material.WATER) { getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2); @@ -110,7 +110,7 @@ public class SubTileBubbell extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(getPos(), range); + return new RadiusDescriptor.Circle(getEffectivePos(), range); } public static class Mini extends SubTileBubbell { 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 83295a1ba..d68775d9f 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 @@ -73,7 +73,7 @@ public class SubTileClayconia extends TileEntityFunctionalFlower { for(int i = -range; i < range + 1; i++) for(int j = -rangeY; j < rangeY + 1; j++) for(int k = -range; k < range + 1; k++) { - BlockPos pos = getPos().add(i, j, k); + BlockPos pos = getEffectivePos().add(i, j, k); Block block = getWorld().getBlockState(pos).getBlock(); if(block == Blocks.SAND) possibleCoords.add(pos); @@ -86,7 +86,7 @@ public class SubTileClayconia extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), getRange()); + return new RadiusDescriptor.Square(getEffectivePos(), getRange()); } public int getRange() { 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 dcca5fa92..f1f80ccf9 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 @@ -53,9 +53,9 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { super.tickFlower(); if(getWorld().rand.nextInt(4) == 0) { - WispParticleData data = WispParticleData.wisp(0.25F + (float) Math.random() * 0.15F, 0.05F, 0.05F, 0.05F); - world.addParticle(data, getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F); - } + WispParticleData data = WispParticleData.wisp(0.25F + (float) Math.random() * 0.15F, 0.05F, 0.05F, 0.05F); + world.addParticle(data, getEffectivePos().getX() + Math.random(), getEffectivePos().getY() + Math.random(), getEffectivePos().getZ() + Math.random(), orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F); + } if(windTicks == 0 && getMana() > 0) { windTicks = 20; @@ -84,9 +84,9 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { } private AxisAlignedBB aabbForOrientation() { - int x = getPos().getX(); - int y = getPos().getY(); - int z = getPos().getZ(); + int x = getEffectivePos().getX(); + int y = getEffectivePos().getY(); + int z = getEffectivePos().getZ(); int w = 2; int h = 3; int l = 16; @@ -139,8 +139,8 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { AxisAlignedBB aabb = aabbForOrientation(); - aabb = new AxisAlignedBB(aabb.minX, getPos().getY(), aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ); - return new RadiusDescriptor.Rectangle(getPos(), aabb); + aabb = new AxisAlignedBB(aabb.minX, getEffectivePos().getY(), aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ); + return new RadiusDescriptor.Rectangle(getEffectivePos(), aabb); } @Override 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 c28043806..8597b2a3d 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 @@ -42,8 +42,8 @@ public class SubTileExoflame extends TileEntityFunctionalFlower { boolean did = false; - for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-RANGE, -RANGE_Y, -RANGE), - getPos().add(RANGE, RANGE_Y, RANGE))) { + for(BlockPos pos : BlockPos.getAllInBoxMutable(getEffectivePos().add(-RANGE, -RANGE_Y, -RANGE), + getEffectivePos().add(RANGE, RANGE_Y, RANGE))) { TileEntity tile = getWorld().getTileEntity(pos); if(tile != null) { LazyOptional cap = tile.getCapability(BotaniaAPI.EXOFLAME_HEATABLE_CAP); @@ -73,7 +73,7 @@ public class SubTileExoflame extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override 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 31d49bbe9..d54b97db2 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 @@ -40,7 +40,7 @@ public class SubTileFallenKanade extends TileEntityFunctionalFlower { if(!getWorld().isRemote && !(getWorld().getDimension() instanceof EndDimension)) { boolean did = false; - List players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(PlayerEntity player : players) { if(player.getActivePotionEffect(Effects.REGENERATION) == null && getMana() >= COST) { player.addPotionEffect(new EffectInstance(Effects.REGENERATION, 59, 2, true, true)); @@ -55,7 +55,7 @@ public class SubTileFallenKanade extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override 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 8d0da9435..0f35472f2 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 @@ -45,7 +45,7 @@ public class SubTileHeiseiDream extends TileEntityFunctionalFlower { return; @SuppressWarnings("unchecked") - List mobs = (List) getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); + List mobs = (List) getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1 && getMana() >= COST) for(IMob mob : mobs) { @@ -93,7 +93,7 @@ public class SubTileHeiseiDream extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override 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 cb0170bb0..4823e4cd6 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 @@ -76,7 +76,7 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { boolean pulledAny = false; int range = getRange(); - BlockPos pos = getPos(); + BlockPos pos = getEffectivePos(); List items = getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); int slowdown = getSlowdownFactor(); @@ -212,7 +212,7 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), getRange()); + return new RadiusDescriptor.Square(getEffectivePos(), getRange()); } public int getRange() { 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 a2d1632d6..603a049e9 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 @@ -42,7 +42,7 @@ public class SubTileHyacidus extends TileEntityFunctionalFlower { if(getWorld().isRemote || redstoneSignal > 0) return; - List entities = getWorld().getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List entities = getWorld().getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(LivingEntity entity : entities) { if(!(entity instanceof PlayerEntity) && entity.getActivePotionEffect(Effects.POISON) == null && getMana() >= COST && !entity.world.isRemote && entity.getCreatureAttribute() != CreatureAttribute.UNDEAD) { entity.addPotionEffect(new EffectInstance(Effects.POISON, 60, 0)); @@ -68,7 +68,7 @@ public class SubTileHyacidus extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } } \ No newline at end of file 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 3b073ff48..f83c970a2 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 @@ -43,9 +43,9 @@ public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower { if(ticksExisted % 30 == 0 && getMana() >= COST) { BlockPos pos = new BlockPos( - getPos().getX() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1), - getPos().getY() + RANGE, - getPos().getZ() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1) + getEffectivePos().getX() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1), + getEffectivePos().getY() + RANGE, + getEffectivePos().getZ() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1) ); BlockPos up = pos.up(); @@ -82,7 +82,7 @@ public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override 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 8a206c479..d944f8fac 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 @@ -91,9 +91,9 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { } while(stack.isEmpty() || ModTags.Items.LOONIUM_BLACKLIST.contains(stack.getItem())); int bound = RANGE * 2 + 1; - int xp = getPos().getX() - RANGE + rand.nextInt(bound); - int yp = getPos().getY(); - int zp = getPos().getZ() - RANGE + rand.nextInt(bound); + int xp = getEffectivePos().getX() - RANGE + rand.nextInt(bound); + int yp = getEffectivePos().getY(); + int zp = getEffectivePos().getZ() - RANGE + rand.nextInt(bound); BlockPos pos = new BlockPos(xp, yp - 1, zp); do { @@ -177,7 +177,7 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override 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 416c08052..dce827ae8 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 @@ -119,8 +119,8 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower { int rangeY = getRangeY(); BlockStateMatcher matcher = BlockStateMatcher.forBlock(Blocks.STONE); - for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-range, -rangeY, -range), - getPos().add(range, rangeY, range))) { + for(BlockPos pos : BlockPos.getAllInBoxMutable(getEffectivePos().add(-range, -rangeY, -range), + getEffectivePos().add(range, rangeY, range))) { BlockState state = getWorld().getBlockState(pos); if(state.getBlock().isReplaceableOreGen(state, getWorld(), pos, matcher)) possibleCoords.add(pos.toImmutable()); @@ -133,7 +133,7 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), getRange()); + return new RadiusDescriptor.Square(getEffectivePos(), getRange()); } public int getRange() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index b8ed9a789..19efcd080 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -38,7 +38,7 @@ public class SubTileMedumone extends TileEntityFunctionalFlower { super.tickFlower(); if(!getWorld().isRemote && getMana() > 0) { - List entities = getWorld().getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List entities = getWorld().getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(LivingEntity entity : entities) if(!(entity instanceof PlayerEntity)) { @@ -57,7 +57,7 @@ public class SubTileMedumone extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override 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 c6c1d7f15..f0b7c01c1 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 @@ -106,8 +106,8 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { private BlockPos getCoordsToPut() { List possibleCoords = new ArrayList<>(); - for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-RANGE, -RANGE_Y, -RANGE), - getPos().add(RANGE, RANGE_Y, RANGE))) { + for(BlockPos pos : BlockPos.getAllInBoxMutable(getEffectivePos().add(-RANGE, -RANGE_Y, -RANGE), + getEffectivePos().add(RANGE, RANGE_Y, RANGE))) { BlockState state = getWorld().getBlockState(pos); if(state.getBlock().isReplaceableOreGen(state, getWorld(), pos, getReplaceMatcher())) possibleCoords.add(pos.toImmutable()); @@ -140,7 +140,7 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @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 c2adb0a6e..2b5252ccc 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 @@ -39,8 +39,8 @@ public class SubTilePollidisiac extends TileEntityFunctionalFlower { if(!getWorld().isRemote) { - List items = getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); - List animals = getWorld().getEntitiesWithinAABB(AnimalEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List animals = getWorld().getEntitiesWithinAABB(AnimalEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(AnimalEntity animal : animals) { @@ -68,7 +68,7 @@ public class SubTilePollidisiac extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override 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 f267c01f7..0fc47df2d 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 @@ -76,7 +76,7 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { return; if(ticksExisted % 10 == 0) { - List items = getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE_Y, -RANGE), getEffectivePos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); List validPositions = getCandidatePositions(); int slowdown = getSlowdownFactor(); @@ -116,13 +116,13 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { } public BlockState getUnderlyingBlock() { - return getWorld().getBlockState(getPos().down(isFloating() ? 1 : 2)); + return getWorld().getBlockState(getEffectivePos().down(isFloating() ? 1 : 2)); } private List getCandidatePositions() { int rangePlace = getRange(); int rangePlaceY = getRangeY(); - BlockPos pos = getPos(); + BlockPos pos = getEffectivePos(); BlockState filter = getUnderlyingBlock(); List ret = new ArrayList<>(); @@ -168,7 +168,7 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), getRange()); + return new RadiusDescriptor.Square(getEffectivePos(), getRange()); } public int getRange() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 983f7a9cb..c1f57753e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -56,9 +56,7 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) .filter(f -> f.getWorld() == e.world) - .filter(f -> f.getWorld().getTileEntity(f.getPos()) == f) - .filter(f -> f.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange()) - .findAny().isPresent(); + .anyMatch(f -> f.getEffectivePos().distanceSq(e.posX, e.posY, e.posZ, false) <= f.getRange() * f.getRange()); } @Override @@ -77,7 +75,7 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(getPos(), getRange()); + return new RadiusDescriptor.Circle(getEffectivePos(), getRange()); } public static class Mini extends SubTileSolegnolia { 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 e1d4863e5..d01bef1f7 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 @@ -59,7 +59,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower { super.tickFlower(); if(!getWorld().isRemote && redstoneSignal == 0 && getWorld().isBlockLoaded(bindPos)) { - BlockPos pos = getPos(); + BlockPos pos = getEffectivePos(); boolean did = false; @@ -100,7 +100,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override @@ -140,7 +140,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower { public boolean bindTo(PlayerEntity player, ItemStack wand, BlockPos pos, Direction side) { boolean bound = super.bindTo(player, wand, pos, side); - if(!bound && !pos.equals(bindPos) && pos.distanceSq(getPos()) <= BIND_RANGE * BIND_RANGE && !pos.equals(getPos())) { + if(!bound && !pos.equals(bindPos) && pos.distanceSq(getEffectivePos()) <= BIND_RANGE * BIND_RANGE && !pos.equals(getEffectivePos())) { bindPos = pos; sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 5232e7c7d..63f30eb84 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -41,9 +41,9 @@ public class SubTileTangleberrie extends TileEntityFunctionalFlower { super.tickFlower(); if(getMana() > 0) { - double x1 = getPos().getX() + 0.5; - double y1 = getPos().getY() + 0.5; - double z1 = getPos().getZ() + 0.5; + double x1 = getEffectivePos().getX() + 0.5; + double y1 = getEffectivePos().getY() + 0.5; + double z1 = getEffectivePos().getZ() + 0.5; double maxDist = getMaxDistance(); double range = getRange(); @@ -91,7 +91,7 @@ public class SubTileTangleberrie extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(getPos(), getRange()); + return new RadiusDescriptor.Circle(getEffectivePos(), getRange()); } @Override 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 210bf27a5..9267c6335 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 @@ -49,7 +49,7 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { boolean shouldAfffect = getMana() >= COST; - List entities = getWorld().getEntitiesWithinAABB(MobEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); + List entities = getWorld().getEntitiesWithinAABB(MobEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE_Y, -RANGE), getEffectivePos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); for(MobEntity entity : entities) { List entries = new ArrayList<>(entity.goalSelector.goals); @@ -93,7 +93,7 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @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 ff11a7e08..5c75fc4f2 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 @@ -36,6 +36,7 @@ public class SubTileVinculotus extends TileEntityFunctionalFlower { // Must store position since red string spoofers are only active during tick // But our main logic runs outside, in the event handler + // TODO not needed anymore with addition of getEffectivePos? public static final Map existingFlowers = new WeakHashMap<>(); private static final int RANGE = 64; @@ -49,14 +50,14 @@ public class SubTileVinculotus extends TileEntityFunctionalFlower { if(!getWorld().isRemote) { BlockPos pos = existingFlowers.get(this); - if (pos == null || !pos.equals(getPos())) - existingFlowers.put(this, getPos()); + if (pos == null || !pos.equals(getEffectivePos())) + existingFlowers.put(this, getEffectivePos()); } } @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(getPos(), RANGE); + return new RadiusDescriptor.Circle(getEffectivePos(), RANGE); } @Override @@ -84,7 +85,7 @@ public class SubTileVinculotus extends TileEntityFunctionalFlower { SubTileVinculotus flower = e.getKey(); BlockPos activePos = e.getValue(); - if(flower == null || flower.redstoneSignal > 0 || flower.getMana() <= cost || flower.getWorld() != event.getEntityLiving().world || flower.getWorld().getTileEntity(flower.getPos()) != flower) + if(flower == null || flower.redstoneSignal > 0 || flower.getMana() <= cost || flower.getWorld() != event.getEntityLiving().world || flower.getWorld().getTileEntity(flower.getEffectivePos()) != flower) continue; double x = activePos.getX() + 0.5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index e00ed9364..b62f5e216 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -39,7 +39,7 @@ public class SubTileArcaneRose extends TileEntityGeneratingFlower { if(getMana() >= getMaxMana()) return; - List players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(PlayerEntity player : players) if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { ExperienceHelper.drainPlayerXP(player, 1); @@ -47,7 +47,7 @@ public class SubTileArcaneRose extends TileEntityGeneratingFlower { return; } - List orbs = getWorld().getEntitiesWithinAABB(ExperienceOrbEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List orbs = getWorld().getEntitiesWithinAABB(ExperienceOrbEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(ExperienceOrbEntity orb : orbs) { if (orb.isAlive()) { addMana(orb.getXpValue() * 35); @@ -60,7 +60,7 @@ public class SubTileArcaneRose extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index a47df0a2a..725c79354 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -95,7 +95,7 @@ public class SubTileDandelifeon extends TileEntityGeneratingFlower { } } - BlockPos pos = getPos(); + BlockPos pos = getEffectivePos(); for(int[] change : changes) { BlockPos pos_ = pos.add(-RANGE + change[0], 0, -RANGE + change[1]); @@ -113,7 +113,7 @@ public class SubTileDandelifeon extends TileEntityGeneratingFlower { int diam = RANGE * 2 + 1; int[][] table = new int[diam][diam]; - BlockPos pos = getPos(); + BlockPos pos = getEffectivePos(); for(int i = 0; i < diam; i++) for(int j = 0; j < diam; j++) { @@ -192,7 +192,7 @@ public class SubTileDandelifeon extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index b899297ca..61f83995b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -52,8 +52,8 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower { if(getWorld().isRemote) { if(burnTime > 0 && getWorld().rand.nextInt(10) == 0) { - Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.7, 0.4); - getWorld().addParticle(ParticleTypes.FLAME, getPos().getX() + offset.x + Math.random() * 0.2, getPos().getY() + offset.y, getPos().getZ() + offset.z + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); + Vec3d offset = getWorld().getBlockState(getEffectivePos()).getOffset(getWorld(), getEffectivePos()).add(0.4, 0.7, 0.4); + getWorld().addParticle(ParticleTypes.FLAME, getEffectivePos().getX() + offset.x + Math.random() * 0.2, getEffectivePos().getY() + offset.y, getEffectivePos().getZ() + offset.z + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); } return; } @@ -63,7 +63,7 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower { if(getMana() < getMaxMana()) { int slowdown = getSlowdownFactor(); - for(ItemEntity item : getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)))) { + for(ItemEntity item : getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1)))) { if(item.age >= 59 + slowdown && !item.removed) { ItemStack stack = item.getItem(); if(stack.isEmpty() || stack.getItem().hasContainerItem(stack)) @@ -74,8 +74,8 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower { this.burnTime = Math.min(FUEL_CAP, burnTime) / 2; stack.shrink(1); - getWorld().playSound(null, getPos(), ModSounds.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); - getWorld().addBlockEvent(getPos(), getWorld().getBlockState(getPos()).getBlock(), START_BURN_EVENT, item.getEntityId()); + getWorld().playSound(null, getEffectivePos(), ModSounds.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); + getWorld().addBlockEvent(getPos(), getBlockState().getBlock(), START_BURN_EVENT, item.getEntityId()); sync(); return; @@ -118,7 +118,7 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index bb198b5a7..58ad51103 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -41,7 +41,7 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower { super.tickFlower(); if(!getWorld().isRemote && getMana() == 0) { - List tnts = getWorld().getEntitiesWithinAABB(TNTEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List tnts = getWorld().getEntitiesWithinAABB(TNTEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(TNTEntity tnt : tnts) { if(tnt.getFuse() == 1 && !tnt.removed && !getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) { tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (getWorld().rand.nextFloat() - getWorld().rand.nextFloat()) * 0.2F) * 0.7F); @@ -87,7 +87,7 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 019669502..7b1760849 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -65,20 +65,20 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower { digestingMana = 0; float burpPitch = 1 - (lastFoodCount - 1) * 0.05F; - getWorld().playSound(null, getPos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, burpPitch); + getWorld().playSound(null, getEffectivePos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, burpPitch); sync(); } else if(cooldown % munchInterval == 0) { - getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 0.5f, 1); + getWorld().playSound(null, getEffectivePos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 0.5f, 1); - Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.6, 0.4); + Vec3d offset = getWorld().getBlockState(getEffectivePos()).getOffset(getWorld(), getEffectivePos()).add(0.4, 0.6, 0.4); - ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, lastFood), getPos().getX()+offset.x, getPos().getY()+offset.y, getPos().getZ()+offset.z, 10, 0.1D, 0.1D, 0.1D, 0.03D); + ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, lastFood), getEffectivePos().getX()+offset.x, getEffectivePos().getY()+offset.y, getEffectivePos().getZ()+offset.z, 10, 0.1D, 0.1D, 0.1D, 0.03D); } } int slowdown = getSlowdownFactor(); - List items = getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(ItemEntity item : items) { ItemStack stack = item.getItem(); @@ -127,7 +127,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index e5e6a0214..df84e92bf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -64,9 +64,9 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { if(cooldown > 0) { cooldown--; for(int i = 0; i < 3; i++) { - WispParticleData data = WispParticleData.wisp((float) Math.random() / 6, 0.1F, 0.1F, 0.1F, 1); - world.addParticle(data, getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0, (float) Math.random() / 30, 0); - } + WispParticleData data = WispParticleData.wisp((float) Math.random() / 6, 0.1F, 0.1F, 0.1F, 1); + world.addParticle(data, getEffectivePos().getX() + 0.5 + Math.random() * 0.2 - 0.1, getEffectivePos().getY() + 0.5 + Math.random() * 0.2 - 0.1, getEffectivePos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0, (float) Math.random() / 30, 0); + } } if(burnTime == 0) { @@ -75,7 +75,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { Collections.shuffle(offsets); for(BlockPos offset : offsets) { - BlockPos pos = getPos().add(offset); + BlockPos pos = getEffectivePos().add(offset); IFluidState fstate = getWorld().getFluidState(pos); Tag search = getMaterialToSearchFor(); @@ -118,7 +118,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { public void doBurnParticles() { WispParticleData data = WispParticleData.wisp((float) Math.random() / 6, 0.05F, 0.05F, 0.7F, 1); - world.addParticle(data, getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0, (float) Math.random() / 60, 0); + world.addParticle(data, getEffectivePos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getEffectivePos().getY() + 0.55 + Math.random() * 0.2 - 0.1, getEffectivePos().getZ() + 0.5, 0, (float) Math.random() / 60, 0); } public Tag getMaterialToSearchFor() { @@ -130,7 +130,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { } public void playSound() { - getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_DRINK, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); + getWorld().playSound(null, getEffectivePos(), SoundEvents.ENTITY_GENERIC_DRINK, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); } public int getBurnTime() { @@ -139,7 +139,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), 1); + return new RadiusDescriptor.Square(getEffectivePos(), 1); } @Override @@ -174,7 +174,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = getWorld().getBiome(getPos()).getPrecipitation() == Biome.RainType.RAIN && (getWorld().isRaining() || getWorld().isThundering()); + boolean rain = getWorld().getBiome(getEffectivePos()).getPrecipitation() == Biome.RainType.RAIN && (getWorld().isRaining() || getWorld().isThundering()); return rain ? 2 : 3; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index 4a7dd9465..93ba2f9b9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -45,7 +45,7 @@ public class SubTileKekimurus extends TileEntityGeneratingFlower { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { - BlockPos pos = getPos().add(i - RANGE, j - RANGE, k - RANGE); + BlockPos pos = getEffectivePos().add(i - RANGE, j - RANGE, k - RANGE); BlockState state = getWorld().getBlockState(pos); Block block = state.getBlock(); if(block instanceof CakeBlock) { @@ -55,7 +55,7 @@ public class SubTileKekimurus extends TileEntityGeneratingFlower { else getWorld().setBlockState(pos, state.with(CakeBlock.BITES, nextSlicesEaten), 1 | 2); getWorld().playEvent(2001, pos, Block.getStateId(state)); - getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F); + getWorld().playSound(null, getEffectivePos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F); addMana(mana); sync(); return; @@ -66,7 +66,7 @@ public class SubTileKekimurus extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index 04959b8d7..e47fc1558 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -68,7 +68,7 @@ public class SubTileMunchdew extends TileEntityGeneratingFlower { eatLeaves : { if(getMaxMana() - getMana() >= manaPerLeaf && ticksExisted % 4 == 0) { List coords = new ArrayList<>(); - BlockPos pos = getPos(); + BlockPos pos = getEffectivePos(); nextCoord: for(BlockPos pos_ : BlockPos.getAllInBoxMutable(pos.add(-RANGE, 0, -RANGE), @@ -109,7 +109,7 @@ public class SubTileMunchdew extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index d63023e6f..a3e3c6b15 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -49,7 +49,7 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower { super.tickFlower(); if(ticksExisted % 5 == 0) { - List slimes = getWorld().getEntitiesWithinAABB(SlimeEntity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List slimes = getWorld().getEntitiesWithinAABB(SlimeEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(SlimeEntity slime : slimes) { if(slime.getPersistentData().getBoolean(TAG_WORLD_SPAWNED) && slime.isAlive()) { int size = slime.getSlimeSize(); @@ -78,7 +78,7 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index 430f0153c..da3114361 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -58,7 +58,7 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { - BlockPos pos = getPos().add(i - RANGE, j - RANGE, k - RANGE); + BlockPos pos = getEffectivePos().add(i - RANGE, j - RANGE, k - RANGE); BlockState state = getWorld().getBlockState(pos); if(state.isIn(ModTags.Blocks.SPECIAL_FLOWERS) && state.getBlock() != ModSubtiles.rafflowsia) { @@ -101,7 +101,7 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java index fd343b416..69aec7318 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java @@ -38,7 +38,7 @@ public class SubTileShulkMeNot extends TileEntityGeneratingFlower { int generate = getMaxMana(); World world = getWorld(); - BlockPos pos = getPos(); + BlockPos pos = getEffectivePos(); Vec3d posD = new Vec3d(pos.getX(), pos.getY(), pos.getZ()); List shulkers = world.getEntitiesWithinAABB(ShulkerEntity.class, new AxisAlignedBB(pos).grow(RADIUS)); if(!world.isRemote) @@ -84,7 +84,7 @@ public class SubTileShulkMeNot extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(getPos(), RADIUS); + return new RadiusDescriptor.Circle(getEffectivePos(), RADIUS); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 731395d60..8d4d88b41 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -67,9 +67,9 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { return; // sheep need to enter the actual block space - List targets = getWorld().getEntitiesWithinAABB(SheepEntity.class, new AxisAlignedBB(getPos()), Entity::isAlive); + List targets = getWorld().getEntitiesWithinAABB(SheepEntity.class, new AxisAlignedBB(getEffectivePos()), Entity::isAlive); - AxisAlignedBB itemAABB = new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)); + AxisAlignedBB itemAABB = new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1)); int slowdown = getSlowdownFactor(); Predicate selector = e -> (e instanceof ItemEntity && e.isAlive() && ((ItemEntity) e).age >= slowdown); targets.addAll(getWorld().getEntitiesWithinAABB(Entity.class, itemAABB, selector)); @@ -115,7 +115,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(getPos(), RANGE); + return new RadiusDescriptor.Square(getEffectivePos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index c9a168d85..82e68ab67 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -36,7 +36,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void doBurnParticles() { WispParticleData data = WispParticleData.wisp((float) Math.random() / 6, 0.7F, 0.05F, 0.05F, 1); - world.addParticle(data, getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0, (float) Math.random() / 60, 0); + world.addParticle(data, getEffectivePos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getEffectivePos().getY() + 0.9 + Math.random() * 0.2 - 0.1, getEffectivePos().getZ() + 0.5, 0, (float) Math.random() / 60, 0); } @Override @@ -46,7 +46,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void playSound() { - getWorld().playSound(null, getPos(), ModSounds.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); + getWorld().playSound(null, getEffectivePos(), ModSounds.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); } @Override