From ca6904984267cbe88e8c68cbff3f8abaa3c1a5f3 Mon Sep 17 00:00:00 2001 From: MoriyaShiine <45156123+MoriyaShiine@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:14:38 -0500 Subject: [PATCH] de-objectholder tiles (#3333) * de-objectholder tiles * thank you willie very cool --- .../client/core/handler/ModelHandler.java | 64 ++++----- .../java/vazkii/botania/common/Botania.java | 3 +- .../botania/common/block/ModBlocks.java | 59 -------- .../botania/common/block/tile/ModTiles.java | 132 ++++++++++++++++++ .../common/block/tile/TileAlfPortal.java | 5 +- .../botania/common/block/tile/TileAltar.java | 5 +- .../common/block/tile/TileAnimatedTorch.java | 5 +- .../botania/common/block/tile/TileAvatar.java | 5 +- .../common/block/tile/TileBifrost.java | 4 +- .../common/block/tile/TileBrewery.java | 4 +- .../common/block/tile/TileCacophonium.java | 4 +- .../botania/common/block/tile/TileCell.java | 4 +- .../botania/common/block/tile/TileCocoon.java | 5 +- .../common/block/tile/TileCraftCrate.java | 3 +- .../common/block/tile/TileEnchanter.java | 4 +- .../common/block/tile/TileEnderEye.java | 4 +- .../common/block/tile/TileFakeAir.java | 4 +- .../common/block/tile/TileFloatingFlower.java | 4 +- .../common/block/tile/TileForestEye.java | 4 +- .../common/block/tile/TileGaiaHead.java | 4 +- .../common/block/tile/TileHourglass.java | 3 +- .../common/block/tile/TileIncensePlate.java | 3 +- .../common/block/tile/TileLightRelay.java | 3 +- .../common/block/tile/TileManaFlame.java | 3 +- .../common/block/tile/TileOpenCrate.java | 5 +- .../common/block/tile/TilePlatform.java | 3 +- .../botania/common/block/tile/TilePylon.java | 3 +- .../common/block/tile/TileRuneAltar.java | 3 +- .../common/block/tile/TileSparkChanger.java | 4 +- .../common/block/tile/TileSpawnerClaw.java | 3 +- .../common/block/tile/TileStarfield.java | 4 +- .../common/block/tile/TileTerraPlate.java | 3 +- .../common/block/tile/TileTeruTeruBozu.java | 3 +- .../common/block/tile/TileTinyPlanet.java | 4 +- .../common/block/tile/TileTinyPotato.java | 3 +- .../corporea/TileCorporeaCrystalCube.java | 4 +- .../tile/corporea/TileCorporeaFunnel.java | 5 +- .../tile/corporea/TileCorporeaIndex.java | 4 +- .../corporea/TileCorporeaInterceptor.java | 5 +- .../tile/corporea/TileCorporeaRetainer.java | 4 +- .../common/block/tile/mana/TileBellows.java | 4 +- .../block/tile/mana/TileDistributor.java | 4 +- .../block/tile/mana/TileManaDetector.java | 5 +- .../common/block/tile/mana/TileManaVoid.java | 5 +- .../common/block/tile/mana/TilePool.java | 4 +- .../common/block/tile/mana/TilePrism.java | 5 +- .../common/block/tile/mana/TilePump.java | 4 +- .../block/tile/mana/TileRFGenerator.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 4 +- .../common/block/tile/mana/TileTurntable.java | 4 +- .../tile/string/TileRedStringComparator.java | 4 +- .../tile/string/TileRedStringContainer.java | 4 +- .../tile/string/TileRedStringDispenser.java | 5 +- .../tile/string/TileRedStringFertilizer.java | 5 +- .../tile/string/TileRedStringInterceptor.java | 4 +- .../block/tile/string/TileRedStringRelay.java | 5 +- 56 files changed, 240 insertions(+), 228 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/tile/ModTiles.java diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 6693d6642..2428a105f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -55,43 +55,43 @@ public final class ModelHandler { ModelLoader.addSpecialModel(prefix("block/redstone_spreader_inside")); registerSubtiles(); - ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, RenderTileAltar::new); - ClientRegistry.bindTileEntityRenderer(TileSpreader.TYPE, RenderTileSpreader::new); - ClientRegistry.bindTileEntityRenderer(TilePool.TYPE, RenderTilePool::new); - ClientRegistry.bindTileEntityRenderer(TileRuneAltar.TYPE, RenderTileRuneAltar::new); - ClientRegistry.bindTileEntityRenderer(TilePylon.TYPE, RenderTilePylon::new); - ClientRegistry.bindTileEntityRenderer(TileEnchanter.TYPE, RenderTileEnchanter::new); - ClientRegistry.bindTileEntityRenderer(TileAlfPortal.TYPE, RenderTileAlfPortal::new); - ClientRegistry.bindTileEntityRenderer(TileFloatingFlower.TYPE, RenderTileFloatingFlower::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.ALTAR, RenderTileAltar::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.SPREADER, RenderTileSpreader::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.POOL, RenderTilePool::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.RUNE_ALTAR, RenderTileRuneAltar::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.PYLON, RenderTilePylon::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.ENCHANTER, RenderTileEnchanter::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.ALF_PORTAL, RenderTileAlfPortal::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.MINI_ISLAND, RenderTileFloatingFlower::new); // TODO 1.14 this seems highly questionable. ModSubtiles.getTypes().stream() .map(Pair::getSecond) .map(rl -> Registry.BLOCK_ENTITY_TYPE.getValue(rl).get()) .forEach(typ -> ClientRegistry.bindTileEntityRenderer(typ, RenderTileFloatingFlower::new)); - ClientRegistry.bindTileEntityRenderer(TileTinyPotato.TYPE, RenderTileTinyPotato::new); - ClientRegistry.bindTileEntityRenderer(TileStarfield.TYPE, RenderTileStarfield::new); - ClientRegistry.bindTileEntityRenderer(TileBrewery.TYPE, RenderTileBrewery::new); - ClientRegistry.bindTileEntityRenderer(TileTerraPlate.TYPE, RenderTileTerraPlate::new); - ClientRegistry.bindTileEntityRenderer(TileRedStringComparator.TYPE, RenderTileRedString::new); - ClientRegistry.bindTileEntityRenderer(TileRedStringContainer.TYPE, RenderTileRedString::new); - ClientRegistry.bindTileEntityRenderer(TileRedStringDispenser.TYPE, RenderTileRedString::new); - ClientRegistry.bindTileEntityRenderer(TileRedStringFertilizer.TYPE, RenderTileRedString::new); - ClientRegistry.bindTileEntityRenderer(TileRedStringInterceptor.TYPE, RenderTileRedString::new); - ClientRegistry.bindTileEntityRenderer(TileRedStringRelay.TYPE, RenderTileRedString::new); - ClientRegistry.bindTileEntityRenderer(TilePrism.TYPE, RenderTilePrism::new); - ClientRegistry.bindTileEntityRenderer(TileCorporeaIndex.TYPE, RenderTileCorporeaIndex::new); - ClientRegistry.bindTileEntityRenderer(TilePump.TYPE, RenderTilePump::new); - ClientRegistry.bindTileEntityRenderer(TileCorporeaCrystalCube.TYPE, RenderTileCorporeaCrystalCube::new); - ClientRegistry.bindTileEntityRenderer(TileIncensePlate.TYPE, RenderTileIncensePlate::new); - ClientRegistry.bindTileEntityRenderer(TileHourglass.TYPE, RenderTileHourglass::new); - ClientRegistry.bindTileEntityRenderer(TileSparkChanger.TYPE, RenderTileSparkChanger::new); - ClientRegistry.bindTileEntityRenderer(TileCocoon.TYPE, RenderTileCocoon::new); - ClientRegistry.bindTileEntityRenderer(TileLightRelay.TYPE, RenderTileLightRelay::new); - ClientRegistry.bindTileEntityRenderer(TileBellows.TYPE, RenderTileBellows::new); - ClientRegistry.bindTileEntityRenderer(TileGaiaHead.TYPE, RenderTileGaiaHead::new); - ClientRegistry.bindTileEntityRenderer(TileTeruTeruBozu.TYPE, RenderTileTeruTeruBozu::new); - ClientRegistry.bindTileEntityRenderer(TileAvatar.TYPE, RenderTileAvatar::new); - ClientRegistry.bindTileEntityRenderer(TileAnimatedTorch.TYPE, RenderTileAnimatedTorch::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.TINY_POTATO, RenderTileTinyPotato::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.STARFIELD, RenderTileStarfield::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.BREWERY, RenderTileBrewery::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.TERRA_PLATE, RenderTileTerraPlate::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.RED_STRING_COMPARATOR, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.RED_STRING_CONTAINER, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.RED_STRING_DISPENSER, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.RED_STRING_FERTILIZER, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.RED_STRING_INTERCEPTOR, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.RED_STRING_RELAY, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.PRISM, RenderTilePrism::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.CORPOREA_INDEX, RenderTileCorporeaIndex::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.PUMP, RenderTilePump::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.CORPOREA_CRYSTAL_CUBE, RenderTileCorporeaCrystalCube::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.INCENSE_PLATE, RenderTileIncensePlate::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.HOURGLASS, RenderTileHourglass::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.SPARK_CHANGER, RenderTileSparkChanger::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.COCOON, RenderTileCocoon::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.LIGHT_RELAY, RenderTileLightRelay::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.BELLOWS, RenderTileBellows::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.GAIA_HEAD, RenderTileGaiaHead::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.TERU_TERU_BOZU, RenderTileTeruTeruBozu::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.AVATAR, RenderTileAvatar::new); + ClientRegistry.bindTileEntityRenderer(ModTiles.ANIMATED_TORCH, RenderTileAnimatedTorch::new); RenderingRegistry.registerEntityRenderingHandler(ModEntities.MANA_BURST, RenderNoop::new); RenderingRegistry.registerEntityRenderingHandler(ModEntities.PLAYER_MOVER, RenderNoop::new); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 7344e29ec..271cbcf20 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -66,6 +66,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; import vazkii.botania.common.block.subtile.functional.SubTileLoonuim; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileTerraPlate; @@ -148,7 +149,7 @@ public class Botania { modBus.addGenericListener(Effect.class, ModPotions::registerPotions); modBus.addGenericListener(Block.class, ModBlocks::registerBlocks); modBus.addGenericListener(Item.class, ModBlocks::registerItemBlocks); - modBus.addGenericListener(TileEntityType.class, ModBlocks::initTileEntities); + modBus.addGenericListener(TileEntityType.class, ModTiles::registerTiles); modBus.addGenericListener(Block.class, ModFluffBlocks::registerBlocks); modBus.addGenericListener(Item.class, ModFluffBlocks::registerItemBlocks); modBus.addGenericListener(ParticleType.class, ModParticles::registerParticles); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 17706b370..dce9fe3ea 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -801,65 +801,6 @@ public final class ModBlocks { SeedBehaviours.init(); } - public static void initTileEntities(RegistryEvent.Register> evt) { - IForgeRegistry> r = evt.getRegistry(); - register(r, LibBlockNames.ALTAR, TileEntityType.Builder.create(TileAltar::new, - defaultAltar, forestAltar, plainsAltar, mountainAltar, fungalAltar, - swampAltar, desertAltar, taigaAltar, mesaAltar, mossyAltar - ).build(null)); - register(r, LibBlockNames.SPREADER, TileEntityType.Builder.create(TileSpreader::new, manaSpreader, redstoneSpreader, elvenSpreader, gaiaSpreader).build(null)); - register(r, LibBlockNames.POOL, TileEntityType.Builder.create(TilePool::new, manaPool, dilutedPool, fabulousPool, creativePool).build(null)); - register(r, LibBlockNames.RUNE_ALTAR, TileEntityType.Builder.create(TileRuneAltar::new, runeAltar).build(null)); - register(r, LibBlockNames.PYLON, TileEntityType.Builder.create(TilePylon::new, manaPylon, naturaPylon, gaiaPylon).build(null)); - register(r, LibBlockNames.DISTRIBUTOR, TileEntityType.Builder.create(TileDistributor::new, distributor).build(null)); - register(r, LibBlockNames.MANA_VOID, TileEntityType.Builder.create(TileManaVoid::new, manaVoid).build(null)); - register(r, LibBlockNames.MANA_DETECTOR, TileEntityType.Builder.create(TileManaDetector::new, manaDetector).build(null)); - register(r, LibBlockNames.ENCHANTER, TileEntityType.Builder.create(TileEnchanter::new, enchanter).build(null)); - register(r, LibBlockNames.TURNTABLE, TileEntityType.Builder.create(TileTurntable::new, turntable).build(null)); - register(r, LibBlockNames.TINY_PLANET, TileEntityType.Builder.create(TileTinyPlanet::new, tinyPlanet).build(null)); - register(r, LibBlockNames.OPEN_CRATE, TileEntityType.Builder.create(TileOpenCrate::new, openCrate).build(null)); - register(r, LibBlockNames.CRAFT_CRATE, TileEntityType.Builder.create(TileCraftCrate::new, craftCrate).build(null)); - register(r, LibBlockNames.FOREST_EYE, TileEntityType.Builder.create(TileForestEye::new, forestEye).build(null)); - register(r, LibBlockNames.PLATFORM, TileEntityType.Builder.create(TilePlatform::new, abstrusePlatform, spectralPlatform, infrangiblePlatform).build(null)); - register(r, LibBlockNames.ALF_PORTAL, TileEntityType.Builder.create(TileAlfPortal::new, alfPortal).build(null)); - register(r, LibBlockNames.BIFROST, TileEntityType.Builder.create(TileBifrost::new, bifrost).build(null)); - register(r, LibBlockNames.MINI_ISLAND, TileEntityType.Builder.create(TileFloatingFlower::new, Arrays.stream(DyeColor.values()).map(ModBlocks::getFloatingFlower).toArray(Block[]::new)).build(null)); - register(r, LibBlockNames.TINY_POTATO, TileEntityType.Builder.create(TileTinyPotato::new, tinyPotato).build(null)); - register(r, LibBlockNames.SPAWNER_CLAW, TileEntityType.Builder.create(TileSpawnerClaw::new, spawnerClaw).build(null)); - register(r, LibBlockNames.ENDER_EYE_BLOCK, TileEntityType.Builder.create(TileEnderEye::new, enderEye).build(null)); - register(r, LibBlockNames.STARFIELD, TileEntityType.Builder.create(TileStarfield::new, starfield).build(null)); - register(r, LibBlockNames.FLUXFIELD, TileEntityType.Builder.create(TileRFGenerator::new, rfGenerator).build(null)); - register(r, LibBlockNames.BREWERY, TileEntityType.Builder.create(TileBrewery::new, brewery).build(null)); - register(r, LibBlockNames.TERRA_PLATE, TileEntityType.Builder.create(TileTerraPlate::new, terraPlate).build(null)); - register(r, LibBlockNames.RED_STRING_CONTAINER, TileEntityType.Builder.create(TileRedStringContainer::new, redStringContainer).build(null)); - register(r, LibBlockNames.RED_STRING_DISPENSER, TileEntityType.Builder.create(TileRedStringDispenser::new, redStringDispenser).build(null)); - register(r, LibBlockNames.RED_STRING_FERTILIZER, TileEntityType.Builder.create(TileRedStringFertilizer::new, redStringFertilizer).build(null)); - register(r, LibBlockNames.RED_STRING_COMPARATOR, TileEntityType.Builder.create(TileRedStringComparator::new, redStringComparator).build(null)); - register(r, LibBlockNames.RED_STRING_RELAY, TileEntityType.Builder.create(TileRedStringRelay::new, redStringRelay).build(null)); - register(r, LibBlockNames.MANA_FLAME, TileEntityType.Builder.create(TileManaFlame::new, manaFlame).build(null)); - register(r, LibBlockNames.PRISM, TileEntityType.Builder.create(TilePrism::new, prism).build(null)); - register(r, LibBlockNames.CORPOREA_INDEX, TileEntityType.Builder.create(TileCorporeaIndex::new, corporeaIndex).build(null)); - register(r, LibBlockNames.CORPOREA_FUNNEL, TileEntityType.Builder.create(TileCorporeaFunnel::new, corporeaFunnel).build(null)); - register(r, LibBlockNames.PUMP, TileEntityType.Builder.create(TilePump::new, pump).build(null)); - register(r, LibBlockNames.FAKE_AIR, TileEntityType.Builder.create(TileFakeAir::new, fakeAir).build(null)); - register(r, LibBlockNames.CORPOREA_INTERCEPTOR, TileEntityType.Builder.create(TileCorporeaInterceptor::new, corporeaInterceptor).build(null)); - register(r, LibBlockNames.CORPOREA_CRYSTAL_CUBE, TileEntityType.Builder.create(TileCorporeaCrystalCube::new, corporeaCrystalCube).build(null)); - register(r, LibBlockNames.INCENSE_PLATE, TileEntityType.Builder.create(TileIncensePlate::new, incensePlate).build(null)); - register(r, LibBlockNames.HOURGLASS, TileEntityType.Builder.create(TileHourglass::new, hourglass).build(null)); - register(r, LibBlockNames.SPARK_CHANGER, TileEntityType.Builder.create(TileSparkChanger::new, sparkChanger).build(null)); - register(r, LibBlockNames.COCOON, TileEntityType.Builder.create(TileCocoon::new, cocoon).build(null)); - register(r, LibBlockNames.LIGHT_RELAY, TileEntityType.Builder.create(TileLightRelay::new, lightRelayDefault, lightRelayDetector, lightRelayToggle, lightRelayFork).build(null)); - register(r, LibBlockNames.CACOPHONIUM, TileEntityType.Builder.create(TileCacophonium::new, cacophonium).build(null)); - register(r, LibBlockNames.BELLOWS, TileEntityType.Builder.create(TileBellows::new, bellows).build(null)); - register(r, LibBlockNames.CELL_BLOCK, TileEntityType.Builder.create(TileCell::new, cellBlock).build(null)); - register(r, LibBlockNames.RED_STRING_INTERCEPTOR, TileEntityType.Builder.create(TileRedStringInterceptor::new, redStringInterceptor).build(null)); - register(r, LibBlockNames.GAIA_HEAD, TileEntityType.Builder.create(TileGaiaHead::new, gaiaHead, gaiaHeadWall).build(null)); - register(r, LibBlockNames.CORPOREA_RETAINER, TileEntityType.Builder.create(TileCorporeaRetainer::new, corporeaRetainer).build(null)); - register(r, LibBlockNames.TERU_TERU_BOZU, TileEntityType.Builder.create(TileTeruTeruBozu::new, teruTeruBozu).build(null)); - register(r, LibBlockNames.AVATAR, TileEntityType.Builder.create(TileAvatar::new, avatar).build(null)); - register(r, LibBlockNames.ANIMATED_TORCH, TileEntityType.Builder.create(TileAnimatedTorch::new, animatedTorch).build(null)); - } - public static Block getFlower(DyeColor color) { switch (color) { default: diff --git a/src/main/java/vazkii/botania/common/block/tile/ModTiles.java b/src/main/java/vazkii/botania/common/block/tile/ModTiles.java new file mode 100644 index 000000000..bcfd0fba8 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/tile/ModTiles.java @@ -0,0 +1,132 @@ +package vazkii.botania.common.block.tile; + +import net.minecraft.block.Block; +import net.minecraft.item.DyeColor; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.registries.IForgeRegistry; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.corporea.*; +import vazkii.botania.common.block.tile.mana.*; +import vazkii.botania.common.block.tile.string.*; +import vazkii.botania.common.lib.LibBlockNames; + +import java.util.Arrays; + +import static vazkii.botania.common.block.ModBlocks.*; + +public class ModTiles +{ + public static final TileEntityType ALTAR = TileEntityType.Builder.create(TileAltar::new, + defaultAltar, forestAltar, plainsAltar, mountainAltar, fungalAltar, + swampAltar, desertAltar, taigaAltar, mesaAltar, mossyAltar + ).build(null); + public static final TileEntityType SPREADER = TileEntityType.Builder.create(TileSpreader::new, manaSpreader, redstoneSpreader, elvenSpreader, gaiaSpreader).build(null); + public static final TileEntityType POOL = TileEntityType.Builder.create(TilePool::new, manaPool, dilutedPool, fabulousPool, creativePool).build(null); + public static final TileEntityType RUNE_ALTAR = TileEntityType.Builder.create(TileRuneAltar::new, runeAltar).build(null); + public static final TileEntityType PYLON = TileEntityType.Builder.create(TilePylon::new, manaPylon, naturaPylon, gaiaPylon).build(null); + public static final TileEntityType DISTRIBUTOR = TileEntityType.Builder.create(TileDistributor::new, distributor).build(null); + public static final TileEntityType MANA_VOID = TileEntityType.Builder.create(TileManaVoid::new, manaVoid).build(null); + public static final TileEntityType MANA_DETECTOR = TileEntityType.Builder.create(TileManaDetector::new, manaDetector).build(null); + public static final TileEntityType ENCHANTER = TileEntityType.Builder.create(TileEnchanter::new, enchanter).build(null); + public static final TileEntityType TURNTABLE = TileEntityType.Builder.create(TileTurntable::new, turntable).build(null); + public static final TileEntityType TINY_PLANET = TileEntityType.Builder.create(TileTinyPlanet::new, tinyPlanet).build(null); + public static final TileEntityType OPEN_CRATE = TileEntityType.Builder.create(TileOpenCrate::new, openCrate).build(null); + public static final TileEntityType CRAFT_CRATE = TileEntityType.Builder.create(TileCraftCrate::new, craftCrate).build(null); + public static final TileEntityType FORSET_EYE = TileEntityType.Builder.create(TileForestEye::new, forestEye).build(null); + public static final TileEntityType PLATFORM = TileEntityType.Builder.create(TilePlatform::new, abstrusePlatform, spectralPlatform, infrangiblePlatform).build(null); + public static final TileEntityType ALF_PORTAL = TileEntityType.Builder.create(TileAlfPortal::new, alfPortal).build(null); + public static final TileEntityType BIFROST = TileEntityType.Builder.create(TileBifrost::new, bifrost).build(null); + public static final TileEntityType MINI_ISLAND = TileEntityType.Builder.create(TileFloatingFlower::new, Arrays.stream(DyeColor.values()).map(ModBlocks::getFloatingFlower).toArray(Block[]::new)).build(null); + public static final TileEntityType TINY_POTATO = TileEntityType.Builder.create(TileTinyPotato::new, tinyPotato).build(null); + public static final TileEntityType SPAWNER_CLAW = TileEntityType.Builder.create(TileSpawnerClaw::new, spawnerClaw).build(null); + public static final TileEntityType ENDER_EYE = TileEntityType.Builder.create(TileEnderEye::new, enderEye).build(null); + public static final TileEntityType STARFIELD = TileEntityType.Builder.create(TileStarfield::new, starfield).build(null); + public static final TileEntityType FLUXFIELD = TileEntityType.Builder.create(TileRFGenerator::new, rfGenerator).build(null); + public static final TileEntityType BREWERY = TileEntityType.Builder.create(TileBrewery::new, brewery).build(null); + public static final TileEntityType TERRA_PLATE = TileEntityType.Builder.create(TileTerraPlate::new, terraPlate).build(null); + public static final TileEntityType RED_STRING_CONTAINER = TileEntityType.Builder.create(TileRedStringContainer::new, redStringContainer).build(null); + public static final TileEntityType RED_STRING_DISPENSER = TileEntityType.Builder.create(TileRedStringDispenser::new, redStringDispenser).build(null); + public static final TileEntityType RED_STRING_FERTILIZER = TileEntityType.Builder.create(TileRedStringFertilizer::new, redStringFertilizer).build(null); + public static final TileEntityType RED_STRING_COMPARATOR = TileEntityType.Builder.create(TileRedStringComparator::new, redStringComparator).build(null); + public static final TileEntityType RED_STRING_RELAY = TileEntityType.Builder.create(TileRedStringRelay::new, redStringRelay).build(null); + public static final TileEntityType MANA_FLAME = TileEntityType.Builder.create(TileManaFlame::new, manaFlame).build(null); + public static final TileEntityType PRISM = TileEntityType.Builder.create(TilePrism::new, prism).build(null); + public static final TileEntityType CORPOREA_INDEX = TileEntityType.Builder.create(TileCorporeaIndex::new, corporeaIndex).build(null); + public static final TileEntityType CORPOREA_FUNNEL = TileEntityType.Builder.create(TileCorporeaFunnel::new, corporeaFunnel).build(null); + public static final TileEntityType PUMP = TileEntityType.Builder.create(TilePump::new, pump).build(null); + public static final TileEntityType FAKE_AIR = TileEntityType.Builder.create(TileFakeAir::new, fakeAir).build(null); + public static final TileEntityType CORPOREA_INTERCEPTOR = TileEntityType.Builder.create(TileCorporeaInterceptor::new, corporeaInterceptor).build(null); + public static final TileEntityType CORPOREA_CRYSTAL_CUBE = TileEntityType.Builder.create(TileCorporeaCrystalCube::new, corporeaCrystalCube).build(null); + public static final TileEntityType INCENSE_PLATE = TileEntityType.Builder.create(TileIncensePlate::new, incensePlate).build(null); + public static final TileEntityType HOURGLASS = TileEntityType.Builder.create(TileHourglass::new, hourglass).build(null); + public static final TileEntityType SPARK_CHANGER = TileEntityType.Builder.create(TileSparkChanger::new, sparkChanger).build(null); + public static final TileEntityType COCOON = TileEntityType.Builder.create(TileCocoon::new, cocoon).build(null); + public static final TileEntityType LIGHT_RELAY = TileEntityType.Builder.create(TileLightRelay::new, lightRelayDefault, lightRelayDetector, lightRelayToggle, lightRelayFork).build(null); + public static final TileEntityType CACOPHONIUM = TileEntityType.Builder.create(TileCacophonium::new, cacophonium).build(null); + public static final TileEntityType BELLOWS = TileEntityType.Builder.create(TileBellows::new, bellows).build(null); + public static final TileEntityType CELL_BLOCK = TileEntityType.Builder.create(TileCell::new, cellBlock).build(null); + public static final TileEntityType RED_STRING_INTERCEPTOR = TileEntityType.Builder.create(TileRedStringInterceptor::new, redStringInterceptor).build(null); + public static final TileEntityType GAIA_HEAD = TileEntityType.Builder.create(TileGaiaHead::new, gaiaHead, gaiaHeadWall).build(null); + public static final TileEntityType CORPOREA_RETAINER = TileEntityType.Builder.create(TileCorporeaRetainer::new, corporeaRetainer).build(null); + public static final TileEntityType TERU_TERU_BOZU = TileEntityType.Builder.create(TileTeruTeruBozu::new, teruTeruBozu).build(null); + public static final TileEntityType AVATAR = TileEntityType.Builder.create(TileAvatar::new, avatar).build(null); + public static final TileEntityType ANIMATED_TORCH = TileEntityType.Builder.create(TileAnimatedTorch::new, animatedTorch).build(null); + + public static void registerTiles(RegistryEvent.Register> evt) + { + IForgeRegistry> r = evt.getRegistry(); + register(r, LibBlockNames.ALTAR, ALTAR); + register(r, LibBlockNames.SPREADER, SPREADER); + register(r, LibBlockNames.POOL, POOL); + register(r, LibBlockNames.RUNE_ALTAR, RUNE_ALTAR); + register(r, LibBlockNames.PYLON, PYLON); + register(r, LibBlockNames.DISTRIBUTOR, DISTRIBUTOR); + register(r, LibBlockNames.MANA_VOID, MANA_VOID); + register(r, LibBlockNames.MANA_DETECTOR, MANA_DETECTOR); + register(r, LibBlockNames.ENCHANTER, ENCHANTER); + register(r, LibBlockNames.TURNTABLE, TURNTABLE); + register(r, LibBlockNames.TINY_PLANET, TINY_PLANET); + register(r, LibBlockNames.OPEN_CRATE, OPEN_CRATE); + register(r, LibBlockNames.CRAFT_CRATE, CRAFT_CRATE); + register(r, LibBlockNames.FOREST_EYE, FORSET_EYE); + register(r, LibBlockNames.PLATFORM, PLATFORM); + register(r, LibBlockNames.ALF_PORTAL, ALF_PORTAL); + register(r, LibBlockNames.BIFROST, BIFROST); + register(r, LibBlockNames.MINI_ISLAND, MINI_ISLAND); + register(r, LibBlockNames.TINY_POTATO, TINY_POTATO); + register(r, LibBlockNames.SPAWNER_CLAW, SPAWNER_CLAW); + register(r, LibBlockNames.ENDER_EYE_BLOCK, ENDER_EYE); + register(r, LibBlockNames.STARFIELD, STARFIELD); + register(r, LibBlockNames.FLUXFIELD, FLUXFIELD); + register(r, LibBlockNames.BREWERY, BREWERY); + register(r, LibBlockNames.TERRA_PLATE, TERRA_PLATE); + register(r, LibBlockNames.RED_STRING_CONTAINER, RED_STRING_CONTAINER); + register(r, LibBlockNames.RED_STRING_DISPENSER, RED_STRING_DISPENSER); + register(r, LibBlockNames.RED_STRING_FERTILIZER, RED_STRING_FERTILIZER); + register(r, LibBlockNames.RED_STRING_COMPARATOR, RED_STRING_COMPARATOR); + register(r, LibBlockNames.RED_STRING_RELAY, RED_STRING_RELAY); + register(r, LibBlockNames.MANA_FLAME, MANA_FLAME); + register(r, LibBlockNames.PRISM, PRISM); + register(r, LibBlockNames.CORPOREA_INDEX, CORPOREA_INDEX); + register(r, LibBlockNames.CORPOREA_FUNNEL, CORPOREA_FUNNEL); + register(r, LibBlockNames.PUMP, PUMP); + register(r, LibBlockNames.FAKE_AIR, FAKE_AIR); + register(r, LibBlockNames.CORPOREA_INTERCEPTOR, CORPOREA_INTERCEPTOR); + register(r, LibBlockNames.CORPOREA_CRYSTAL_CUBE, CORPOREA_CRYSTAL_CUBE); + register(r, LibBlockNames.INCENSE_PLATE, INCENSE_PLATE); + register(r, LibBlockNames.HOURGLASS, HOURGLASS); + register(r, LibBlockNames.SPARK_CHANGER, SPARK_CHANGER); + register(r, LibBlockNames.COCOON, COCOON); + register(r, LibBlockNames.LIGHT_RELAY, LIGHT_RELAY); + register(r, LibBlockNames.CACOPHONIUM, CACOPHONIUM); + register(r, LibBlockNames.BELLOWS, BELLOWS); + register(r, LibBlockNames.CELL_BLOCK, CELL_BLOCK); + register(r, LibBlockNames.RED_STRING_INTERCEPTOR, RED_STRING_INTERCEPTOR); + register(r, LibBlockNames.GAIA_HEAD, GAIA_HEAD); + register(r, LibBlockNames.CORPOREA_RETAINER, CORPOREA_RETAINER); + register(r, LibBlockNames.TERU_TERU_BOZU, TERU_TERU_BOZU); + register(r, LibBlockNames.AVATAR, AVATAR); + register(r, LibBlockNames.ANIMATED_TORCH, ANIMATED_TORCH); + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index d3721c508..0725e0b4e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -53,9 +53,6 @@ import java.util.*; import java.util.stream.Collectors; public class TileAlfPortal extends TileMod implements ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.ALF_PORTAL) public static TileEntityType TYPE; - public static final LazyValue MULTIBLOCK = new LazyValue<>(() -> PatchouliAPI.instance.makeMultiblock( new String[][] { { "_", "W", "G", "W", "_" }, @@ -84,7 +81,7 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { @Nullable private UUID breadPlayer = null; public TileAlfPortal() { - super(TYPE); + super(ModTiles.ALF_PORTAL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index be69f91a7..37f2c97d9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -65,8 +65,7 @@ import java.util.Optional; import java.util.regex.Pattern; public class TileAltar extends TileSimpleInventory implements IPetalApothecary, ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.ALTAR) public static TileEntityType TYPE; + private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); private static final int SET_KEEP_TICKS_EVENT = 0; private static final int CRAFT_EFFECT_EVENT = 1; @@ -81,7 +80,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, private int recipeKeepTicks = 0; public TileAltar() { - super(TYPE); + super(ModTiles.ALTAR); } public boolean collideEntityItem(ItemEntity item) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index 8cccd1e77..ce65dbf4a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -32,9 +32,6 @@ import javax.annotation.Nullable; import java.util.Arrays; public class TileAnimatedTorch extends TileMod implements ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.ANIMATED_TORCH) public static TileEntityType TYPE; - private static final String TAG_SIDE = "side"; private static final String TAG_ROTATING = "rotating"; private static final String TAG_ROTATION_TICKS = "rotationTicks"; @@ -62,7 +59,7 @@ public class TileAnimatedTorch extends TileMod implements ITickableTileEntity { private TorchMode torchMode = TorchMode.TOGGLE; public TileAnimatedTorch() { - super(TYPE); + super(ModTiles.ANIMATED_TORCH); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 24db9d65d..d377bae7e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -25,9 +25,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.AVATAR) public static TileEntityType TYPE; - private static final int MAX_MANA = 6400; private static final String TAG_ENABLED = "enabled"; @@ -39,7 +36,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ITic private int mana; public TileAvatar() { - super(TYPE); + super(ModTiles.AVATAR); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index 50e1cd123..b10960648 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -19,14 +19,12 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class TileBifrost extends TileMod implements ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.BIFROST) public static TileEntityType TYPE; private static final String TAG_TICKS = "ticks"; public int ticks = 0; public TileBifrost() { - super(TYPE); + super(ModTiles.BIFROST); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 1d322808b..a219cc293 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -43,8 +43,6 @@ import java.util.List; import java.util.Optional; public class TileBrewery extends TileSimpleInventory implements IManaReceiver, ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.BREWERY) public static TileEntityType TYPE; private static final String TAG_MANA = "mana"; private static final int CRAFT_EFFECT_EVENT = 0; @@ -54,7 +52,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I public int signal = 0; public TileBrewery() { - super(TYPE); + super(ModTiles.BREWERY); } public boolean addItem(@Nullable PlayerEntity player, ItemStack stack, @Nullable Hand hand) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index a937cc7c6..2481e9f3c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -19,14 +19,12 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileCacophonium extends TileMod { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CACOPHONIUM) public static TileEntityType TYPE; private static final String TAG_STACK = "stack"; public ItemStack stack = ItemStack.EMPTY; public TileCacophonium() { - super(TYPE); + super(ModTiles.CACOPHONIUM); } public void annoyDirewolf() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 5f016583f..1ee889690 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -18,8 +18,6 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileCell extends TileMod { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CELL_BLOCK) public static TileEntityType TYPE; private static final String TAG_GENERATION = "generation"; private static final String TAG_TICKED = "ticked"; private static final String TAG_FLOWER_X = "flowerX"; @@ -35,7 +33,7 @@ public class TileCell extends TileMod { private BlockPos validCoords = new BlockPos(0, -1, 0); public TileCell() { - super(TYPE); + super(ModTiles.CELL_BLOCK); } public void setGeneration(SubTileDandelifeon flower, int gen) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 4161bbd09..699b7155b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -31,9 +31,6 @@ import java.util.ArrayList; import java.util.List; public class TileCocoon extends TileMod implements ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.COCOON) public static TileEntityType TYPE; - private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; private static final String TAG_CHORUS_FRUIT_GIVEN = "chorusFruitGiven"; @@ -62,7 +59,7 @@ public class TileCocoon extends TileMod implements ITickableTileEntity { public boolean gaiaSpiritGiven; public TileCocoon() { - super(TYPE); + super(ModTiles.COCOON); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 260de8817..4a185ef8d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -34,13 +34,12 @@ import java.util.List; import java.util.Optional; public class TileCraftCrate extends TileOpenCrate { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CRAFT_CRATE) public static TileEntityType TYPE; private static final String TAG_PATTERN = "pattern"; private int signal = 0; public TileCraftCrate() { - super(TYPE); + super(ModTiles.CRAFT_CRATE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 760acd6eb..7a1f83acd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -62,8 +62,6 @@ import java.util.Map; import java.util.stream.Collectors; public class TileEnchanter extends TileMod implements ISparkAttachable, ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.ENCHANTER) public static TileEntityType TYPE; private static final String TAG_STAGE = "stage"; private static final String TAG_STAGE_TICKS = "stageTicks"; private static final String TAG_STAGE_3_END_TICKS = "stage3EndTicks"; @@ -140,7 +138,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl } public TileEnchanter() { - super(TYPE); + super(ModTiles.ENCHANTER); } public void onWanded(PlayerEntity player, ItemStack wand) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 40ff24d61..cf61edcc7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -28,10 +28,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class TileEnderEye extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.ENDER_EYE_BLOCK) public static TileEntityType TYPE; - public TileEnderEye() { - super(TYPE); + super(ModTiles.ENDER_EYE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index d11a75007..31c6f1ee6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -21,8 +21,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class TileFakeAir extends TileMod { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.FAKE_AIR) public static TileEntityType TYPE; private static final String TAG_FLOWER_X = "flowerX"; private static final String TAG_FLOWER_Y = "flowerY"; private static final String TAG_FLOWER_Z = "flowerZ"; @@ -30,7 +28,7 @@ public class TileFakeAir extends TileMod { private BlockPos flowerPos = BlockPos.ZERO; public TileFakeAir() { - super(TYPE); + super(ModTiles.FAKE_AIR); } public void setFlower(TileEntity tile) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 33eb97fc2..9cdd25827 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -35,8 +35,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class TileFloatingFlower extends TileMod { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.MINI_ISLAND) public static TileEntityType TYPE; - private static final String TAG_FLOATING_DATA = "floating"; private final IFloatingFlower floatingData = new FloatingFlowerImpl() { @Override @@ -52,7 +50,7 @@ public class TileFloatingFlower extends TileMod { private final LazyOptional floatingDataCap = LazyOptional.of(() -> floatingData); public TileFloatingFlower() { - super(TYPE); + super(ModTiles.MINI_ISLAND); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index ff456305a..317cd87a5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -18,12 +18,10 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileForestEye extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.FOREST_EYE) public static TileEntityType TYPE; - public int entities = 0; public TileForestEye() { - super(TYPE); + super(ModTiles.FORSET_EYE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java index 5286bb165..ac722e8ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java @@ -18,12 +18,10 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class TileGaiaHead extends SkullTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.GAIA_HEAD) public static TileEntityType TYPE; - @Nonnull @Override public TileEntityType getType() { - return TYPE; + return ModTiles.GAIA_HEAD; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index b788b20a3..c1689775c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -33,7 +33,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class TileHourglass extends TileSimpleInventory implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.HOURGLASS) public static TileEntityType TYPE; private static final String TAG_TIME = "time"; private static final String TAG_TIME_FRACTION = "timeFraction"; private static final String TAG_FLIP = "flip"; @@ -50,7 +49,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickableTileE public boolean move = true; public TileHourglass() { - super(TYPE); + super(ModTiles.HOURGLASS); } private boolean isDust() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index 55d9f7546..c5b604176 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -37,7 +37,6 @@ import java.util.List; import java.util.Random; public class TileIncensePlate extends TileSimpleInventory implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.INCENSE_PLATE) public static TileEntityType TYPE; private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; private static final int RANGE = 32; @@ -47,7 +46,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ITickableTi public int comparatorOutput = 0; public TileIncensePlate() { - super(TYPE); + super(ModTiles.INCENSE_PLATE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 734d4190b..2bc8c39a6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -55,7 +55,6 @@ import java.util.ArrayList; import java.util.List; public class TileLightRelay extends TileMod implements ITickableTileEntity, IWandBindable { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.LIGHT_RELAY) public static TileEntityType TYPE; private static final int MAX_DIST = 20; private static final String TAG_BIND_X = "bindX"; @@ -66,7 +65,7 @@ public class TileLightRelay extends TileMod implements ITickableTileEntity, IWan private int ticksElapsed = 0; public TileLightRelay() { - super(TYPE); + super(ModTiles.LIGHT_RELAY); } public void mountEntity(Entity e) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 4c2fe3d0e..c681032bd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -18,14 +18,13 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileManaFlame extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.MANA_FLAME) public static TileEntityType TYPE; private static final String TAG_COLOR = "color"; private int color = 0x20FF20; private int lightColor = -1; public TileManaFlame() { - super(TYPE); + super(ModTiles.MANA_FLAME); } public void setColor(int color) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 7870b1d95..744a3cd4e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -24,11 +24,8 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileOpenCrate extends TileSimpleInventory implements ITickableTileEntity { - - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.OPEN_CRATE) public static TileEntityType TYPE; - public TileOpenCrate() { - this(TYPE); + this(ModTiles.OPEN_CRATE); } public TileOpenCrate(TileEntityType type) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index fca1be8f6..6318f6391 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -33,13 +33,12 @@ public class TilePlatform extends TileMod { public static final ModelProperty HELD_STATE = new ModelProperty<>(); public static final ModelProperty HELD_POS = new ModelProperty<>(); - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.PLATFORM) public static TileEntityType TYPE; private static final String TAG_CAMO = "camo"; public BlockState camoState; public TilePlatform() { - super(TYPE); + super(ModTiles.PLATFORM); } public boolean onWanded(PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index b9a0c9f5a..44f2b3d2d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -31,13 +31,12 @@ import vazkii.botania.common.lib.LibMisc; import java.util.Random; public class TilePylon extends TileEntity implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.PYLON) public static TileEntityType TYPE; boolean activated = false; BlockPos centerPos; private int ticks = 0; public TilePylon() { - super(TYPE); + super(ModTiles.PYLON); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index a60e8a42c..a921a57fa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -53,7 +53,6 @@ import java.util.List; import java.util.Optional; public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RUNE_ALTAR) public static TileEntityType TYPE; private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; private static final int SET_KEEP_TICKS_EVENT = 0; @@ -71,7 +70,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, private int recipeKeepTicks = 0; public TileRuneAltar() { - super(TYPE); + super(ModTiles.RUNE_ALTAR); } public boolean addItem(@Nullable PlayerEntity player, ItemStack stack, @Nullable Hand hand) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 183ff7d98..94740481e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -29,10 +29,8 @@ import java.util.Collection; import java.util.List; public class TileSparkChanger extends TileSimpleInventory { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.SPARK_CHANGER) public static TileEntityType TYPE; - public TileSparkChanger() { - super(TYPE); + super(ModTiles.SPARK_CHANGER); } public void doSwap() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 643f3506f..9178a3c97 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -29,13 +29,12 @@ import vazkii.botania.common.lib.LibMisc; import java.util.Optional; public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.SPAWNER_CLAW) public static TileEntityType TYPE; private static final String TAG_MANA = "mana"; private int mana = 0; public TileSpawnerClaw() { - super(TYPE); + super(ModTiles.SPAWNER_CLAW); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 13b7bc8d5..701b9b79d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -18,10 +18,8 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileStarfield extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.STARFIELD) public static TileEntityType TYPE; - public TileStarfield() { - super(TYPE); + super(ModTiles.STARFIELD); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 678b19e1e..c6db2e20d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -40,7 +40,6 @@ import vazkii.patchouli.api.PatchouliAPI; import java.util.List; public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.TERRA_PLATE) public static TileEntityType TYPE; public static final int MAX_MANA = TilePool.MAX_MANA / 2; public static final LazyValue MULTIBLOCK = new LazyValue<>(() -> PatchouliAPI.instance.makeMultiblock( @@ -67,7 +66,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab private int mana; public TileTerraPlate() { - super(TYPE); + super(ModTiles.TERRA_PLATE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index b664fdec7..b1175664d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -17,11 +17,10 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileTeruTeruBozu extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.TERU_TERU_BOZU) public static TileEntityType TYPE; private boolean wasRaining = false; public TileTeruTeruBozu() { - super(TYPE); + super(ModTiles.TERU_TERU_BOZU); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 099d13d10..34652a76f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -17,10 +17,8 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileTinyPlanet extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.TINY_PLANET) public static TileEntityType TYPE; - public TileTinyPlanet() { - super(TYPE); + super(ModTiles.TINY_PLANET); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index ec74a51c3..45c475143 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -32,7 +32,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class TileTinyPotato extends TileSimpleInventory implements ITickableTileEntity, INameable { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.TINY_POTATO) public static TileEntityType TYPE; private static final String TAG_NAME = "name"; private static final int JUMP_EVENT = 0; @@ -41,7 +40,7 @@ public class TileTinyPotato extends TileSimpleInventory implements ITickableTile private int nextDoIt = 0; public TileTinyPotato() { - super(TYPE); + super(ModTiles.TINY_POTATO); } public void interact(PlayerEntity player, Hand hand, ItemStack stack, Direction side) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 8ac6ae2d1..329f4cdbd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -20,13 +20,13 @@ import vazkii.botania.api.corporea.ICorporeaRequestMatcher; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import java.util.List; public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CORPOREA_CRYSTAL_CUBE) public static TileEntityType TYPE; private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; private static final String TAG_LOCK = "lock"; @@ -38,7 +38,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public boolean locked = false; public TileCorporeaCrystalCube() { - super(TYPE); + super(ModTiles.CORPOREA_CRYSTAL_CUBE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index f8c4228f2..80c27b911 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -23,6 +23,7 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestMatcher; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -31,10 +32,8 @@ import java.util.ArrayList; import java.util.List; public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CORPOREA_FUNNEL) public static TileEntityType TYPE; - public TileCorporeaFunnel() { - super(TYPE); + super(ModTiles.CORPOREA_FUNNEL); } public void doRequest() { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index fa5ad8a9b..f06d4d281 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -23,6 +23,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.*; import vazkii.botania.common.advancements.CorporeaRequestTrigger; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -33,7 +34,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CORPOREA_INDEX) public static TileEntityType TYPE; public static final double RADIUS = 2.5; private static InputHandler input; @@ -264,7 +264,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public boolean hasCloseby; public TileCorporeaIndex() { - super(TYPE); + super(ModTiles.CORPOREA_INDEX); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index bfd741379..cdbe65db1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -21,6 +21,7 @@ import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaRequestMatcher; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -28,10 +29,8 @@ import java.util.ArrayList; import java.util.List; public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CORPOREA_INTERCEPTOR) public static TileEntityType TYPE; - public TileCorporeaInterceptor() { - super(TYPE); + super(ModTiles.CORPOREA_INTERCEPTOR); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 849bb66ab..3568ca263 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -15,6 +15,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.*; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -26,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; public class TileCorporeaRetainer extends TileMod { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CORPOREA_RETAINER) public static TileEntityType TYPE; private static final String TAG_REQUEST_X = "requestX"; private static final String TAG_REQUEST_Y = "requestY"; private static final String TAG_REQUEST_Z = "requestZ"; @@ -42,7 +42,7 @@ public class TileCorporeaRetainer extends TileMod { private int compValue; public TileCorporeaRetainer() { - super(TYPE); + super(ModTiles.CORPOREA_RETAINER); } public void setPendingRequest(BlockPos pos, ICorporeaRequestMatcher request, int requestCount) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index cb296808e..945ab35e4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -23,6 +23,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ExoflameFurnaceHandler; import vazkii.botania.common.core.handler.ModSounds; @@ -32,7 +33,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; public class TileBellows extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.BELLOWS) public static TileEntityType TYPE; private static final String TAG_ACTIVE = "active"; public float movePos; @@ -40,7 +40,7 @@ public class TileBellows extends TileMod implements ITickableTileEntity { public float moving = 0F; public TileBellows() { - super(TYPE); + super(ModTiles.BELLOWS); } public void interact() { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index e43d42533..9c81222fd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -17,6 +17,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -25,11 +26,10 @@ import java.util.ArrayList; import java.util.List; public class TileDistributor extends TileMod implements IManaReceiver, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.DISTRIBUTOR) public static TileEntityType TYPE; private final List validPools = new ArrayList<>(); public TileDistributor() { - super(TYPE); + super(ModTiles.DISTRIBUTOR); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 6eba18d29..373da713e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -19,15 +19,14 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.fx.SparkleParticleData; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileManaDetector extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.MANA_DETECTOR) public static TileEntityType TYPE; - public TileManaDetector() { - super(TYPE); + super(ModTiles.MANA_DETECTOR); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java index e22807b47..18f108568 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java @@ -13,15 +13,14 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IClientManaHandler; import vazkii.botania.client.fx.SparkleParticleData; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileManaVoid extends TileMod implements IClientManaHandler { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.MANA_VOID) public static TileEntityType TYPE; - public TileManaVoid() { - super(TYPE); + super(ModTiles.MANA_VOID); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 51c0f3c3c..8a807148e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -46,6 +46,7 @@ import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockPool; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; @@ -64,7 +65,6 @@ import java.util.List; import java.util.stream.Collectors; public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.POOL) public static TileEntityType TYPE; public static final int PARTICLE_COLOR = 0x00C6FF; public static final int MAX_MANA = 1000000; private static final int MAX_MANA_DILLUTED = 10000; @@ -101,7 +101,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt private boolean sendPacket = false; public TilePool() { - super(TYPE); + super(ModTiles.POOL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index c8db57466..491752a64 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -22,6 +22,7 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -29,10 +30,8 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class TilePrism extends TileSimpleInventory { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.PRISM) public static TileEntityType TYPE; - public TilePrism() { - super(TYPE); + super(ModTiles.PRISM); } public void onBurstCollision(IManaBurst burst) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 2dfc6535b..64a634f04 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -16,12 +16,12 @@ import net.minecraft.util.Direction; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TilePump extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.PUMP) public static TileEntityType TYPE; private static final String TAG_ACTIVE = "active"; public float innerRingPos; @@ -35,7 +35,7 @@ public class TilePump extends TileMod implements ITickableTileEntity { private int lastComparator = 0; public TilePump() { - super(TYPE); + super(ModTiles.PUMP); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 9e5a9004c..634c7999c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -21,6 +21,7 @@ import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -29,7 +30,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class TileRFGenerator extends TileMod implements IManaReceiver, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.FLUXFIELD) public static TileEntityType TYPE; private static final int MANA_TO_FE = 10; private static final int MAX_ENERGY = 1280 * MANA_TO_FE; @@ -71,7 +71,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, ITickable private final LazyOptional energyCap = LazyOptional.of(() -> energyHandler); public TileRFGenerator() { - super(TYPE); + super(ModTiles.FLUXFIELD); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 28e11e6a0..4c55090da 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -39,6 +39,7 @@ import vazkii.botania.api.mana.*; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.mana.BlockSpreader; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; @@ -56,7 +57,6 @@ import java.util.List; import java.util.UUID; public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IDirectioned, ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.SPREADER) public static TileEntityType TYPE; private static final int TICKS_ALLOWED_WITHOUT_PINGBACK = 20; private static final double PINGBACK_EXPIRED_SEARCH_DISTANCE = 0.5; @@ -131,7 +131,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, private boolean invalidTentativeBurst = false; public TileSpreader() { - super(TYPE); + super(ModTiles.SPREADER); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index ebec1dce0..19bb54a50 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -22,12 +22,12 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileTurntable extends TileMod implements ITickableTileEntity { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.TURNTABLE) public static TileEntityType TYPE; private static final String TAG_SPEED = "speed"; private static final String TAG_BACKWARDS = "backwards"; @@ -35,7 +35,7 @@ public class TileTurntable extends TileMod implements ITickableTileEntity { private boolean backwards = false; public TileTurntable() { - super(TYPE); + super(ModTiles.TURNTABLE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index 62ab3bc66..a0e59b4d7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -13,15 +13,15 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileRedStringComparator extends TileRedString { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RED_STRING_COMPARATOR) public static TileEntityType TYPE; private int comparatorValue = 0; public TileRedStringComparator() { - super(TYPE); + super(ModTiles.RED_STRING_COMPARATOR); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 4b8bdbee8..c3aef2607 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -19,6 +19,7 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; import net.minecraftforge.registries.ObjectHolder; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -28,13 +29,12 @@ import javax.annotation.Nullable; import java.util.Arrays; public class TileRedStringContainer extends TileRedString { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RED_STRING_CONTAINER) public static TileEntityType TYPE; private static final LazyOptional EMPTY = LazyOptional.of(EmptyHandler::new); @Nullable private LazyOptional lastBoundInv = null; @Nullable private LazyOptional proxiedInv = null; public TileRedStringContainer() { - this(TYPE); + this(ModTiles.RED_STRING_CONTAINER); } public TileRedStringContainer(TileEntityType type) { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index 422629081..6630fbd3f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -14,14 +14,13 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileRedStringDispenser extends TileRedStringContainer { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RED_STRING_DISPENSER) public static TileEntityType TYPE; - public TileRedStringDispenser() { - super(TYPE); + super(ModTiles.RED_STRING_DISPENSER); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 1c64ecdc1..a51e3c0d1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -17,16 +17,15 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.registries.ObjectHolder; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import java.util.Random; public class TileRedStringFertilizer extends TileRedString { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RED_STRING_FERTILIZER) public static TileEntityType TYPE; - public TileRedStringFertilizer() { - super(TYPE); + super(ModTiles.RED_STRING_FERTILIZER); } public boolean canGrow(IBlockReader world, boolean isClient) { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 4756c2636..0d3d65287 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -19,6 +19,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.registries.ObjectHolder; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -28,11 +29,10 @@ import java.util.List; import java.util.Set; public class TileRedStringInterceptor extends TileRedString { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RED_STRING_INTERCEPTOR) public static TileEntityType TYPE; private static final Set interceptors = new HashSet<>(); public TileRedStringInterceptor() { - super(TYPE); + super(ModTiles.RED_STRING_INTERCEPTOR); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java index a6864ea24..fb2d609c1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java @@ -18,14 +18,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileRedStringRelay extends TileRedString { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RED_STRING_RELAY) public static TileEntityType TYPE; - public TileRedStringRelay() { - super(TYPE); + super(ModTiles.RED_STRING_RELAY); } @Override