From 30bc385a6864f6b61c02549e8bf648cc57a36b46 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Oct 2019 01:40:27 -0500 Subject: [PATCH] small cleanup --- .../botania/api/subtile/TileEntitySpecialFlower.java | 7 ------- .../botania/common/block/subtile/SubTilePureDaisy.java | 2 +- .../block/subtile/functional/SubTileAgricarnation.java | 6 +----- .../block/subtile/functional/SubTileBellethorn.java | 6 +----- .../block/subtile/functional/SubTileBergamute.java | 3 +-- .../common/block/subtile/functional/SubTileBubbell.java | 5 +---- .../block/subtile/functional/SubTileClayconia.java | 5 +---- .../block/subtile/functional/SubTileDaffomill.java | 2 +- .../common/block/subtile/functional/SubTileExoflame.java | 3 +-- .../block/subtile/functional/SubTileFallenKanade.java | 5 +---- .../block/subtile/functional/SubTileHeiseiDream.java | 2 +- .../block/subtile/functional/SubTileHopperhock.java | 9 +-------- .../common/block/subtile/functional/SubTileHyacidus.java | 6 +----- .../block/subtile/functional/SubTileJadedAmaranthus.java | 5 +---- .../common/block/subtile/functional/SubTileLoonuim.java | 2 +- .../block/subtile/functional/SubTileMarimorphosis.java | 5 +---- .../common/block/subtile/functional/SubTileMedumone.java | 6 +----- .../common/block/subtile/functional/SubTileOrechid.java | 5 +---- .../block/subtile/functional/SubTilePollidisiac.java | 5 +---- .../block/subtile/functional/SubTileRannuncarpus.java | 2 +- .../block/subtile/functional/SubTileSolegnolia.java | 3 +-- .../block/subtile/functional/SubTileSpectranthemum.java | 5 +---- .../block/subtile/functional/SubTileTangleberrie.java | 2 +- .../block/subtile/functional/SubTileTigerseye.java | 7 +------ .../block/subtile/functional/SubTileVinculotus.java | 3 +-- .../block/subtile/generating/SubTileArcaneRose.java | 5 +---- .../block/subtile/generating/SubTileDandelifeon.java | 4 +--- .../block/subtile/generating/SubTileEndoflame.java | 8 +------- .../block/subtile/generating/SubTileEntropinnyum.java | 2 +- .../block/subtile/generating/SubTileGourmaryllis.java | 7 +------ .../block/subtile/generating/SubTileHydroangeas.java | 2 +- .../block/subtile/generating/SubTileKekimurus.java | 5 +---- .../common/block/subtile/generating/SubTileMunchdew.java | 4 +--- .../block/subtile/generating/SubTileNarslimmus.java | 4 +--- .../block/subtile/generating/SubTileRafflowsia.java | 2 +- .../block/subtile/generating/SubTileSpectrolus.java | 5 +---- 36 files changed, 35 insertions(+), 124 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index aee42bbe8..5413ad743 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -280,13 +280,6 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile return null; } - /** - * Gets a BlockPos instance with the position of this sub tile. - */ - public BlockPos toBlockPos() { - return getPos(); - } - /** * @see IWandBindable#canSelect(PlayerEntity, ItemStack, net.minecraft.util.math.BlockPos, Direction) */ 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 1313c1cf5..ecc9b99ca 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -159,7 +159,7 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), 1); + return new RadiusDescriptor.Square(getPos(), 1); } @Override 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 a44fcd825..ec92061c5 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 @@ -16,11 +16,8 @@ import net.minecraft.block.Blocks; import net.minecraft.block.BushBlock; import net.minecraft.block.CropsBlock; import net.minecraft.block.SaplingBlock; -import net.minecraft.block.CropsBlock; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.tags.BlockTags; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; @@ -29,7 +26,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; @@ -118,7 +114,7 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), getRange()); + return new RadiusDescriptor.Square(getPos(), getRange()); } @Override 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 c885f5534..c3c5b0f13 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 @@ -12,10 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.WitchEntity; -import net.minecraft.entity.monster.WitchEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.DamageSource; @@ -24,7 +21,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -105,7 +101,7 @@ public class SubTileBellethorn extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), getRange()); + return new RadiusDescriptor.Square(getPos(), getRange()); } @Override 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 4b2be838d..25a47fddb 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 @@ -5,7 +5,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -61,7 +60,7 @@ public class SubTileBergamute extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toBlockPos(), RANGE); + return new RadiusDescriptor.Circle(getPos(), RANGE); } @Override 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 fdde231d7..f8d543d33 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 @@ -12,8 +12,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; @@ -24,7 +22,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -115,7 +112,7 @@ public class SubTileBubbell extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toBlockPos(), range); + return new RadiusDescriptor.Circle(getPos(), range); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 45a8de425..307d580e7 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 @@ -12,18 +12,15 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemEntity; import net.minecraft.block.Blocks; import net.minecraft.item.Items; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -91,7 +88,7 @@ public class SubTileClayconia extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), getRange()); + return new RadiusDescriptor.Square(getPos(), 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 422439f76..5955090ba 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 @@ -142,7 +142,7 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { 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(toBlockPos(), aabb); + return new RadiusDescriptor.Rectangle(getPos(), 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 54bb7716a..c17be28cf 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 @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.AbstractFurnaceTileEntity; @@ -125,7 +124,7 @@ public class SubTileExoflame extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 b03ce47f2..20d1033f3 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 @@ -11,8 +11,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.Effects; import net.minecraft.potion.Effects; import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntityType; @@ -22,7 +20,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -60,7 +57,7 @@ public class SubTileFallenKanade extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 574d343c1..5dd68c7c4 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 @@ -96,7 +96,7 @@ public class SubTileHeiseiDream extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 9ff88dbbe..374d09f31 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 @@ -16,19 +16,13 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemFrameEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemFrameEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ChestTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.ChestTileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; @@ -42,7 +36,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -216,7 +209,7 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), getRange()); + return new RadiusDescriptor.Square(getPos(), 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 231c88f4e..7f9ecae5e 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 @@ -13,18 +13,14 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.CreatureAttribute; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -75,7 +71,7 @@ public class SubTileHyacidus extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), RANGE); } @Override 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 7a7f2c621..dcdbb49d8 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 @@ -13,8 +13,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.item.DyeColor; import net.minecraft.item.DyeColor; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; @@ -23,7 +21,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -88,7 +85,7 @@ public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 380b4d259..31f3c1483 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 @@ -184,7 +184,7 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 6baf3dfba..a409ede82 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 @@ -12,8 +12,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; -import net.minecraft.block.pattern.BlockStateMatcher; import net.minecraft.block.pattern.BlockStateMatcher; import net.minecraft.block.Blocks; import net.minecraft.tileentity.TileEntityType; @@ -25,7 +23,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -138,7 +135,7 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), getRange()); + return new RadiusDescriptor.Square(getPos(), 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 136e5eed8..efe82ea1b 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 @@ -11,19 +11,15 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -63,7 +59,7 @@ public class SubTileMedumone extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 03cd89300..39bc16db9 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 @@ -12,8 +12,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.Blocks; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; @@ -28,7 +26,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; @@ -138,7 +135,7 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 56e36fa9c..3e0c1a475 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 @@ -11,8 +11,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; @@ -21,7 +19,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -74,7 +71,7 @@ public class SubTilePollidisiac extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 b894a4339..28312b31f 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 @@ -170,7 +170,7 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), getRange()); + return new RadiusDescriptor.Square(getPos(), 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 54e23a86e..e7846d4a2 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 @@ -17,7 +17,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -80,7 +79,7 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toBlockPos(), getRange()); + return new RadiusDescriptor.Circle(getPos(), getRange()); } @Override 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 43f5be2ed..d1f38c4d8 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 @@ -17,10 +17,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -31,7 +29,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; @@ -105,7 +102,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), RANGE); } @Override 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 7b1a0a37d..c1395347d 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 @@ -93,7 +93,7 @@ public class SubTileTangleberrie extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toBlockPos(), getRange()); + return new RadiusDescriptor.Circle(getPos(), 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 32b27f672..d04d74470 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 @@ -10,25 +10,20 @@ */ package vazkii.botania.common.block.subtile.functional; -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.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; import net.minecraft.entity.passive.OcelotEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -101,7 +96,7 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 6362d12f2..be50992b0 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 @@ -22,7 +22,6 @@ import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -59,7 +58,7 @@ public class SubTileVinculotus extends TileEntityFunctionalFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toBlockPos(), RANGE); + return new RadiusDescriptor.Circle(getPos(), RANGE); } @Override 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 b321848fb..56d4bb3ee 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 @@ -11,8 +11,6 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.item.ExperienceOrbEntity; -import net.minecraft.entity.item.ExperienceOrbEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; @@ -20,7 +18,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.ExperienceHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -63,7 +60,7 @@ public class SubTileArcaneRose extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 5c80dc07a..6f3ba197f 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 @@ -12,7 +12,6 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; @@ -22,7 +21,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -197,7 +195,7 @@ public class SubTileDandelifeon extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 ab118ed74..70c3ee5b0 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 @@ -13,14 +13,9 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.Item; import net.minecraft.particles.ParticleTypes; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.AbstractFurnaceTileEntity; -import net.minecraft.tileentity.FurnaceTileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; @@ -30,7 +25,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.block.mana.BlockSpreader; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; @@ -126,7 +120,7 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 9344084af..6c96630da 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 @@ -89,7 +89,7 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), RANGE); } @Override 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 6185a7bf0..9925970d6 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 @@ -10,27 +10,22 @@ */ package vazkii.botania.common.block.subtile.generating; -import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.particles.ParticleTypes; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.ItemParticleData; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; import net.minecraft.world.server.ServerWorld; -import net.minecraft.world.server.ServerWorld; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -134,7 +129,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 eccec746d..16327c85e 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 @@ -141,7 +141,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), 1); + return new RadiusDescriptor.Square(getPos(), 1); } @Override 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 8b03eacbf..5e8ac5fcb 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 @@ -13,8 +13,6 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.CakeBlock; -import net.minecraft.block.CakeBlock; -import net.minecraft.block.BlockState; import net.minecraft.util.SoundEvents; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; @@ -23,7 +21,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -71,7 +68,7 @@ public class SubTileKekimurus extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 12385b7e7..fc2043135 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 @@ -12,7 +12,6 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -26,7 +25,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -113,7 +111,7 @@ public class SubTileMunchdew extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 617da5e88..c650a526c 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 @@ -15,7 +15,6 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.util.SoundEvents; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SharedSeedRandom; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; @@ -29,7 +28,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -82,7 +80,7 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), 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 4b9baff0e..70084965b 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 @@ -123,7 +123,7 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), RANGE); } @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 9c1370e4a..03ef5ce74 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 @@ -17,10 +17,8 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.item.ItemEntity; import net.minecraft.particles.ParticleTypes; import net.minecraft.item.DyeColor; -import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.ItemParticleData; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; @@ -34,7 +32,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -86,7 +83,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toBlockPos(), RANGE); + return new RadiusDescriptor.Square(getPos(), RANGE); } @Override