From bf6dccfcd254a4dd3a751cb22bb967dfaf2b3f3c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 30 Apr 2019 23:56:35 -0500 Subject: [PATCH] Beginning of work to flatten all special flowers. not compiling yet more work. almost done. Compiling and launching worlds Fix models and other bugs Cleanup ,fix flower langs and tooltips remove old specialflower blockstate json --- .../java/vazkii/botania/api/BotaniaAPI.java | 26 +- .../vazkii/botania/api/BotaniaAPIClient.java | 45 --- .../api/capability/FloatingFlowerImpl.java | 23 ++ .../api/internal/DummyMethodHandler.java | 31 +- .../botania/api/internal/DummySubTile.java | 21 -- .../api/internal/IInternalMethodHandler.java | 18 +- .../botania/api/item/IFloatingFlower.java | 54 ++- .../botania/api/item/IFlowerPlaceable.java | 4 +- .../botania/api/recipe/RecipeMiniFlower.java | 38 --- .../botania/api/recipe/RecipePureDaisy.java | 11 +- .../api/subtile/ISubTileContainer.java | 31 -- .../subtile/ISubTileSlowableContainer.java | 26 -- .../botania/api/subtile/SubTileType.java | 74 ----- ...l.java => TileEntityFunctionalFlower.java} | 31 +- ...g.java => TileEntityGeneratingFlower.java} | 45 +-- ...tity.java => TileEntitySpecialFlower.java} | 199 +++++++---- .../client/challenge/ModChallenges.java | 13 +- .../handler/BlockHighlightRenderHandler.java | 8 +- .../handler/ContributorFancinessHandler.java | 8 +- .../client/core/handler/ModelHandler.java | 83 ----- .../integration/jei/JEIBotaniaPlugin.java | 18 +- .../SpecialFloatingFlowerWrapper.java | 46 --- .../orechid/OrechidIgnemRecipeCategory.java | 5 +- .../jei/orechid/OrechidRecipeCategory.java | 4 +- .../puredaisy/PureDaisyRecipeCategory.java | 4 +- .../client/model/FloatingFlowerModel.java | 37 +-- .../client/model/SpecialFlowerModel.java | 240 -------------- .../render/tile/RenderTileFloatingFlower.java | 14 +- .../java/vazkii/botania/common/Botania.java | 5 +- .../botania/common/BotaniaRegistries.java | 20 -- .../block/BlockFloatingSpecialFlower.java | 87 ++--- .../common/block/BlockSpecialFlower.java | 90 ++--- .../botania/common/block/ModBlocks.java | 36 +- .../botania/common/block/ModSubtiles.java | 312 ++++++++++++------ .../block/decor/BlockFloatingFlower.java | 22 -- .../common/block/subtile/SubTileManastar.java | 28 +- .../block/subtile/SubTilePureDaisy.java | 31 +- .../functional/SubTileAgricarnation.java | 52 +-- .../subtile/functional/SubTileBellethorn.java | 32 +- .../subtile/functional/SubTileBergamute.java | 26 +- .../subtile/functional/SubTileBubbell.java | 50 +-- .../subtile/functional/SubTileClayconia.java | 46 ++- .../subtile/functional/SubTileDaffomill.java | 33 +- .../subtile/functional/SubTileDreadthorn.java | 11 +- .../subtile/functional/SubTileExoflame.java | 27 +- .../functional/SubTileFallenKanade.java | 23 +- .../functional/SubTileHeiseiDream.java | 28 +- .../subtile/functional/SubTileHopperhock.java | 46 ++- .../subtile/functional/SubTileHyacidus.java | 23 +- .../functional/SubTileJadedAmaranthus.java | 38 ++- .../subtile/functional/SubTileJiyuulia.java | 11 +- .../subtile/functional/SubTileLoonuim.java | 27 +- .../functional/SubTileMarimorphosis.java | 45 ++- .../subtile/functional/SubTileMedumone.java | 23 +- .../subtile/functional/SubTileOrechid.java | 42 ++- .../functional/SubTileOrechidIgnem.java | 13 +- .../functional/SubTilePollidisiac.java | 28 +- .../functional/SubTileRannuncarpus.java | 57 ++-- .../subtile/functional/SubTileSolegnolia.java | 34 +- .../functional/SubTileSpectranthemum.java | 29 +- .../functional/SubTileTangleberrie.java | 31 +- .../subtile/functional/SubTileTigerseye.java | 24 +- .../subtile/functional/SubTileVinculotus.java | 27 +- .../subtile/generating/SubTileArcaneRose.java | 23 +- .../generating/SubTileDandelifeon.java | 37 ++- .../subtile/generating/SubTileEndoflame.java | 30 +- .../generating/SubTileEntropinnyum.java | 31 +- .../generating/SubTileGourmaryllis.java | 32 +- .../generating/SubTileHydroangeas.java | 45 ++- .../subtile/generating/SubTileKekimurus.java | 35 +- .../subtile/generating/SubTileMunchdew.java | 32 +- .../subtile/generating/SubTileNarslimmus.java | 21 +- .../subtile/generating/SubTileRafflowsia.java | 83 +++-- .../subtile/generating/SubTileShulkMeNot.java | 19 +- .../subtile/generating/SubTileSpectrolus.java | 27 +- .../subtile/generating/SubTileThermalily.java | 15 +- .../common/block/tile/TileFloatingFlower.java | 65 ++-- .../block/tile/TileFloatingSpecialFlower.java | 76 ----- .../common/block/tile/TileSpecialFlower.java | 233 ------------- .../block/tile/string/TileRedStringRelay.java | 4 +- .../common/core/BotaniaCreativeTab.java | 14 +- .../core/handler/InternalMethodHandler.java | 38 +-- .../common/crafting/ModCraftingRecipes.java | 42 --- .../crafting/ModManaAlchemyRecipes.java | 6 +- .../common/crafting/ModPetalRecipes.java | 85 ++--- .../recipe/SpecialFloatingFlowerRecipe.java | 121 ------- .../common/item/ItemObedienceStick.java | 31 +- .../block/ItemBlockFloatingSpecialFlower.java | 33 -- .../item/block/ItemBlockSpecialFlower.java | 128 ++----- .../botania/common/lexicon/LexiconData.java | 5 +- .../botania/blockstates/agricarnation.json | 21 +- .../blockstates/agricarnation_chibi.json | 5 + .../blockstates/agricarnationchibi.json | 18 - .../botania/blockstates/arcanerose.json | 18 - .../botania/blockstates/bellethorn.json | 21 +- .../botania/blockstates/bellethorn_chibi.json | 5 + .../botania/blockstates/bellethornchibi.json | 18 - .../assets/botania/blockstates/bergamute.json | 21 +- .../assets/botania/blockstates/bubbell.json | 21 +- .../botania/blockstates/bubbell_chibi.json | 5 + .../botania/blockstates/bubbellchibi.json | 18 - .../assets/botania/blockstates/clayconia.json | 21 +- .../botania/blockstates/clayconia_chibi.json | 5 + .../botania/blockstates/clayconiachibi.json | 18 - .../assets/botania/blockstates/daffomill.json | 21 +- .../botania/blockstates/dandelifeon.json | 21 +- .../botania/blockstates/dreadthorn.json | 21 +- .../assets/botania/blockstates/endoflame.json | 21 +- .../botania/blockstates/entropinnyum.json | 21 +- .../assets/botania/blockstates/exoflame.json | 21 +- .../botania/blockstates/fallen_kanade.json | 5 + .../botania/blockstates/fallenkanade.json | 18 - .../botania/blockstates/gourmaryllis.json | 21 +- .../botania/blockstates/heisei_dream.json | 5 + .../botania/blockstates/heiseidream.json | 18 - .../botania/blockstates/hopperhock.json | 21 +- .../botania/blockstates/hopperhock_chibi.json | 5 + .../botania/blockstates/hopperhockchibi.json | 18 - .../assets/botania/blockstates/hyacidus.json | 21 +- .../botania/blockstates/hydroangeas.json | 21 +- .../botania/blockstates/hydroangeasdecor.json | 18 - .../botania/blockstates/jaded_amaranthus.json | 5 + .../botania/blockstates/jadedamaranthus.json | 18 - .../assets/botania/blockstates/jiyuulia.json | 21 +- .../assets/botania/blockstates/kekimurus.json | 21 +- .../assets/botania/blockstates/loonium.json | 15 +- .../assets/botania/blockstates/manastar.json | 15 +- .../botania/blockstates/marimorphosis.json | 21 +- .../blockstates/marimorphosis_chibi.json | 5 + .../blockstates/marimorphosischibi.json | 18 - .../assets/botania/blockstates/medumone.json | 21 +- .../assets/botania/blockstates/munchdew.json | 21 +- .../botania/blockstates/narslimmus.json | 21 +- .../assets/botania/blockstates/orechid.json | 21 +- .../botania/blockstates/orechid_ignem.json | 5 + .../botania/blockstates/orechidignem.json | 18 - .../botania/blockstates/pollidisiac.json | 21 +- .../botania/blockstates/pure_daisy.json | 5 + .../assets/botania/blockstates/puredaisy.json | 18 - .../botania/blockstates/rafflowsia.json | 21 +- .../botania/blockstates/rannuncarpus.json | 21 +- .../blockstates/rannuncarpus_chibi.json | 5 + .../blockstates/rannuncarpuschibi.json | 18 - .../botania/blockstates/rosa_arcana.json | 5 + .../botania/blockstates/shulk_me_not.json | 21 +- .../botania/blockstates/solegnolia.json | 21 +- .../botania/blockstates/solegnolia_chibi.json | 5 + .../botania/blockstates/solegnoliachibi.json | 18 - .../botania/blockstates/specialflower.json | 17 - .../botania/blockstates/spectranthemum.json | 21 +- .../botania/blockstates/spectrolus.json | 21 +- .../botania/blockstates/tangleberrie.json | 21 +- .../botania/blockstates/thermalily.json | 21 +- .../assets/botania/blockstates/tigerseye.json | 21 +- .../botania/blockstates/vinculotus.json | 21 +- .../resources/assets/botania/lang/de_de.json | 114 ++++--- .../resources/assets/botania/lang/en_us.json | 200 ++++++----- .../resources/assets/botania/lang/es_es.json | 183 +++++----- .../resources/assets/botania/lang/fr_fr.json | 59 ++-- .../resources/assets/botania/lang/ja_jp.json | 191 ++++++----- .../resources/assets/botania/lang/ko_kr.json | 173 +++++----- .../resources/assets/botania/lang/nl_nl.json | 211 ++++++------ .../resources/assets/botania/lang/pt_br.json | 195 ++++++----- .../resources/assets/botania/lang/ru_ru.json | 199 ++++++----- .../resources/assets/botania/lang/zh_cn.json | 199 ++++++----- .../resources/assets/botania/lang/zh_tw.json | 219 ++++++------ .../botania/models/block/agricarnation.json | 6 + .../models/block/agricarnation_chibi.json | 6 + .../botania/models/block/bellethorn.json | 6 + .../models/block/bellethorn_chibi.json | 6 + .../botania/models/block/bergamute.json | 6 + .../assets/botania/models/block/bubbell.json | 6 + .../botania/models/block/bubbell_chibi.json | 6 + .../botania/models/block/clayconia.json | 6 + .../botania/models/block/clayconia_chibi.json | 6 + .../botania/models/block/daffomill.json | 6 + .../botania/models/block/dandelifeon.json | 6 + .../botania/models/block/dreadthorn.json | 6 + .../botania/models/block/endoflame.json | 6 + .../botania/models/block/entropinnyum.json | 6 + .../assets/botania/models/block/exoflame.json | 6 + .../botania/models/block/fallen_kanade.json | 6 + .../botania/models/block/gourmaryllis.json | 6 + .../botania/models/block/heisei_dream.json | 6 + .../botania/models/block/hopperhock.json | 6 + .../models/block/hopperhock_chibi.json | 6 + .../assets/botania/models/block/hyacidus.json | 6 + .../botania/models/block/hydroangeas.json | 6 + .../models/block/jaded_amaranthus.json | 6 + .../assets/botania/models/block/jiyuulia.json | 6 + .../botania/models/block/kekimurus.json | 6 + .../assets/botania/models/block/loonium.json | 6 + .../assets/botania/models/block/manastar.json | 6 + .../botania/models/block/marimorphosis.json | 6 + .../models/block/marimorphosis_chibi.json | 6 + .../assets/botania/models/block/medumone.json | 6 + .../assets/botania/models/block/munchdew.json | 6 + .../botania/models/block/narslimmus.json | 6 + .../assets/botania/models/block/orechid.json | 6 + .../botania/models/block/orechid_ignem.json | 6 + .../botania/models/block/pollidisiac.json | 6 + .../botania/models/block/pure_daisy.json | 6 + .../botania/models/block/rafflowsia.json | 6 + .../botania/models/block/rannuncarpus.json | 6 + .../models/block/rannuncarpus_chibi.json | 6 + .../botania/models/block/rosa_arcana.json | 6 + .../botania/models/block/shulk_me_not.json | 6 + .../botania/models/block/solegnolia.json | 6 + .../models/block/solegnolia_chibi.json | 6 + .../botania/models/block/spectranthemum.json | 6 + .../botania/models/block/spectrolus.json | 6 + .../botania/models/block/tangleberrie.json | 6 + .../assets/botania/models/block/template.json | 3 - .../botania/models/block/thermalily.json | 6 + .../botania/models/block/tigerseye.json | 6 + .../botania/models/block/vinculotus.json | 6 + .../botania/models/item/agricarnation.json | 6 + .../models/item/agricarnation_chibi.json | 6 + .../botania/models/item/bellethorn.json | 6 + .../botania/models/item/bellethorn_chibi.json | 6 + .../assets/botania/models/item/bergamute.json | 6 + .../assets/botania/models/item/bubbell.json | 6 + .../botania/models/item/bubbell_chibi.json | 6 + .../assets/botania/models/item/clayconia.json | 6 + .../botania/models/item/clayconia_chibi.json | 6 + .../assets/botania/models/item/daffomill.json | 6 + .../botania/models/item/dandelifeon.json | 6 + .../botania/models/item/dreadthorn.json | 6 + .../assets/botania/models/item/endoflame.json | 6 + .../botania/models/item/entropinnyum.json | 6 + .../assets/botania/models/item/exoflame.json | 6 + .../botania/models/item/fallen_kanade.json | 6 + .../botania/models/item/gourmaryllis.json | 6 + .../botania/models/item/heisei_dream.json | 6 + .../botania/models/item/hopperhock.json | 6 + .../botania/models/item/hopperhock_chibi.json | 6 + .../assets/botania/models/item/hyacidus.json | 6 + .../botania/models/item/hydroangeas.json | 6 + .../botania/models/item/jaded_amaranthus.json | 6 + .../assets/botania/models/item/jiyuulia.json | 6 + .../assets/botania/models/item/kekimurus.json | 6 + .../assets/botania/models/item/loonium.json | 6 + .../assets/botania/models/item/manastar.json | 6 + .../botania/models/item/marimorphosis.json | 6 + .../models/item/marimorphosis_chibi.json | 6 + .../assets/botania/models/item/medumone.json | 6 + .../assets/botania/models/item/munchdew.json | 6 + .../botania/models/item/narslimmus.json | 6 + .../assets/botania/models/item/orechid.json | 6 + .../botania/models/item/orechid_ignem.json | 6 + .../botania/models/item/pollidisiac.json | 6 + .../botania/models/item/pure_daisy.json | 6 + .../botania/models/item/rafflowsia.json | 6 + .../botania/models/item/rannuncarpus.json | 6 + .../models/item/rannuncarpus_chibi.json | 6 + .../botania/models/item/rosa_arcana.json | 6 + .../botania/models/item/shulk_me_not.json | 6 + .../botania/models/item/solegnolia.json | 6 + .../botania/models/item/solegnolia_chibi.json | 6 + .../botania/models/item/spectranthemum.json | 6 + .../botania/models/item/spectrolus.json | 6 + .../botania/models/item/tangleberrie.json | 6 + .../botania/models/item/thermalily.json | 6 + .../assets/botania/models/item/tigerseye.json | 6 + .../botania/models/item/vinculotus.json | 6 + .../advancements/challenge/null_flower.json | 21 -- .../advancements/main/bubbell_pickup.json | 6 +- .../advancements/main/dandelifeon_pickup.json | 6 +- .../advancements/main/functional_flower.json | 15 +- .../advancements/main/generating_flower.json | 15 +- .../main/heisei_dream_pickup.json | 6 +- .../advancements/main/kekimurus_pickup.json | 6 +- .../advancements/main/pollidisiac_pickup.json | 6 +- .../recipes/floating_agricarnation.json | 14 + .../recipes/floating_agricarnation_chibi.json | 14 + .../botania/recipes/floating_bellethorn.json | 14 + .../recipes/floating_bellethorn_chibi.json | 14 + .../botania/recipes/floating_bergamute.json | 14 + .../botania/recipes/floating_bubbell.json | 14 + .../recipes/floating_bubbell_chibi.json | 14 + .../botania/recipes/floating_clayconia.json | 14 + .../recipes/floating_clayconia_chibi.json | 14 + .../botania/recipes/floating_daffomill.json | 14 + .../botania/recipes/floating_dandelifeon.json | 14 + .../botania/recipes/floating_dreadthorn.json | 14 + .../recipes/floating_entropinnyum.json | 14 + .../botania/recipes/floating_exoflame.json | 14 + .../recipes/floating_fallen_kanade.json | 14 + .../recipes/floating_gourmaryllis.json | 14 + .../recipes/floating_heisei_dream.json | 14 + .../botania/recipes/floating_hopperhock.json | 14 + .../recipes/floating_hopperhock_chibi.json | 14 + .../botania/recipes/floating_hyacidus.json | 14 + .../botania/recipes/floating_hydroangeas.json | 14 + .../recipes/floating_jaded_amaranthus.json | 14 + .../botania/recipes/floating_jiyuulia.json | 14 + .../botania/recipes/floating_kekimurus.json | 14 + .../botania/recipes/floating_loonium.json | 14 + .../botania/recipes/floating_manastar.json | 14 + .../recipes/floating_marimorphosis.json | 14 + .../recipes/floating_marimorphosis_chibi.json | 14 + .../botania/recipes/floating_medumone.json | 14 + .../botania/recipes/floating_munchdew.json | 14 + .../botania/recipes/floating_narslimmus.json | 14 + .../botania/recipes/floating_orechid.json | 14 + .../recipes/floating_orechid_ignem.json | 14 + .../botania/recipes/floating_pollidisiac.json | 14 + .../botania/recipes/floating_pure_daisy.json | 14 + .../botania/recipes/floating_rafflowsia.json | 14 + .../recipes/floating_rannuncarpus.json | 14 + .../recipes/floating_rannuncarpus_chibi.json | 14 + .../botania/recipes/floating_rosa_arcana.json | 14 + .../recipes/floating_shulk_me_not.json | 14 + .../botania/recipes/floating_solegnolia.json | 14 + .../recipes/floating_solegnolia_chibi.json | 14 + .../recipes/floating_spectranthemum.json | 14 + .../botania/recipes/floating_spectrolus.json | 14 + .../recipes/floating_tangleberrie.json | 14 + .../botania/recipes/floating_thermalily.json | 14 + .../botania/recipes/floating_tigerseye.json | 14 + .../botania/recipes/floating_vinculotus.json | 14 + .../botania/tags/blocks/floating_flowers.json | 7 + .../blocks/functional_special_flowers.json | 39 +++ .../blocks/generating_special_flowers.json | 18 + .../tags/blocks/misc_special_flowers.json | 7 + .../tags/blocks/mundane_floating_flowers.json | 22 ++ .../tags/blocks/special_floating_flowers.json | 55 +++ .../botania/tags/blocks/special_flowers.json | 8 + .../botania/tags/items/floating_flowers.json | 7 + .../items/functional_special_flowers.json | 39 +++ .../items/generating_special_flowers.json | 18 + .../tags/items/misc_special_flowers.json | 7 + .../tags/items/mundane_floating_flowers.json | 22 ++ .../tags/items/special_floating_flowers.json | 55 +++ .../botania/tags/items/special_flowers.json | 8 + 335 files changed, 4240 insertions(+), 4364 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/capability/FloatingFlowerImpl.java delete mode 100644 src/main/java/vazkii/botania/api/internal/DummySubTile.java delete mode 100644 src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java delete mode 100644 src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java delete mode 100644 src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java delete mode 100644 src/main/java/vazkii/botania/api/subtile/SubTileType.java rename src/main/java/vazkii/botania/api/subtile/{SubTileFunctional.java => TileEntityFunctionalFlower.java} (80%) rename src/main/java/vazkii/botania/api/subtile/{SubTileGenerating.java => TileEntityGeneratingFlower.java} (82%) rename src/main/java/vazkii/botania/api/subtile/{SubTileEntity.java => TileEntitySpecialFlower.java} (54%) delete mode 100644 src/main/java/vazkii/botania/client/integration/jei/crafting/SpecialFloatingFlowerWrapper.java delete mode 100644 src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java delete mode 100644 src/main/java/vazkii/botania/common/BotaniaRegistries.java delete mode 100644 src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java delete mode 100644 src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java delete mode 100644 src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java create mode 100644 src/main/resources/assets/botania/blockstates/agricarnation_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/agricarnationchibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/arcanerose.json create mode 100644 src/main/resources/assets/botania/blockstates/bellethorn_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/bellethornchibi.json create mode 100644 src/main/resources/assets/botania/blockstates/bubbell_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/bubbellchibi.json create mode 100644 src/main/resources/assets/botania/blockstates/clayconia_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/clayconiachibi.json create mode 100644 src/main/resources/assets/botania/blockstates/fallen_kanade.json delete mode 100644 src/main/resources/assets/botania/blockstates/fallenkanade.json create mode 100644 src/main/resources/assets/botania/blockstates/heisei_dream.json delete mode 100644 src/main/resources/assets/botania/blockstates/heiseidream.json create mode 100644 src/main/resources/assets/botania/blockstates/hopperhock_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/hopperhockchibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/hydroangeasdecor.json create mode 100644 src/main/resources/assets/botania/blockstates/jaded_amaranthus.json delete mode 100644 src/main/resources/assets/botania/blockstates/jadedamaranthus.json create mode 100644 src/main/resources/assets/botania/blockstates/marimorphosis_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/marimorphosischibi.json create mode 100644 src/main/resources/assets/botania/blockstates/orechid_ignem.json delete mode 100644 src/main/resources/assets/botania/blockstates/orechidignem.json create mode 100644 src/main/resources/assets/botania/blockstates/pure_daisy.json delete mode 100644 src/main/resources/assets/botania/blockstates/puredaisy.json create mode 100644 src/main/resources/assets/botania/blockstates/rannuncarpus_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json create mode 100644 src/main/resources/assets/botania/blockstates/rosa_arcana.json create mode 100644 src/main/resources/assets/botania/blockstates/solegnolia_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/solegnoliachibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/specialflower.json create mode 100644 src/main/resources/assets/botania/models/block/agricarnation.json create mode 100644 src/main/resources/assets/botania/models/block/agricarnation_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/bellethorn.json create mode 100644 src/main/resources/assets/botania/models/block/bellethorn_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/bergamute.json create mode 100644 src/main/resources/assets/botania/models/block/bubbell.json create mode 100644 src/main/resources/assets/botania/models/block/bubbell_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/clayconia.json create mode 100644 src/main/resources/assets/botania/models/block/clayconia_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/daffomill.json create mode 100644 src/main/resources/assets/botania/models/block/dandelifeon.json create mode 100644 src/main/resources/assets/botania/models/block/dreadthorn.json create mode 100644 src/main/resources/assets/botania/models/block/endoflame.json create mode 100644 src/main/resources/assets/botania/models/block/entropinnyum.json create mode 100644 src/main/resources/assets/botania/models/block/exoflame.json create mode 100644 src/main/resources/assets/botania/models/block/fallen_kanade.json create mode 100644 src/main/resources/assets/botania/models/block/gourmaryllis.json create mode 100644 src/main/resources/assets/botania/models/block/heisei_dream.json create mode 100644 src/main/resources/assets/botania/models/block/hopperhock.json create mode 100644 src/main/resources/assets/botania/models/block/hopperhock_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/hyacidus.json create mode 100644 src/main/resources/assets/botania/models/block/hydroangeas.json create mode 100644 src/main/resources/assets/botania/models/block/jaded_amaranthus.json create mode 100644 src/main/resources/assets/botania/models/block/jiyuulia.json create mode 100644 src/main/resources/assets/botania/models/block/kekimurus.json create mode 100644 src/main/resources/assets/botania/models/block/loonium.json create mode 100644 src/main/resources/assets/botania/models/block/manastar.json create mode 100644 src/main/resources/assets/botania/models/block/marimorphosis.json create mode 100644 src/main/resources/assets/botania/models/block/marimorphosis_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/medumone.json create mode 100644 src/main/resources/assets/botania/models/block/munchdew.json create mode 100644 src/main/resources/assets/botania/models/block/narslimmus.json create mode 100644 src/main/resources/assets/botania/models/block/orechid.json create mode 100644 src/main/resources/assets/botania/models/block/orechid_ignem.json create mode 100644 src/main/resources/assets/botania/models/block/pollidisiac.json create mode 100644 src/main/resources/assets/botania/models/block/pure_daisy.json create mode 100644 src/main/resources/assets/botania/models/block/rafflowsia.json create mode 100644 src/main/resources/assets/botania/models/block/rannuncarpus.json create mode 100644 src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/rosa_arcana.json create mode 100644 src/main/resources/assets/botania/models/block/shulk_me_not.json create mode 100644 src/main/resources/assets/botania/models/block/solegnolia.json create mode 100644 src/main/resources/assets/botania/models/block/solegnolia_chibi.json create mode 100644 src/main/resources/assets/botania/models/block/spectranthemum.json create mode 100644 src/main/resources/assets/botania/models/block/spectrolus.json create mode 100644 src/main/resources/assets/botania/models/block/tangleberrie.json delete mode 100644 src/main/resources/assets/botania/models/block/template.json create mode 100644 src/main/resources/assets/botania/models/block/thermalily.json create mode 100644 src/main/resources/assets/botania/models/block/tigerseye.json create mode 100644 src/main/resources/assets/botania/models/block/vinculotus.json create mode 100644 src/main/resources/assets/botania/models/item/agricarnation.json create mode 100644 src/main/resources/assets/botania/models/item/agricarnation_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/bellethorn.json create mode 100644 src/main/resources/assets/botania/models/item/bellethorn_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/bergamute.json create mode 100644 src/main/resources/assets/botania/models/item/bubbell.json create mode 100644 src/main/resources/assets/botania/models/item/bubbell_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/clayconia.json create mode 100644 src/main/resources/assets/botania/models/item/clayconia_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/daffomill.json create mode 100644 src/main/resources/assets/botania/models/item/dandelifeon.json create mode 100644 src/main/resources/assets/botania/models/item/dreadthorn.json create mode 100644 src/main/resources/assets/botania/models/item/endoflame.json create mode 100644 src/main/resources/assets/botania/models/item/entropinnyum.json create mode 100644 src/main/resources/assets/botania/models/item/exoflame.json create mode 100644 src/main/resources/assets/botania/models/item/fallen_kanade.json create mode 100644 src/main/resources/assets/botania/models/item/gourmaryllis.json create mode 100644 src/main/resources/assets/botania/models/item/heisei_dream.json create mode 100644 src/main/resources/assets/botania/models/item/hopperhock.json create mode 100644 src/main/resources/assets/botania/models/item/hopperhock_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/hyacidus.json create mode 100644 src/main/resources/assets/botania/models/item/hydroangeas.json create mode 100644 src/main/resources/assets/botania/models/item/jaded_amaranthus.json create mode 100644 src/main/resources/assets/botania/models/item/jiyuulia.json create mode 100644 src/main/resources/assets/botania/models/item/kekimurus.json create mode 100644 src/main/resources/assets/botania/models/item/loonium.json create mode 100644 src/main/resources/assets/botania/models/item/manastar.json create mode 100644 src/main/resources/assets/botania/models/item/marimorphosis.json create mode 100644 src/main/resources/assets/botania/models/item/marimorphosis_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/medumone.json create mode 100644 src/main/resources/assets/botania/models/item/munchdew.json create mode 100644 src/main/resources/assets/botania/models/item/narslimmus.json create mode 100644 src/main/resources/assets/botania/models/item/orechid.json create mode 100644 src/main/resources/assets/botania/models/item/orechid_ignem.json create mode 100644 src/main/resources/assets/botania/models/item/pollidisiac.json create mode 100644 src/main/resources/assets/botania/models/item/pure_daisy.json create mode 100644 src/main/resources/assets/botania/models/item/rafflowsia.json create mode 100644 src/main/resources/assets/botania/models/item/rannuncarpus.json create mode 100644 src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/rosa_arcana.json create mode 100644 src/main/resources/assets/botania/models/item/shulk_me_not.json create mode 100644 src/main/resources/assets/botania/models/item/solegnolia.json create mode 100644 src/main/resources/assets/botania/models/item/solegnolia_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/spectranthemum.json create mode 100644 src/main/resources/assets/botania/models/item/spectrolus.json create mode 100644 src/main/resources/assets/botania/models/item/tangleberrie.json create mode 100644 src/main/resources/assets/botania/models/item/thermalily.json create mode 100644 src/main/resources/assets/botania/models/item/tigerseye.json create mode 100644 src/main/resources/assets/botania/models/item/vinculotus.json delete mode 100644 src/main/resources/data/botania/advancements/challenge/null_flower.json create mode 100644 src/main/resources/data/botania/recipes/floating_agricarnation.json create mode 100644 src/main/resources/data/botania/recipes/floating_agricarnation_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_bellethorn.json create mode 100644 src/main/resources/data/botania/recipes/floating_bellethorn_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_bergamute.json create mode 100644 src/main/resources/data/botania/recipes/floating_bubbell.json create mode 100644 src/main/resources/data/botania/recipes/floating_bubbell_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_clayconia.json create mode 100644 src/main/resources/data/botania/recipes/floating_clayconia_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_daffomill.json create mode 100644 src/main/resources/data/botania/recipes/floating_dandelifeon.json create mode 100644 src/main/resources/data/botania/recipes/floating_dreadthorn.json create mode 100644 src/main/resources/data/botania/recipes/floating_entropinnyum.json create mode 100644 src/main/resources/data/botania/recipes/floating_exoflame.json create mode 100644 src/main/resources/data/botania/recipes/floating_fallen_kanade.json create mode 100644 src/main/resources/data/botania/recipes/floating_gourmaryllis.json create mode 100644 src/main/resources/data/botania/recipes/floating_heisei_dream.json create mode 100644 src/main/resources/data/botania/recipes/floating_hopperhock.json create mode 100644 src/main/resources/data/botania/recipes/floating_hopperhock_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_hyacidus.json create mode 100644 src/main/resources/data/botania/recipes/floating_hydroangeas.json create mode 100644 src/main/resources/data/botania/recipes/floating_jaded_amaranthus.json create mode 100644 src/main/resources/data/botania/recipes/floating_jiyuulia.json create mode 100644 src/main/resources/data/botania/recipes/floating_kekimurus.json create mode 100644 src/main/resources/data/botania/recipes/floating_loonium.json create mode 100644 src/main/resources/data/botania/recipes/floating_manastar.json create mode 100644 src/main/resources/data/botania/recipes/floating_marimorphosis.json create mode 100644 src/main/resources/data/botania/recipes/floating_marimorphosis_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_medumone.json create mode 100644 src/main/resources/data/botania/recipes/floating_munchdew.json create mode 100644 src/main/resources/data/botania/recipes/floating_narslimmus.json create mode 100644 src/main/resources/data/botania/recipes/floating_orechid.json create mode 100644 src/main/resources/data/botania/recipes/floating_orechid_ignem.json create mode 100644 src/main/resources/data/botania/recipes/floating_pollidisiac.json create mode 100644 src/main/resources/data/botania/recipes/floating_pure_daisy.json create mode 100644 src/main/resources/data/botania/recipes/floating_rafflowsia.json create mode 100644 src/main/resources/data/botania/recipes/floating_rannuncarpus.json create mode 100644 src/main/resources/data/botania/recipes/floating_rannuncarpus_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_rosa_arcana.json create mode 100644 src/main/resources/data/botania/recipes/floating_shulk_me_not.json create mode 100644 src/main/resources/data/botania/recipes/floating_solegnolia.json create mode 100644 src/main/resources/data/botania/recipes/floating_solegnolia_chibi.json create mode 100644 src/main/resources/data/botania/recipes/floating_spectranthemum.json create mode 100644 src/main/resources/data/botania/recipes/floating_spectrolus.json create mode 100644 src/main/resources/data/botania/recipes/floating_tangleberrie.json create mode 100644 src/main/resources/data/botania/recipes/floating_thermalily.json create mode 100644 src/main/resources/data/botania/recipes/floating_tigerseye.json create mode 100644 src/main/resources/data/botania/recipes/floating_vinculotus.json create mode 100644 src/main/resources/data/botania/tags/blocks/floating_flowers.json create mode 100644 src/main/resources/data/botania/tags/blocks/functional_special_flowers.json create mode 100644 src/main/resources/data/botania/tags/blocks/generating_special_flowers.json create mode 100644 src/main/resources/data/botania/tags/blocks/misc_special_flowers.json create mode 100644 src/main/resources/data/botania/tags/blocks/mundane_floating_flowers.json create mode 100644 src/main/resources/data/botania/tags/blocks/special_floating_flowers.json create mode 100644 src/main/resources/data/botania/tags/blocks/special_flowers.json create mode 100644 src/main/resources/data/botania/tags/items/floating_flowers.json create mode 100644 src/main/resources/data/botania/tags/items/functional_special_flowers.json create mode 100644 src/main/resources/data/botania/tags/items/generating_special_flowers.json create mode 100644 src/main/resources/data/botania/tags/items/misc_special_flowers.json create mode 100644 src/main/resources/data/botania/tags/items/mundane_floating_flowers.json create mode 100644 src/main/resources/data/botania/tags/items/special_floating_flowers.json create mode 100644 src/main/resources/data/botania/tags/items/special_flowers.json diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 0c6c5f85b..5de879d1d 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -11,15 +11,9 @@ package vazkii.botania.api; import com.google.common.base.Preconditions; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; import net.minecraft.block.Block; -import net.minecraft.block.BlockCarpet; -import net.minecraft.block.BlockStainedGlass; -import net.minecraft.block.BlockStainedGlassPane; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumDyeColor; @@ -28,42 +22,32 @@ import net.minecraft.item.IArmorMaterial; import net.minecraft.item.IItemTier; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.state.EnumProperty; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraft.util.registry.RegistryNamespaced; -import net.minecraft.util.registry.RegistryNamespacedDefaultedByKey; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.DummyMethodHandler; -import vazkii.botania.api.internal.DummySubTile; import vazkii.botania.api.internal.IInternalMethodHandler; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.recipe.RecipeMiniFlower; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; -import vazkii.botania.api.wiki.IWikiProvider; -import vazkii.botania.api.wiki.SimpleWikiProvider; -import vazkii.botania.api.wiki.WikiHooks; -import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -72,6 +56,8 @@ import java.util.Set; import java.util.function.Function; public final class BotaniaAPI { + @CapabilityInject(IFloatingFlower.class) + public static Capability FLOATING_FLOWER_CAP; private static final List categories = new ArrayList<>(); private static final List allEntries = new ArrayList<>(); @@ -88,8 +74,6 @@ public final class BotaniaAPI { public static final List brewRecipes = new ArrayList<>(); public static final List miniFlowerRecipes = new ArrayList<>(); - public static final ResourceLocation DUMMY_SUBTILE_NAME = new ResourceLocation("botania", "dummy"); - public static Map oreWeights = Collections.emptyMap(); public static Map oreWeightsNether = Collections.emptyMap(); diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index b8599a7d7..5d3bf8031 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -14,7 +14,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.subtile.SubTileEntity; import java.util.Collections; import java.util.Map; @@ -25,55 +24,11 @@ import java.util.Map; @OnlyIn(Dist.CLIENT) public final class BotaniaAPIClient { - private static final Map subtileBlockModels = Maps.newHashMap(); - private static final Map subtileItemModels = Maps.newHashMap(); private static final Map islandTypeModels = Maps.newHashMap(); private BotaniaAPIClient() { } - /** - * Register your model for the given subtile class here. - * Call this during {@code ModelRegistryEvent}. Calling it anytime after blockModels have already baked does not guarantee that your model will work. - * Your model json must specify key "tintindex" in all the faces it wants tint applied. - * Tint is applied whenever a player recolors the flower using floral dye - * - * @param subTileName The String ID of the subtile - * @param model A path to a blockstate json and variant to be used for this subtile - * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form - */ - public static void registerSubtileModel(ResourceLocation subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { - subtileBlockModels.put(subTileName, model); - subtileItemModels.put(subTileName, itemModel); - } - - /** - * Register your model for the given subtile class here. - * Call this DURING PREINIT. - * Your model json must specify key "tintindex" in all the faces it wants tint applied. - * Tint is applied whenever a player recolors the flower using floral dye - * - * @param subTileName The String ID of the subtile - * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" - */ - public static void registerSubtileModel(ResourceLocation subTileName, ModelResourceLocation model) { - registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getNamespace() + ":" + model.getPath(), "inventory")); - } - - /** - * @return An immutable and live view of the registered subtile block model map - */ - public static Map getRegisteredSubtileBlockModels() { - return Collections.unmodifiableMap(subtileBlockModels); - } - - /** - * @return An immutable and live view of the registered subtile item model map - */ - public static Map getRegisteredSubtileItemModels() { - return Collections.unmodifiableMap(subtileItemModels); - } - /** * Registers your model for island type islandType here. * Call this during {@code ModelRegistryEvent}. diff --git a/src/main/java/vazkii/botania/api/capability/FloatingFlowerImpl.java b/src/main/java/vazkii/botania/api/capability/FloatingFlowerImpl.java new file mode 100644 index 000000000..e8682ec75 --- /dev/null +++ b/src/main/java/vazkii/botania/api/capability/FloatingFlowerImpl.java @@ -0,0 +1,23 @@ +package vazkii.botania.api.capability; + +import net.minecraft.item.ItemStack; +import vazkii.botania.api.item.IFloatingFlower; + +public class FloatingFlowerImpl implements IFloatingFlower { + private IslandType type = IslandType.GRASS; + + @Override + public ItemStack getDisplayStack() { + return ItemStack.EMPTY; + } + + @Override + public IslandType getIslandType() { + return type; + } + + @Override + public void setIslandType(IslandType type) { + this.type = type; + } +} diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index b76e70a0e..ef242769c 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -13,7 +13,6 @@ package vazkii.botania.api.internal; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -31,8 +30,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import java.util.List; @@ -117,31 +115,6 @@ public class DummyMethodHandler implements IInternalMethodHandler { return new DummyPage(key); } - @Override - public ItemStack getSubTileAsStack(SubTileType subTile) { - return ItemStack.EMPTY; - } - - @Override - public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile) { - return getSubTileAsStack(subTile); - } - - @Override - public SubTileType getStackSubTileKey(ItemStack stack) { - return null; - } - - @Override - public ModelResourceLocation getSubTileBlockModelForName(String name) { - return new ModelResourceLocation("builtin/missing", "missing"); - } - - @Override - public ModelResourceLocation getSubTileItemModelForName(String name) { - return new ModelResourceLocation("builtin/missing", "missing"); - } - @Override public IManaNetwork getManaNetworkInstance() { return DummyManaNetwork.instance; @@ -154,7 +127,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ItemStack bindDisplay, boolean properlyBound) {} @Override - public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { + public ItemStack getBindDisplayForFlowerType(TileEntitySpecialFlower e) { return ItemStack.EMPTY; } diff --git a/src/main/java/vazkii/botania/api/internal/DummySubTile.java b/src/main/java/vazkii/botania/api/internal/DummySubTile.java deleted file mode 100644 index c3a8c181e..000000000 --- a/src/main/java/vazkii/botania/api/internal/DummySubTile.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 24, 2014, 4:17:33 PM (GMT)] - */ -package vazkii.botania.api.internal; - -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; - -public class DummySubTile extends SubTileEntity { - - public DummySubTile(SubTileType type) { - super(type); - } -} diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index d17abba34..b3c399986 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -13,7 +13,6 @@ package vazkii.botania.api.internal; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -33,8 +32,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import java.util.List; @@ -79,18 +77,6 @@ public interface IInternalMethodHandler { public IManaNetwork getManaNetworkInstance(); - public ItemStack getSubTileAsStack(SubTileType subTile); - - public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile); - - public SubTileType getStackSubTileKey(ItemStack stack); - - @OnlyIn(Dist.CLIENT) - public ModelResourceLocation getSubTileBlockModelForName(String name); - - @OnlyIn(Dist.CLIENT) - public ModelResourceLocation getSubTileItemModelForName(String name); - public boolean shouldForceCheck(); public int getPassiveFlowerDecay(); @@ -107,7 +93,7 @@ public interface IInternalMethodHandler { @OnlyIn(Dist.CLIENT) public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ItemStack bindDisplay, boolean properlyBound); - public ItemStack getBindDisplayForFlowerType(SubTileEntity e); + public ItemStack getBindDisplayForFlowerType(TileEntitySpecialFlower e); public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText); diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index b76ad823c..179b3b70a 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -11,19 +11,51 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.INBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nullable; import java.util.HashMap; +import java.util.Map; +/** + * A capability interface marking a TE as a floating flower + */ public interface IFloatingFlower { - public ItemStack getDisplayStack(); + /** + * @return The itemstack to display on top of the island + */ + ItemStack getDisplayStack(); - public IslandType getIslandType(); + IslandType getIslandType(); - public void setIslandType(IslandType type); + void setIslandType(IslandType type); - public class IslandType { - private static final HashMap registry = new HashMap<>(); + class Storage implements Capability.IStorage { + @Nullable + @Override + public INBTBase writeNBT(Capability capability, IFloatingFlower instance, EnumFacing side) { + NBTTagCompound ret = new NBTTagCompound(); + ret.putString("islandType", instance.getIslandType().typeName); + return ret; + } + + @Override + public void readNBT(Capability capability, IFloatingFlower instance, EnumFacing side, INBTBase nbt) { + if(nbt instanceof NBTTagCompound) { + IslandType t = IslandType.ofType(((NBTTagCompound) nbt).getString("islandType")); + if(t != null) { + instance.setIslandType(t); + } + } + } + } + + class IslandType { + private static final Map registry = new HashMap<>(); public static final IslandType GRASS = new IslandType("GRASS"); public static final IslandType PODZOL = new IslandType("PODZOL"); @@ -44,14 +76,18 @@ public interface IFloatingFlower { * @param name The name of this floating flower island type */ public IslandType(String name) { - if (registry.containsKey(name)) throw new IllegalArgumentException(name+" already registered!"); typeName = name; - registry.put(name, this); + synchronized (registry) { + if (registry.containsKey(name)) throw new IllegalArgumentException(name+" already registered!"); + registry.put(name, this); + } } public static IslandType ofType(String typeStr) { - IslandType type = registry.get(typeStr); - return type == null ? GRASS : type; + synchronized (registry) { + IslandType type = registry.get(typeStr); + return type == null ? GRASS : type; + } } @Override diff --git a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java index 097c2303c..d1d037aee 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.item; import net.minecraft.item.BlockItemUseContext; -import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; /** * An Item that implements this can be placed by a Rannuncarpus. @@ -21,5 +21,5 @@ public interface IFlowerPlaceable { * @param ctx The placement context, aiming downwards towards the downward neighbor position * @return Whether the block was placed successfully */ - boolean tryPlace(SubTileEntity flower, BlockItemUseContext ctx); + boolean tryPlace(TileEntitySpecialFlower flower, BlockItemUseContext ctx); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java deleted file mode 100644 index f526c928b..000000000 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 22, 2015, 5:57:59 PM (GMT)] - */ -package vazkii.botania.api.recipe; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileType; - -public class RecipeMiniFlower extends RecipeManaInfusion { - - public RecipeMiniFlower(SubTileType mini, SubTileType flower, int mana) { - super(mini.getRegistryName(), BotaniaAPI.internalHandler.getSubTileAsStack(mini), Ingredient.fromStacks(BotaniaAPI.internalHandler.getSubTileAsStack(flower)), mana); - setCatalyst(RecipeManaInfusion.alchemy.getDefaultState()); - } - - @Override - public boolean matches(ItemStack stack) { - ResourceLocation key = BotaniaAPI.internalHandler.getStackSubTileKey(stack).getRegistryName(); - ItemStack[] matching = getInput().getMatchingStacks(); - if(matching.length == 0) - return false; - - - ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(matching[0]).getRegistryName(); - return key != null && key.equals(input); - } - -} diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index d895dae95..5d93c2414 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -13,15 +13,10 @@ package vazkii.botania.api.recipe; import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; import net.minecraft.tags.Tag; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.subtile.SubTileEntity; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; public class RecipePureDaisy { @@ -48,7 +43,7 @@ public class RecipePureDaisy { /** * This gets called every tick, please be careful with your checks. */ - public boolean matches(World world, BlockPos pos, SubTileEntity pureDaisy, IBlockState state) { + public boolean matches(World world, BlockPos pos, TileEntitySpecialFlower pureDaisy, IBlockState state) { if(input instanceof Block) return state.getBlock() == input; @@ -63,7 +58,7 @@ public class RecipePureDaisy { * Should only place the block if !world.isRemote, but should return true if it would've placed * it otherwise. You may return false to cancel the normal particles and do your own. */ - public boolean set(World world, BlockPos pos, SubTileEntity pureDaisy) { + public boolean set(World world, BlockPos pos, TileEntitySpecialFlower pureDaisy) { if(!world.isRemote) world.setBlockState(pos, outputState); return true; diff --git a/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java b/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java deleted file mode 100644 index c14ba889b..000000000 --- a/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 26, 2014, 5:42:16 PM (GMT)] - */ -package vazkii.botania.api.subtile; - -import net.minecraft.util.ResourceLocation; - -/** - * A TileEntity that implements this contains a SubTileEntity. - */ -public interface ISubTileContainer { - - /** - * Gets the SubTile in this block. Generally shouldn't return null, but in that - * case use the fallback DummySubTile. - */ - public SubTileEntity getSubTile(); - - /** - * Sets the SubTile on this block from it's name. - */ - public void setSubTile(SubTileType type); - -} diff --git a/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java b/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java deleted file mode 100644 index f32629ac1..000000000 --- a/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [29/12/2015, 23:00:06 (GMT)] - */ -package vazkii.botania.api.subtile; - -/** - * An extension of ISubTileContainer that allows for the SubTile to be "slowed down". - * Slowing down is the action that happens when a flower is planted in Podzol or Mycellium. - * Any flowers that pick up items from the ground should have a delay on the time the item - * needs to be on the floor equal to the value of getSlowDownFactor(). - */ -public interface ISubTileSlowableContainer extends ISubTileContainer { - - public static final int SLOWDOWN_FACTOR_PODZOL = 5; - public static final int SLOWDOWN_FACTOR_MYCEL = 10; - - public int getSlowdownFactor(); - -} diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileType.java b/src/main/java/vazkii/botania/api/subtile/SubTileType.java deleted file mode 100644 index 66bb30310..000000000 --- a/src/main/java/vazkii/botania/api/subtile/SubTileType.java +++ /dev/null @@ -1,74 +0,0 @@ -package vazkii.botania.api.subtile; - -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraftforge.registries.ForgeRegistryEntry; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.function.Function; - -/** - * Analog to {@link net.minecraft.tileentity.TileEntityType}, but for subtiles - */ -public class SubTileType extends ForgeRegistryEntry { - public static final String SPECIAL_FLOWER_PREFIX = "flower."; - public static final String GENERATING_TYPE = "botania.flowerType.generating"; - public static final String FUNCTIONAL_TYPE = "botania.flowerType.generating"; - public static final String MISC_TYPE = "botania.flowerType.misc"; - - private final String type; - private final Function factory; - private boolean showInCreative = true; - - /** - * @param typeKey Translation key for this subtile type, usually {@link #GENERATING_TYPE} or {@link #FUNCTIONAL_TYPE} - * @param factory Function to create new subtiles of this type - */ - public SubTileType(String typeKey, Function factory) { - this.type = typeKey; - this.factory = Preconditions.checkNotNull(factory); - } - - public SubTileType setShowInCreative(boolean show) { - this.showInCreative = show; - return this; - } - - public boolean shouldShowInCreative() { - return showInCreative; - } - - public String getTranslationKey(ItemStack stack) { - String id = getRegistryName().toString().replaceAll(":", "."); - return "block." + SPECIAL_FLOWER_PREFIX + id; - } - - /** - * Gets the lore text for the flower item, displayed in the item's tooltip. - */ - @Nullable - public ITextComponent getLore(ItemStack stack) { - String id = getRegistryName().toString().replaceAll(":", "."); - return new TextComponentTranslation("block." + SPECIAL_FLOWER_PREFIX + id + ".reference"); - } - - public SubTileEntity create() { - return this.factory.apply(this); - } - - public String getType() { - return type; - } - - /** - * Adds additional text to the tooltip. This text is added before {@link #getLore(ItemStack)} - */ - public void addTooltip(ItemStack stack, World world, List tooltip) { - tooltip.add(new TextComponentTranslation(getType()).applyTextStyle(TextFormatting.BLUE)); - } -} diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java similarity index 80% rename from src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java rename to src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java index 912569898..ffe39e43e 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; @@ -31,7 +32,7 @@ import java.awt.Color; /** * The basic class for a Functional Flower. */ -public class SubTileFunctional extends SubTileEntity { +public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { public static final int LINK_RANGE = 10; @@ -51,7 +52,7 @@ public class SubTileFunctional extends SubTileEntity { BlockPos cachedPoolCoordinates = null; - public SubTileFunctional(SubTileType type) { + public TileEntityFunctionalFlower(TileEntityType type) { super(type); } @@ -63,8 +64,8 @@ public class SubTileFunctional extends SubTileEntity { } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); linkPool(); @@ -80,16 +81,16 @@ public class SubTileFunctional extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; for(EnumFacing dir : EnumFacing.values()) { - int redstoneSide = supertile.getWorld().getRedstonePower(supertile.getPos().offset(dir), dir); + int redstoneSide = getWorld().getRedstonePower(getPos().offset(dir), dir); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } - if(supertile.getWorld().isRemote) { + if(getWorld().isRemote) { double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F; Color color = new Color(getColor()); if(Math.random() > particleChance) - BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.getPos().getX() + 0.3 + Math.random() * 0.5, supertile.getPos().getY() + 0.5 + Math.random() * 0.5, supertile.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + BotaniaAPI.internalHandler.sparkleFX(getWorld(), getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() + 0.5 + Math.random() * 0.5, getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } } @@ -100,9 +101,9 @@ public class SubTileFunctional extends SubTileEntity { if(cachedPoolCoordinates != null) { needsNew = false; - if(supertile.getWorld().isBlockLoaded(cachedPoolCoordinates)) { + if(getWorld().isBlockLoaded(cachedPoolCoordinates)) { needsNew = true; - TileEntity tileAt = supertile.getWorld().getTileEntity(cachedPoolCoordinates); + TileEntity tileAt = getWorld().getTileEntity(cachedPoolCoordinates); if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isRemoved()) { linkedPool = tileAt; needsNew = false; @@ -111,16 +112,16 @@ public class SubTileFunctional extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorld().getTileEntity(linkedPool.getPos()); + TileEntity tileAt = getWorld().getTileEntity(linkedPool.getPos()); if(tileAt != null && tileAt instanceof IManaPool) linkedPool = tileAt; } if(needsNew && ticksExisted == 1) { // Only for new flowers IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); - int size = network.getAllPoolsInWorld(supertile.getWorld()).size(); + int size = network.getAllPoolsInWorld(getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - linkedPool = network.getClosestPool(supertile.getPos(), supertile.getWorld(), LINK_RANGE); + linkedPool = network.getClosestPool(getPos(), getWorld(), LINK_RANGE); sizeLastCheck = size; } } @@ -202,7 +203,7 @@ public class SubTileFunctional extends SubTileEntity { int range = 10; range *= range; - double dist = pos.distanceSq(supertile.getPos()); + double dist = pos.distanceSq(getPos()); if(range >= dist) { TileEntity tile = player.world.getTileEntity(pos); if(tile instanceof IManaPool) { @@ -215,13 +216,13 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && linkedPool.hasWorld() && !linkedPool.isRemoved() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; + return linkedPool != null && linkedPool.hasWorld() && !linkedPool.isRemoved() && getWorld().isBlockLoaded(linkedPool.getPos(), false) && getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc) { - String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.format(getBlockState().getBlock().getTranslationKey()); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java similarity index 82% rename from src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java rename to src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index 48cf4595d..9b919f741 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -20,6 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; @@ -38,7 +39,7 @@ import java.util.List; /** * The basic class for a Generating Flower. */ -public class SubTileGenerating extends SubTileEntity { +public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { public static final int LINK_RANGE = 6; @@ -60,7 +61,7 @@ public class SubTileGenerating extends SubTileEntity { BlockPos cachedCollectorCoordinates = null; - public SubTileGenerating(SubTileType type) { + public TileEntityGeneratingFlower(TileEntityType type) { super(type); } @@ -72,14 +73,14 @@ public class SubTileGenerating extends SubTileEntity { } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); linkCollector(); if(canGeneratePassively()) { int delay = getDelayBetweenPassiveGeneration(); - if(delay > 0 && ticksExisted % delay == 0 && !supertile.getWorld().isRemote) { + if(delay > 0 && ticksExisted % delay == 0 && !getWorld().isRemote) { if(shouldSyncPassiveGeneration()) sync(); addMana(getValueForPassiveGeneration()); @@ -90,12 +91,12 @@ public class SubTileGenerating extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; for(EnumFacing dir : EnumFacing.values()) { - int redstoneSide = supertile.getWorld().getRedstonePower(supertile.getPos().offset(dir), dir); + int redstoneSide = getWorld().getRedstonePower(getPos().offset(dir), dir); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } - if(supertile.getWorld().isRemote) { + if(getWorld().isRemote) { double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F; Color color = new Color(getColor()); if(Math.random() > particleChance) { @@ -103,20 +104,20 @@ public class SubTileGenerating extends SubTileEntity { double x = getPos().getX() + offset.x; double y = getPos().getY() + offset.y; double z = getPos().getZ() + offset.z; - BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), x + 0.3 + Math.random() * 0.5, y + 0.5 + Math.random() * 0.5, z + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + BotaniaAPI.internalHandler.sparkleFX(getWorld(), x + 0.3 + Math.random() * 0.5, y + 0.5 + Math.random() * 0.5, z + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } } boolean passive = isPassiveFlower(); - if(!supertile.getWorld().isRemote) { + if(!getWorld().isRemote) { int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay(); if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { - IBlockState state = supertile.getWorld().getBlockState(supertile.getPos()); - supertile.getWorld().playEvent(2001, supertile.getPos(), Block.getStateId(state)); - if(Blocks.DEAD_BUSH.getDefaultState().isValidPosition(supertile.getWorld(), supertile.getPos())) - supertile.getWorld().setBlockState(supertile.getPos(), Blocks.DEAD_BUSH.getDefaultState()); - else supertile.getWorld().removeBlock(supertile.getPos()); + IBlockState state = getWorld().getBlockState(getPos()); + getWorld().playEvent(2001, getPos(), Block.getStateId(state)); + if(Blocks.DEAD_BUSH.getDefaultState().isValidPosition(getWorld(), getPos())) + getWorld().setBlockState(getPos(), Blocks.DEAD_BUSH.getDefaultState()); + else getWorld().removeBlock(getPos()); } } @@ -131,9 +132,9 @@ public class SubTileGenerating extends SubTileEntity { if(cachedCollectorCoordinates != null) { needsNew = false; - if(supertile.getWorld().isBlockLoaded(cachedCollectorCoordinates)) { + if(getWorld().isBlockLoaded(cachedCollectorCoordinates)) { needsNew = true; - TileEntity tileAt = supertile.getWorld().getTileEntity(cachedCollectorCoordinates); + TileEntity tileAt = getWorld().getTileEntity(cachedCollectorCoordinates); if(tileAt instanceof IManaCollector && !tileAt.isRemoved()) { linkedCollector = tileAt; needsNew = false; @@ -142,16 +143,16 @@ public class SubTileGenerating extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorld().getTileEntity(linkedCollector.getPos()); + TileEntity tileAt = getWorld().getTileEntity(linkedCollector.getPos()); if(tileAt instanceof IManaCollector) linkedCollector = tileAt; } if(needsNew && ticksExisted == 1) { // New flowers only IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); - int size = network.getAllCollectorsInWorld(supertile.getWorld()).size(); + int size = network.getAllCollectorsInWorld(getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - linkedCollector = network.getClosestCollector(supertile.getPos(), supertile.getWorld(), LINK_RANGE); + linkedCollector = network.getClosestCollector(getPos(), getWorld(), LINK_RANGE); sizeLastCheck = size; } } @@ -295,7 +296,7 @@ public class SubTileGenerating extends SubTileEntity { int range = 6; range *= range; - double dist = pos.distanceSq(supertile.getPos()); + double dist = pos.distanceSq(getPos()); if(range >= dist) { TileEntity tile = player.world.getTileEntity(pos); if(tile instanceof IManaCollector) { @@ -309,13 +310,13 @@ public class SubTileGenerating extends SubTileEntity { public boolean isValidBinding() { - return linkedCollector != null && !linkedCollector.isRemoved() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector; + return linkedCollector != null && !linkedCollector.isRemoved() && getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector; } @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc) { - String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.format(getBlockState().getBlock().getTranslationKey()); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java similarity index 54% rename from src/main/java/vazkii/botania/api/subtile/SubTileEntity.java rename to src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 6d6f55182..3461a38f1 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -10,86 +10,179 @@ */ package vazkii.botania.api.subtile; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.string.TileRedStringRelay; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; /** - * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses - * of this using BotaniaAPI.mapSubTile(String, Class). Any subclass of this must have - * a no parameter constructor. + * Common superclass of all magical flower TE's */ -public class SubTileEntity { +public class TileEntitySpecialFlower extends TileEntity implements ITickable, IWandBindable { public static final ResourceLocation DING_SOUND_EVENT = new ResourceLocation("botania", "ding"); + public static final int SLOWDOWN_FACTOR_PODZOL = 5; + public static final int SLOWDOWN_FACTOR_MYCEL = 10; + private static final Tag FLOATING_TAG = new BlockTags.Wrapper(new ResourceLocation("botania", "special_floating_flowers")); - protected TileEntity supertile; + private final IFloatingFlower floatingData = new FloatingFlowerImpl() { + @Override + public ItemStack getDisplayStack() { + ResourceLocation id = getType().getRegistryName(); + Item item = ForgeRegistries.ITEMS.getValue(id); + if(item != null) { + return new ItemStack(item); + } else { + return super.getDisplayStack(); + } + } + }; + private final LazyOptional floatingDataCap = LazyOptional.of(() -> floatingData); public int ticksExisted = 0; - private final SubTileType type; - /** true if this flower is working on Enchanted Soil **/ public boolean overgrowth = false; /** true if this flower is working on Enchanted Soil and this is the second tick **/ public boolean overgrowthBoost = false; - /** The Tag items should use to store which sub tile they are. **/ - public static final String TAG_TYPE = "type"; public static final String TAG_TICKS_EXISTED = "ticksExisted"; + private static final String TAG_FLOATING_DATA = "floating"; - public SubTileEntity(SubTileType type) { - this.type = type; + public TileEntitySpecialFlower(TileEntityType type) { + super(type); } - public final SubTileType getType() { - return type; + @Override + public final void tick() { + TileEntity tileBelow = world.getTileEntity(pos.down()); + if(tileBelow instanceof TileRedStringRelay) { + BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding(); + if(coords != null) { + BlockPos currPos = pos; + setPos(coords); + tickFlower(); + setPos(currPos); + + return; + } + } + + boolean special = isOnSpecialSoil(); + if(special) { + this.overgrowth = true; + if(isOvergrowthAffected()) { + tickFlower(); + overgrowthBoost = true; + } + } + tickFlower(); + overgrowth = false; + overgrowthBoost = false; } - public final BlockPos getPos() { - return supertile.getPos(); + @Nonnull + @Override + public LazyOptional getCapability(@Nonnull Capability cap, @Nullable EnumFacing side) { + if(cap == BotaniaAPI.FLOATING_FLOWER_CAP) { + if(hasWorld() && getWorld().getBlockState(getPos()).isIn(FLOATING_TAG)) { + return floatingDataCap.cast(); + } + } + return super.getCapability(cap, side); } - public final World getWorld() { - return supertile.getWorld(); + public boolean isFloating() { + return getCapability(BotaniaAPI.FLOATING_FLOWER_CAP).isPresent(); } - public void setSupertile(TileEntity tile) { - supertile = tile; + public boolean isOnSpecialSoil() { + if(isFloating()) { + return false; + } else { + return world.getBlockState(pos.down()).getBlock() == ModBlocks.enchantedSoil; + } } - public void onUpdate() { + public void tickFlower() { ticksExisted++; } - public final void writeToPacketNBTInternal(NBTTagCompound cmp) { - cmp.putInt(TAG_TICKS_EXISTED, ticksExisted); - writeToPacketNBT(cmp); - } - - public final void readFromPacketNBTInternal(NBTTagCompound cmp) { + @Override + public final void read(NBTTagCompound cmp) { + super.read(cmp); if(cmp.contains(TAG_TICKS_EXISTED)) ticksExisted = cmp.getInt(TAG_TICKS_EXISTED); + if(cmp.contains(TAG_FLOATING_DATA)) + BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); readFromPacketNBT(cmp); } + @Nonnull + @Override + public final NBTTagCompound write(NBTTagCompound cmp) { + cmp.putInt(TAG_TICKS_EXISTED, ticksExisted); + cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); + writeToPacketNBT(cmp); + return cmp; + } + + @Override + public SPacketUpdateTileEntity getUpdatePacket() { + NBTTagCompound cmp = new NBTTagCompound(); + writeToPacketNBT(cmp); + return new SPacketUpdateTileEntity(getPos(), -1, cmp); + } + + @Override + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { + IFloatingFlower.IslandType oldType = floatingData.getIslandType(); + super.onDataPacket(net, packet); + if(oldType != floatingData.getIslandType() && isFloating()) { + world.markBlockRangeForRenderUpdate(pos, pos); + } + } + + @Nonnull + @Override + public NBTTagCompound getUpdateTag() { + return write(new NBTTagCompound()); + } + /** * Writes some extra data to a network packet. This data is read * by readFromPacketNBT on the client that receives the packet. @@ -105,29 +198,13 @@ public class SubTileEntity { public void readFromPacketNBT(NBTTagCompound cmp) { } public void sync() { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(supertile); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } public String getUnlocalizedName() { return getType().getRegistryName().toString(); } - /** - * Gets the block model path for this subtile - */ - @OnlyIn(Dist.CLIENT) - public ModelResourceLocation getBlockModel() { - return BotaniaAPI.internalHandler.getSubTileBlockModelForName(getUnlocalizedName()); - } - - /** - * Gets the item model path for this subtile - */ - @OnlyIn(Dist.CLIENT) - public ModelResourceLocation getItemModel() { - return BotaniaAPI.internalHandler.getSubTileItemModelForName(getUnlocalizedName()); - } - /** * Called when a Wand of the Forest is used on this sub tile. Note that the * player parameter can be null if this is called from a dispenser. @@ -156,14 +233,6 @@ public class SubTileEntity { */ public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {} - /** - * Triggered by {@link TileEntity#receiveClientEvent} via {@link net.minecraft.block.Block#eventReceived} and {@link World#addBlockEvent} - */ - public boolean receiveClientEvent(int id, int param) - { - return false; - } - /** * Allows additional processing of sub tile drops */ @@ -183,6 +252,7 @@ public class SubTileEntity { * when the sub tile is being hovered with a wand of the forest. */ @OnlyIn(Dist.CLIENT) + @Override public BlockPos getBinding() { return null; } @@ -200,12 +270,13 @@ public class SubTileEntity { * Gets a BlockPos instance with the position of this sub tile. */ public BlockPos toBlockPos() { - return supertile.getPos(); + return getPos(); } /** * @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing) */ + @Override public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; } @@ -213,6 +284,7 @@ public class SubTileEntity { /** * @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing) */ + @Override public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; } @@ -253,13 +325,26 @@ public class SubTileEntity { } /** - * Gets ths slowdown factor of this SubTile. - * @see ISubTileSlowableContainer + * Allow for the SubTile to be "slowed down". + * Slowing down is the action that happens when a flower is planted in Podzol or Mycellium. + * Any flowers that pick up items from the ground should have a delay on the time the item + * needs to be on the floor equal to the value of this method.. */ public int getSlowdownFactor() { - if(supertile instanceof ISubTileSlowableContainer) { - ISubTileSlowableContainer slowable = (ISubTileSlowableContainer) supertile; - return slowable.getSlowdownFactor(); + if(isFloating()) { + IFloatingFlower.IslandType type = floatingData.getIslandType(); + if(type == IFloatingFlower.IslandType.MYCEL) + return SLOWDOWN_FACTOR_MYCEL; + else if(type == IFloatingFlower.IslandType.PODZOL) + return SLOWDOWN_FACTOR_PODZOL; + } else { + Block below = world.getBlockState(getPos().down()).getBlock(); + if(below == Blocks.MYCELIUM) + return SLOWDOWN_FACTOR_MYCEL; + + if(below == Blocks.PODZOL) { + return SLOWDOWN_FACTOR_PODZOL; + } } return 0; diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index d33c8e742..6b3069d6d 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -14,6 +14,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -37,7 +38,7 @@ public final class ModChallenges { addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.MUSIC_DISC_13)); addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Blocks.SUGAR_CANE)); addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.COBBLESTONE)); - addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + addChallenge(EnumChallengeLevel.EASY, "pureDaisy", new ItemStack(ModSubtiles.pureDaisy)); addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.manaPool)); addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.defaultAltar)); @@ -45,15 +46,15 @@ public final class ModChallenges { addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.WHEAT_SEEDS)); addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.LEATHER)); addChallenge(EnumChallengeLevel.NORMAL, "boneMealFarm", new ItemStack(Items.BONE_MEAL)); - addChallenge(EnumChallengeLevel.NORMAL, "orechid", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID)); + addChallenge(EnumChallengeLevel.NORMAL, "orechid", new ItemStack(ModSubtiles.orechid)); addChallenge(EnumChallengeLevel.HARD, "mobTower", new ItemStack(Items.BONE)); - addChallenge(EnumChallengeLevel.HARD, "entropinnyumSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM)); - addChallenge(EnumChallengeLevel.HARD, "spectrolusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS)); - addChallenge(EnumChallengeLevel.HARD, "shulkMeNotSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SHULK_ME_NOT)); + addChallenge(EnumChallengeLevel.HARD, "entropinnyumSetup", new ItemStack(ModSubtiles.entropinnyum)); + addChallenge(EnumChallengeLevel.HARD, "spectrolusSetup", new ItemStack(ModSubtiles.spectrolus)); + addChallenge(EnumChallengeLevel.HARD, "shulkMeNotSetup", new ItemStack(ModSubtiles.shulkMeNot)); addChallenge(EnumChallengeLevel.HARD, "potionBrewer", new ItemStack(ModBlocks.brewery)); - addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS)); + addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", new ItemStack(ModSubtiles.kekimurus)); addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.DIAMOND_PICKAXE)); addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.runeWater)); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index a19287722..8eeec2b51 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -25,9 +25,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityMagicLandmine; @@ -66,10 +65,9 @@ public final class BlockHighlightRenderHandler { } TileEntity tile = mc.world.getTileEntity(bPos); - if(tile == null || !(tile instanceof ISubTileContainer)) + if(tile == null || !(tile instanceof TileEntitySpecialFlower)) break boundTile; - ISubTileContainer container = (ISubTileContainer) tile; - SubTileEntity subtile = container.getSubTile(); + TileEntitySpecialFlower subtile = (TileEntitySpecialFlower) tile; if(subtile == null) break boundTile; RadiusDescriptor descriptor = subtile.getRadius(); diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index b330342a6..9a9b62ace 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -20,14 +20,14 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; -import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -95,8 +95,8 @@ public final class ContributorFancinessHandler implements LayerRenderer ItemBlockSpecialFlower.getType(stack).toString()); - subtypeRegistry.registerSubtypeInterpreter(ModBlocks.floatingSpecialFlower.asItem(), stack -> ItemBlockSpecialFlower.getType(stack).toString()); subtypeRegistry.registerSubtypeInterpreter(ModItems.brewVial, ItemBrewBase::getSubtype); subtypeRegistry.registerSubtypeInterpreter(ModItems.brewFlask, ItemBrewBase::getSubtype); subtypeRegistry.registerSubtypeInterpreter(ModItems.incenseStick, ItemBrewBase::getSubtype); @@ -98,7 +93,6 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void registerVanillaCategoryExtensions(IVanillaCategoryExtensionRegistration registration) { - registration.getCraftingCategory().addCategoryExtension(SpecialFloatingFlowerRecipe.class, SpecialFloatingFlowerWrapper::new); registration.getCraftingCategory().addCategoryExtension(AncientWillRecipe.class, AncientWillRecipeWrapper::new); registration.getCraftingCategory().addCategoryExtension(TerraPickTippingRecipe.class, TerraPickTippingRecipeWrapper::new); registration.getCraftingCategory().addCategoryExtension(CompositeLensRecipe.class, CompositeLensRecipeWrapper::new); @@ -157,12 +151,12 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipeCatalyst(new ItemStack(ModBlocks.mesaAltar), PetalApothecaryRecipeCategory.UID); registry.addRecipeCatalyst(new ItemStack(ModBlocks.mossyAltar), PetalApothecaryRecipeCategory.UID); - registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(SUBTILE_ORECHID), OrechidRecipeCategory.UID); - registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), ModSubtiles.orechid), OrechidRecipeCategory.UID); - registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(SUBTILE_ORECHID_IGNEM), OrechidIgnemRecipeCategory.UID); - registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), ModSubtiles.orechidIgnem), OrechidIgnemRecipeCategory.UID); - registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(SUBTILE_PUREDAISY), PureDaisyRecipeCategory.UID); - registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), ModSubtiles.pureDaisy), PureDaisyRecipeCategory.UID); + registry.addRecipeCatalyst(ModSubtiles.orechid, OrechidRecipeCategory.UID); + registry.addRecipeCatalyst(ModSubtiles.orechidFloating, OrechidRecipeCategory.UID); + registry.addRecipeCatalyst(ModSubtiles.orechidIgnem, OrechidIgnemRecipeCategory.UID); + registry.addRecipeCatalyst(ModSubtiles.orechidIgnemFloating, OrechidIgnemRecipeCategory.UID); + registry.addRecipeCatalyst(ModSubtiles.pureDaisy, PureDaisyRecipeCategory.UID); + registry.addRecipeCatalyst(ModSubtiles.pureDaisyFloating, PureDaisyRecipeCategory.UID); registry.addRecipeCatalyst(new ItemStack(ModBlocks.runeAltar), RunicAltarRecipeCategory.UID); diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/SpecialFloatingFlowerWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/SpecialFloatingFlowerWrapper.java deleted file mode 100644 index 65dbe53c3..000000000 --- a/src/main/java/vazkii/botania/client/integration/jei/crafting/SpecialFloatingFlowerWrapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package vazkii.botania.client.integration.jei.crafting; - -import com.google.common.collect.ImmutableList; -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -public class SpecialFloatingFlowerWrapper implements ICraftingCategoryExtension { - private final List> inputs = new ArrayList<>(); - private final ItemStack output; - private final ResourceLocation name; - - public SpecialFloatingFlowerWrapper(SpecialFloatingFlowerRecipe recipe) { - name = recipe.getId(); - inputs.add(ImmutableList.of(ItemBlockSpecialFlower.ofType(recipe.flowerType))); - List normalFloaters = new ArrayList<>(); - for(EnumDyeColor color : EnumDyeColor.values()) { - normalFloaters.add(new ItemStack(ModBlocks.getFloatingFlower(color))); - } - inputs.add(normalFloaters); - output = ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), recipe.flowerType); - } - - @Override - public void setIngredients(@Nonnull IIngredients ingredients) { - ingredients.setInputLists(VanillaTypes.ITEM, inputs); - ingredients.setOutput(VanillaTypes.ITEM, output); - } - - @Nullable - @Override - public ResourceLocation getRegistryName() { - return name; - } -} diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java index 1156c77ab..31c7c1a3a 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java @@ -18,6 +18,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -39,7 +40,7 @@ public class OrechidIgnemRecipeCategory implements IRecipeCategory localizedName = I18n.format("botania.nei.pureDaisy"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pure_daisy_overlay.png"), 0, 0, 64, 46); - icon = guiHelper.createDrawableIngredient(ItemBlockSpecialFlower.ofType(ModSubtiles.pureDaisy)); + icon = guiHelper.createDrawableIngredient(new ItemStack(ModSubtiles.pureDaisy)); } @Nonnull @@ -131,7 +131,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory } recipeLayout.getItemStacks().init(1, true, 70, 12); - recipeLayout.getItemStacks().set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + recipeLayout.getItemStacks().set(1, new ItemStack(ModSubtiles.pureDaisy)); if(outputFluid) { recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 5867b8c20..4fb39730e 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -41,7 +41,6 @@ import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -92,23 +91,13 @@ public class FloatingFlowerModel implements IBakedModel { @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { - if(state.getBlock() != ModBlocks.floatingSpecialFlower && !(state.getBlock() instanceof BlockFloatingFlower)) + if(!(state.getBlock() instanceof BlockFloatingFlower)) return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); if(true) // todo 1.13 return ImmutableList.of(); IExtendedBlockState realState = (IExtendedBlockState) state; IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); - ResourceLocation identifier; - - if(state.getBlock() == ModBlocks.floatingSpecialFlower) { - // Magic flower - identifier = realState.getValue(BotaniaStateProps.SUBTILE_ID); - } else { - // Mundane flower - identifier = state.getBlock().getRegistryName(); - } - - return getModel(islandType, identifier).getQuads(state, face, rand); + return getModel(islandType, state.getBlock().getRegistryName()).getQuads(state, face, rand); } // Get the model for this islandtype + flower type combination. If it's not cached already, generate it. @@ -131,17 +120,15 @@ public class FloatingFlowerModel implements IBakedModel { islandModel = modelManager.getMissingModel(); } - IBakedModel flowerModel; + Item item; if(identifier.getPath().endsWith(LibBlockNames.FLOATING_FLOWER_SUFFIX)) { ResourceLocation shinyId = new ResourceLocation(identifier.getNamespace(), identifier.getPath().replaceAll(LibBlockNames.FLOATING_FLOWER_SUFFIX, LibBlockNames.SHINY_FLOWER_SUFFIX)); - Item shinyFlower = ForgeRegistries.ITEMS.getValue(shinyId); - flowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(new ItemStack(shinyFlower)); + item = ForgeRegistries.ITEMS.getValue(shinyId); } else { - ItemStack stack = ItemBlockSpecialFlower.ofType(BotaniaRegistries.SUBTILES.getValue(identifier)); - IBakedModel specialFlowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(stack); - flowerModel = specialFlowerModel.getOverrides().getModelWithOverrides(specialFlowerModel, stack, null, null); + item = ForgeRegistries.ITEMS.getValue(identifier); } + IBakedModel flowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(new ItemStack(item)); // Enhance! CompositeBakedModel model = new CompositeBakedModel(flowerModel, islandModel); @@ -232,17 +219,7 @@ public class FloatingFlowerModel implements IBakedModel { public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { // Items always have GRASS island IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; - ResourceLocation identifier; - - if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { - // Magic flower - identifier = ItemBlockSpecialFlower.getType(stack).getRegistryName(); - } else { - // Mundane flower - identifier = stack.getItem().getRegistryName(); - } - - return FloatingFlowerModel.this.getModel(islandType, identifier); + return FloatingFlowerModel.this.getModel(islandType, stack.getItem().getRegistryName()); } }; } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java deleted file mode 100644 index 8b2aeaf4b..000000000 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ /dev/null @@ -1,240 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.model; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.resources.IResourceManager; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ICustomModelLoader; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.PerspectiveMapWrapper; -import net.minecraftforge.client.model.SimpleModelState; -import net.minecraftforge.common.model.IModelState; -import net.minecraftforge.common.model.TRSRTransformation; -import net.minecraftforge.common.property.IExtendedBlockState; -import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.BotaniaAPIClient; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; - -import javax.annotation.Nonnull; -import javax.vecmath.Matrix4f; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.function.Function; - -public class SpecialFlowerModel implements IUnbakedModel { - private static final ModelResourceLocation MISSING = new ModelResourceLocation("builtin/missing", "missing"); - private final ModelResourceLocation baseModel; - private final ImmutableMap blockModels; - private final ImmutableMap itemModels; - - private SpecialFlowerModel(ModelResourceLocation baseModel, - ImmutableMap blockModels, - ImmutableMap itemModels) { - this.baseModel = baseModel; - this.blockModels = blockModels; - this.itemModels = itemModels; - } - - @Override - public Collection getDependencies() { - ImmutableSet.Builder builder = ImmutableSet.builder(); - if(!MISSING.equals(baseModel)) - builder.add(baseModel); - builder.addAll(blockModels.values()); - builder.addAll(itemModels.values()); - - // Force island models to be loaded and baked. See FloatingFlowerModel. - builder.addAll(BotaniaAPIClient.getRegisteredIslandTypeModels().values()); - - return builder.build(); - } - - @Override - public Collection getTextures(Function modelGetter, Set errors) { - return ImmutableList.of(); - } - - @Override - public IBakedModel bake(Function modelGetter, Function spriteGetter, IModelState state, boolean uvlock, VertexFormat format) { - ImmutableMap transforms = PerspectiveMapWrapper.getTransforms(state); - IModelState transformState = new SimpleModelState(transforms); - - IBakedModel baseModelBaked = ModelLoaderRegistry.getModelOrMissing(baseModel) - .bake(modelGetter, spriteGetter, state, uvlock, format); - - ImmutableMap.Builder bakedBlockBuilder = ImmutableMap.builder(); - for(Map.Entry e : blockModels.entrySet()) { - IModel model = ModelLoaderRegistry.getModelOrMissing(e.getValue()); - if(model != ModelLoaderRegistry.getMissingModel()) - bakedBlockBuilder.put(e.getKey(), model.bake(modelGetter, spriteGetter, state, uvlock, format)); - } - - ImmutableMap.Builder bakedItemBuilder = ImmutableMap.builder(); - for(Map.Entry e : itemModels.entrySet()) { - IModel model = ModelLoaderRegistry.getModelOrMissing(e.getValue()); - if(model != ModelLoaderRegistry.getMissingModel()) - bakedItemBuilder.put(e.getKey(), model.bake(modelGetter, spriteGetter, state, uvlock, format)); - } - - return new SpecialFlowerBakedModel(baseModelBaked, bakedBlockBuilder.build(), bakedItemBuilder.build(), transforms); - } - - @Override - public IModelState getDefaultState() { - return TRSRTransformation.identity(); - } - - @Override - public IUnbakedModel process(ImmutableMap customData) { - // Load the base variant from blockstate json, and also add all the model paths we received from external API - - ModelResourceLocation base = baseModel; - if(customData.containsKey("base")) - // Forge blockstate gives custom data in json form, have to drop the quotes - base = new ModelResourceLocation(customData.get("base").substring(1, customData.get("base").length() - 1)); - - ImmutableMap blockModels = ImmutableMap.copyOf(BotaniaAPIClient.getRegisteredSubtileBlockModels()); - ImmutableMap itemModels = ImmutableMap.copyOf(BotaniaAPIClient.getRegisteredSubtileItemModels()); - return new SpecialFlowerModel(base, blockModels, itemModels); - } - - public enum Loader implements ICustomModelLoader { - INSTANCE { - @Override - public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { - } - - @Override - public boolean accepts(ResourceLocation modelLocation) { - return modelLocation.getNamespace().equals("botania_special") && ( - modelLocation.getPath().equals("specialflower") || - modelLocation.getPath().equals("models/block/specialflower") || - modelLocation.getPath().equals("models/item/specialflower")); - } - - @Override - public IUnbakedModel loadModel(ResourceLocation modelLocation) { - // Load a dummy model for now, all actual blockModels added in process(). - return new SpecialFlowerModel(new ModelResourceLocation("builtin/missing", "missing"), ImmutableMap.of(), ImmutableMap.of()); - } - } - } - - private static class SpecialFlowerBakedModel implements IBakedModel { - private final IBakedModel baseModel; - private final ImmutableMap bakedBlockModels; - private final ImmutableMap bakedItemModels; - private final ImmutableMap transforms; - - SpecialFlowerBakedModel(IBakedModel baseModel, - ImmutableMap bakedBlockModels, - ImmutableMap bakedItemModels, - ImmutableMap cameraTransforms) { - this.baseModel = baseModel; - this.bakedBlockModels = bakedBlockModels; - this.bakedItemModels = bakedItemModels; - this.transforms = cameraTransforms; - } - - @Nonnull - @Override - public List getQuads(IBlockState state, EnumFacing face, Random rand) { - IExtendedBlockState extendedState = (IExtendedBlockState) state; - ResourceLocation subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); - - IBakedModel model = bakedBlockModels.get(subtileId == null ? BotaniaAPI.DUMMY_SUBTILE_NAME : subtileId); - if(model == null) - model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - - return model.getQuads(state, face, rand); - } - - @Nonnull - @Override - public ItemOverrideList getOverrides() { - return itemHandler; - } - - private final ItemStack roseFallback = new ItemStack(Blocks.POPPY); - - private final ItemOverrideList itemHandler = new ItemOverrideList() { - @Nonnull - @Override - public IBakedModel getModelWithOverrides(@Nonnull IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { - IBakedModel model = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); - - if(model == null) - model = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); - if(model == null) - model = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(roseFallback); - - return model; - } - }; - - @Override - public boolean isAmbientOcclusion() { - return baseModel.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() { - return baseModel.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() { - return baseModel.isBuiltInRenderer(); - } - - @Nonnull - @Override - public TextureAtlasSprite getParticleTexture() { - return baseModel.getParticleTexture(); - } - - @Nonnull - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return baseModel.getItemCameraTransforms(); - } - - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType); - } - } - -} diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 6a5655fff..e4f304007 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -19,6 +19,9 @@ import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.LazyOptional; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; @@ -29,14 +32,11 @@ public class RenderTileFloatingFlower extends TileEntityRenderer { @Override public void render(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { - if(ConfigHandler.CLIENT.staticFloaters.get()) + LazyOptional floatingOpt = tile.getCapability(BotaniaAPI.FLOATING_FLOWER_CAP); + if(!floatingOpt.isPresent()) return; - if (tile != null) - if (!tile.getWorld().isBlockLoaded(tile.getPos(), false)) - return; - - + IFloatingFlower floatingData = floatingOpt.orElseThrow(NullPointerException::new); BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher(); GlStateManager.pushMatrix(); GlStateManager.color4f(1F, 1F, 1F, 1F); @@ -54,10 +54,12 @@ public class RenderTileFloatingFlower extends TileEntityRenderer { Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + /* todo 1.13 IBlockState state = tile.getWorld().getBlockState(tile.getPos()); state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos()); IBakedModel model = brd.getBlockModelShapes().getModelManager().getModel(new ModelResourceLocation("botania:floating_special_flower", "inventory")); brd.getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, true); + */ GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 40fdb0ce1..39f3dba3d 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -23,6 +23,7 @@ import net.minecraft.item.crafting.RecipeSerializers; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.fml.DeferredWorkQueue; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.ModList; @@ -40,6 +41,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.ColorHelper; +import vazkii.botania.api.capability.FloatingFlowerImpl; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; @@ -135,10 +138,10 @@ public class Botania { MinecraftForge.EVENT_BUS.addListener(this::serverAboutToStart); MinecraftForge.EVENT_BUS.addListener(this::serverStarting); MinecraftForge.EVENT_BUS.addListener(this::serverStopping); - BotaniaRegistries.init(); } private void commonSetup(FMLCommonSetupEvent event) { + CapabilityManager.INSTANCE.register(IFloatingFlower.class, new IFloatingFlower.Storage(), FloatingFlowerImpl::new); gardenOfGlassLoaded = ModList.get().isLoaded("gardenofglass"); thaumcraftLoaded = ModList.get().isLoaded("thaumcraft"); bcApiLoaded = ModList.get().isLoaded("buildcraftlib"); diff --git a/src/main/java/vazkii/botania/common/BotaniaRegistries.java b/src/main/java/vazkii/botania/common/BotaniaRegistries.java deleted file mode 100644 index a4a992527..000000000 --- a/src/main/java/vazkii/botania/common/BotaniaRegistries.java +++ /dev/null @@ -1,20 +0,0 @@ -package vazkii.botania.common; - -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.IForgeRegistry; -import net.minecraftforge.registries.RegistryBuilder; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileType; -import vazkii.botania.common.lib.LibMisc; - -public class BotaniaRegistries { - public static final IForgeRegistry SUBTILES = new RegistryBuilder() - .setName(new ResourceLocation(LibMisc.MOD_ID, "subtiles")) - .setType(SubTileType.class) - .setDefaultKey(BotaniaAPI.DUMMY_SUBTILE_NAME) - .disableSaving() - .create(); - - // To force class load - public static void init() {} -} diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index e8db037e6..86475155a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -10,82 +10,52 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.fluid.IFluidState; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.common.property.IExtendedBlockState; -import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.decor.BlockFloatingFlower; -import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; -import vazkii.botania.common.block.tile.TileSpecialFlower; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.core.handler.ConfigHandler; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; import java.util.Random; +import java.util.function.Supplier; public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { + private final Supplier teProvider; - public BlockFloatingSpecialFlower(Properties props) { + public BlockFloatingSpecialFlower(Properties props, Supplier teProvider) { super(EnumDyeColor.WHITE, props); + this.teProvider = teProvider; } - /* todo 1.13 - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID, BotaniaStateProps.ISLAND_TYPE }); - } - - @Nonnull - @Override - public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) { - state = super.getExtendedState(state, world, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); - if (te instanceof TileFloatingSpecialFlower) { - state = ((IExtendedBlockState) state).with(BotaniaStateProps.SUBTILE_ID, ((TileFloatingSpecialFlower) te).subTileName); - } - return state; - } - */ - @Override public int getLightValue(@Nonnull IBlockState state, IWorldReader world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); TileEntity tile = world.getTileEntity(pos); - return tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : lightValue; + return tile instanceof TileEntitySpecialFlower ? ((TileEntitySpecialFlower) tile).getLightValue() : lightValue; } @Override @@ -95,12 +65,12 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { - return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override public int getWeakPower(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing side) { - return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override @@ -117,25 +87,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public void animateTick(IBlockState state, World world, BlockPos pos, Random rand) {} - @Override - public void fillItemGroup(ItemGroup tab, NonNullList stacks) { - for(SubTileType type : BotaniaRegistries.SUBTILES) { - if(type.shouldShowInCreative()) { - stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(this), type)); - } - } - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityPlayer player) { - SubTileType type = ((TileSpecialFlower) world.getTileEntity(pos)).getSubTile().getType(); - return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), type); - } - @Override public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player); } @Override @@ -159,49 +113,48 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public void getDrops(@Nonnull IBlockState state, NonNullList list, World world, BlockPos pos, int fortune) { + super.getDrops(state, list, world, pos, fortune); TileEntity tile = world.getTileEntity(pos); if(tile != null) { - SubTileType type = ((TileSpecialFlower) tile).getSubTile().getType(); - list.add(ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), type)); - ((TileSpecialFlower) tile).getDrops(list); + ((TileEntitySpecialFlower) tile).getDrops(list); } } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - return ((TileSpecialFlower) world.getTileEntity(pos)).onWanded(stack, player); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onWanded(player, stack); } @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); } @Override public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ) || super.onBlockActivated(state, world, pos, player, hand, side, hitX, hitY, hitZ); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ) || super.onBlockActivated(state, world, pos, player, hand, side, hitX, hitY, hitZ); } @Override public void onBlockAdded(IBlockState state, World world, BlockPos pos, IBlockState oldState) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, World world, BlockPos pos) { - ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).renderHUD(mc); } @Nonnull @Override public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { - return new TileFloatingSpecialFlower(); + return teProvider.get(); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return ((TileSpecialFlower) world.getTileEntity(pos)).getEntry(); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getEntry(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 43fb5c281..fe04c317e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockFlower; -import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; @@ -25,8 +24,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; @@ -34,41 +31,27 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.property.IExtendedBlockState; -import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.BotaniaRegistries; -import vazkii.botania.common.block.tile.TileSpecialFlower; -import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.material.ItemDye; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.function.Supplier; public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); + private final Supplier teProvider; - protected BlockSpecialFlower(Properties props) { + protected BlockSpecialFlower(Properties props, Supplier teProvider) { super(props); + this.teProvider = teProvider; } @Nonnull @@ -78,27 +61,12 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return SHAPE.withOffset(shift.x, shift.y, shift.z); } - /* todo 1.13 - @Nonnull - @Override - public IExtendedBlockState getExtendedState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); - if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { - Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); - ResourceLocation id = BotaniaAPI.getSubTileStringMapping(clazz); - return ((IExtendedBlockState) state).with(BotaniaStateProps.SUBTILE_ID, id); - } else { - return (IExtendedBlockState) state; - } - } - */ - @Override public int getLightValue(@Nonnull IBlockState state, IWorldReader world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); - return world.getTileEntity(pos) == null ? 0 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); + return world.getTileEntity(pos) == null ? 0 : ((TileEntitySpecialFlower) world.getTileEntity(pos)).getLightValue(); } @Override @@ -108,12 +76,12 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { - return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override public int getWeakPower(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing side) { - return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override @@ -126,22 +94,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } - @Override - public void fillItemGroup(ItemGroup tab, @Nonnull NonNullList stacks) { - for(SubTileType type : BotaniaRegistries.SUBTILES) { - if(type.shouldShowInCreative()) { - stacks.add(ItemBlockSpecialFlower.ofType(type)); - } - } - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityPlayer player) { - SubTileType type = ((TileSpecialFlower) world.getTileEntity(pos)).getSubTile().getType(); - return ItemBlockSpecialFlower.ofType(type); - } - @Override protected boolean isValidGround(IBlockState state, IBlockReader worldIn, BlockPos pos) { return state.getBlock() == ModBlocks.redStringRelay @@ -151,7 +103,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player); + super.onBlockHarvested(world, pos, state, player); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player); } @Override @@ -175,12 +128,11 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public void getDrops(@Nonnull IBlockState state, NonNullList list, World world, BlockPos pos, int fortune) { + super.getDrops(state, list, world, pos, fortune); TileEntity tile = world.getTileEntity(pos); - if(tile != null) { - SubTileType type = ((TileSpecialFlower) tile).getSubTile().getType(); - list.add(ItemBlockSpecialFlower.ofType(type)); - ((TileSpecialFlower) tile).getDrops(list); + if(tile instanceof TileEntitySpecialFlower) { + ((TileEntitySpecialFlower) tile).getDrops(list); } } @@ -188,7 +140,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I public boolean eventReceived(IBlockState state, World world, BlockPos pos, int par5, int par6) { super.eventReceived(state, world, pos, par5, par6); TileEntity tileentity = world.getTileEntity(pos); - return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; + return tileentity != null && tileentity.receiveClientEvent(par5, par6); } @Override @@ -199,27 +151,27 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Nonnull @Override public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { - return new TileSpecialFlower(); + return teProvider.get(); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return ((TileSpecialFlower) world.getTileEntity(pos)).getEntry(); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getEntry(); } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - return ((TileSpecialFlower) world.getTileEntity(pos)).onWanded(stack, player); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onWanded(player, stack); } @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); } @Override public void onBlockAdded(IBlockState state, World world, BlockPos pos, IBlockState oldState) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } @Override @@ -233,12 +185,12 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); + return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); } @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, World world, BlockPos pos) { - ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc); + ((TileEntitySpecialFlower) world.getTileEntity(pos)).renderHUD(mc); } } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 22f58060f..6c3ccf51c 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -25,12 +25,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.internal.DummySubTile; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.state.enums.LuminizerVariant; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.TEISR; import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; @@ -67,22 +63,6 @@ import vazkii.botania.common.block.string.BlockRedStringDispenser; import vazkii.botania.common.block.string.BlockRedStringFertilizer; import vazkii.botania.common.block.string.BlockRedStringInterceptor; import vazkii.botania.common.block.string.BlockRedStringRelay; -import vazkii.botania.common.block.subtile.SubTileManastar; -import vazkii.botania.common.block.subtile.SubTilePureDaisy; -import vazkii.botania.common.block.subtile.functional.*; -import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; -import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; -import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; -import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; -import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis; -import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; -import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; -import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; -import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; -import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; -import vazkii.botania.common.block.subtile.generating.SubTileShulkMeNot; -import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; -import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.block.tile.*; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; @@ -108,10 +88,8 @@ import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockDreamwood; import vazkii.botania.common.item.block.ItemBlockElven; -import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.item.block.ItemBlockPool; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -163,7 +141,6 @@ public final class ModBlocks { @ObjectHolder(LibBlockNames.LIVING_WOOD_PATTERN_FRAMED) public static Block livingwoodPatternFramed; @ObjectHolder(LibBlockNames.LIVING_WOOD_GLIMMERING) public static Block livingwoodGlimmering; - @ObjectHolder(LibBlockNames.SPECIAL_FLOWER) public static Block specialFlower; @ObjectHolder(LibBlockNames.SPREADER) public static Block manaSpreader; @ObjectHolder(LibBlockNames.SPREADER_REDSTONE) public static Block redstoneSpreader; @ObjectHolder(LibBlockNames.SPREADER_ELVEN) public static Block elvenSpreader; @@ -289,7 +266,6 @@ public final class ModBlocks { @ObjectHolder(LibBlockNames.RED_STRING_FERTILIZER) public static Block redStringFertilizer; @ObjectHolder(LibBlockNames.RED_STRING_COMPARATOR) public static Block redStringComparator; @ObjectHolder(LibBlockNames.RED_STRING_RELAY) public static Block redStringRelay; - @ObjectHolder(LibBlockNames.FLOATING_SPECIAL_FLOWER) public static Block floatingSpecialFlower; @ObjectHolder(LibBlockNames.MANA_FLAME) public static Block manaFlame; @ObjectHolder(LibBlockNames.PRISM) public static Block prism; @ObjectHolder(LibBlockNames.ENCHANTED_SOIL) public static Block enchantedSoil; @@ -413,7 +389,6 @@ public final class ModBlocks { register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_FRAMED); register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_PATTERN_FRAMED); register(r, new BlockModLexiconable(builder.lightValue(12), decorative), LibBlockNames.LIVING_WOOD_GLIMMERING); - register(r, new BlockSpecialFlower(Block.Properties.from(Blocks.POPPY)), LibBlockNames.SPECIAL_FLOWER); builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); register(r, new BlockSpreader(BlockSpreader.Variant.MANA, builder), LibBlockNames.SPREADER); @@ -500,7 +475,6 @@ public final class ModBlocks { } builder = Block.Properties.create(Material.GROUND).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15); - register(r, new BlockFloatingSpecialFlower(builder), LibBlockNames.FLOATING_SPECIAL_FLOWER); for(EnumDyeColor color : EnumDyeColor.values()) { register(r, new BlockFloatingFlower(color, builder), color.getName() + LibBlockNames.FLOATING_FLOWER_SUFFIX); } @@ -636,7 +610,6 @@ public final class ModBlocks { r.register(new ItemBlockMod(livingwoodFramed, props).setRegistryName(livingwoodFramed.getRegistryName())); r.register(new ItemBlockMod(livingwoodPatternFramed, props).setRegistryName(livingwoodPatternFramed.getRegistryName())); r.register(new ItemBlockMod(livingwoodGlimmering, props).setRegistryName(livingwoodGlimmering.getRegistryName())); - r.register(new ItemBlockSpecialFlower(specialFlower, props).setRegistryName(specialFlower.getRegistryName())); r.register(new ItemBlockMod(manaSpreader, props).setRegistryName(manaSpreader.getRegistryName())); r.register(new ItemBlockMod(redstoneSpreader, props).setRegistryName(redstoneSpreader.getRegistryName())); r.register(new ItemBlockMod(elvenSpreader, props).setRegistryName(elvenSpreader.getRegistryName())); @@ -743,7 +716,6 @@ public final class ModBlocks { r.register(new ItemBlockMod(redStringFertilizer, props).setRegistryName(redStringFertilizer.getRegistryName())); r.register(new ItemBlockMod(redStringComparator, props).setRegistryName(redStringComparator.getRegistryName())); r.register(new ItemBlockMod(redStringRelay, props).setRegistryName(redStringRelay.getRegistryName())); - r.register(new ItemBlockFloatingSpecialFlower(floatingSpecialFlower, props).setRegistryName(floatingSpecialFlower.getRegistryName())); r.register(new ItemBlockMod(prism, props).setRegistryName(prism.getRegistryName())); r.register(new ItemBlockMod(enchantedSoil, props).setRegistryName(enchantedSoil.getRegistryName())); r.register(new ItemBlockMod(petalBlockWhite, props).setRegistryName(petalBlockWhite.getRegistryName())); @@ -831,9 +803,13 @@ public final class ModBlocks { r.register(new ItemBlockMod(mutatedGrass, props).setRegistryName(mutatedGrass.getRegistryName())); r.register(new ItemBlockMod(animatedTorch, props).setRegistryName(animatedTorch.getRegistryName())); } + + public static > void register(IForgeRegistry reg, IForgeRegistryEntry thing, ResourceLocation name) { + reg.register(thing.setRegistryName(name)); + } public static > void register(IForgeRegistry reg, IForgeRegistryEntry thing, String name) { - reg.register(thing.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name))); + register(reg, thing, new ResourceLocation(LibMisc.MOD_ID, name)); } public static void addDispenserBehaviours() { @@ -848,7 +824,6 @@ public final class ModBlocks { public static void initTileEntities(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); r.register(TileEntityType.Builder.create(TileAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALTAR)); - r.register(TileEntityType.Builder.create(TileSpecialFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); r.register(TileEntityType.Builder.create(TileSpreader::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPREADER)); r.register(TileEntityType.Builder.create(TilePool::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.POOL)); r.register(TileEntityType.Builder.create(TileRuneAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RUNE_ALTAR)); @@ -878,7 +853,6 @@ public final class ModBlocks { r.register(TileEntityType.Builder.create(TileRedStringFertilizer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_FERTILIZER)); r.register(TileEntityType.Builder.create(TileRedStringComparator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_COMPARATOR)); r.register(TileEntityType.Builder.create(TileRedStringRelay::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_RELAY)); - r.register(TileEntityType.Builder.create(TileFloatingSpecialFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FLOATING_SPECIAL_FLOWER)); r.register(TileEntityType.Builder.create(TileManaFlame::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_FLAME)); r.register(TileEntityType.Builder.create(TilePrism::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PRISM)); r.register(TileEntityType.Builder.create(TileCorporeaIndex::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX)); diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index 9a58f1498..206561248 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -1,13 +1,22 @@ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableList; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.internal.DummySubTile; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.*; @@ -24,119 +33,214 @@ import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileShulkMeNot; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import java.util.Arrays; +import java.util.List; +import java.util.function.Supplier; + +import static vazkii.botania.common.block.ModBlocks.register; + @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @ObjectHolder(LibMisc.MOD_ID) public class ModSubtiles { - @ObjectHolder("dummy") public static SubTileType dummy; - @ObjectHolder("pure_daisy") public static SubTileType pureDaisy; - @ObjectHolder("manastar") public static SubTileType manastar; + @ObjectHolder("pure_daisy") public static Block pureDaisy; + @ObjectHolder("manastar") public static Block manastar; + @ObjectHolder("hydroangeas") public static Block hydroangeas; + @ObjectHolder("endoflame") public static Block endoflame; + @ObjectHolder("thermalily") public static Block thermalily; + @ObjectHolder("rosa_arcana") public static Block rosaArcana; + @ObjectHolder("munchdew") public static Block munchdew; + @ObjectHolder("entropinnyum") public static Block entropinnyum; + @ObjectHolder("kekimurus") public static Block kekimurus; + @ObjectHolder("gourmaryllis") public static Block gourmaryllis; + @ObjectHolder("narslimmus") public static Block narslimmus; + @ObjectHolder("spectrolus") public static Block spectrolus; + @ObjectHolder("dandelifeon") public static Block dandelifeon; + @ObjectHolder("rafflowsia") public static Block rafflowsia; + @ObjectHolder("shulk_me_not") public static Block shulkMeNot; + @ObjectHolder("bellethorn") public static Block bellethorn; + @ObjectHolder("bellethorn_chibi") public static Block bellethornChibi; + @ObjectHolder("bergamute") public static Block bergamute; + @ObjectHolder("dreadthorn") public static Block dreadthorn; + @ObjectHolder("heisei_dream") public static Block heiseiDream; + @ObjectHolder("tigerseye") public static Block tigerseye; + @ObjectHolder("jaded_amaranthus") public static Block jadedAmaranthus; + @ObjectHolder("orechid") public static Block orechid; + @ObjectHolder("fallen_kanade") public static Block fallenKanade; + @ObjectHolder("exoflame") public static Block exoflame; + @ObjectHolder("agricarnation") public static Block agricarnation; + @ObjectHolder("agricarnation_chibi") public static Block agricarnationChibi; + @ObjectHolder("hopperhock") public static Block hopperhock; + @ObjectHolder("hopperhock_chibi") public static Block hopperhockChibi; + @ObjectHolder("tangleberrie") public static Block tangleberrie; + @ObjectHolder("jiyuulia") public static Block jiyuulia; + @ObjectHolder("rannuncarpus") public static Block rannuncarpus; + @ObjectHolder("rannuncarpus_chibi") public static Block rannuncarpusChibi; + @ObjectHolder("hyacidus") public static Block hyacidus; + @ObjectHolder("pollidisiac") public static Block pollidisiac; + @ObjectHolder("clayconia") public static Block clayconia; + @ObjectHolder("clayconia_chibi") public static Block clayconiaChibi; + @ObjectHolder("loonium") public static Block loonium; + @ObjectHolder("daffomill") public static Block daffomill; + @ObjectHolder("vinculotus") public static Block vinculotus; + @ObjectHolder("spectranthemum") public static Block spectranthemum; + @ObjectHolder("medumone") public static Block medumone; + @ObjectHolder("marimorphosis") public static Block marimorphosis; + @ObjectHolder("marimorphosis_chibi") public static Block marimorphosisChibi; + @ObjectHolder("bubbell") public static Block bubbell; + @ObjectHolder("bubbell_chibi") public static Block bubbellChibi; + @ObjectHolder("solegnolia") public static Block solegnolia; + @ObjectHolder("solegnolia_chibi") public static Block solegnoliaChibi; + @ObjectHolder("orechid_ignem") public static Block orechidIgnem; + + @ObjectHolder("floating_pure_daisy") public static Block pureDaisyFloating; + @ObjectHolder("floating_manastar") public static Block manastarFloating; + @ObjectHolder("floating_hydroangeas") public static Block hydroangeasFloating; + @ObjectHolder("floating_endoflame") public static Block endoflameFloating; + @ObjectHolder("floating_thermalily") public static Block thermalilyFloating; + @ObjectHolder("floating_rosa_arcana") public static Block rosaArcanaFloating; + @ObjectHolder("floating_munchdew") public static Block munchdewFloating; + @ObjectHolder("floating_entropinnyum") public static Block entropinnyumFloating; + @ObjectHolder("floating_kekimurus") public static Block kekimurusFloating; + @ObjectHolder("floating_gourmaryllis") public static Block gourmaryllisFloating; + @ObjectHolder("floating_narslimmus") public static Block narslimmusFloating; + @ObjectHolder("floating_spectrolus") public static Block spectrolusFloating; + @ObjectHolder("floating_dandelifeon") public static Block dandelifeonFloating; + @ObjectHolder("floating_rafflowsia") public static Block rafflowsiaFloating; + @ObjectHolder("floating_shulk_me_not") public static Block shulkMeNotFloating; + @ObjectHolder("floating_bellethorn") public static Block bellethornFloating; + @ObjectHolder("floating_bellethorn_chibi") public static Block bellethornChibiFloating; + @ObjectHolder("floating_bergamute") public static Block bergamuteFloating; + @ObjectHolder("floating_dreadthorn") public static Block dreadthornFloating; + @ObjectHolder("floating_heisei_dream") public static Block heiseiDreamFloating; + @ObjectHolder("floating_tigerseye") public static Block tigerseyeFloating; + @ObjectHolder("floating_jaded_amaranthus") public static Block jadedAmaranthusFloating; + @ObjectHolder("floating_orechid") public static Block orechidFloating; + @ObjectHolder("floating_fallen_kanade") public static Block fallenKanadeFloating; + @ObjectHolder("floating_exoflame") public static Block exoflameFloating; + @ObjectHolder("floating_agricarnation") public static Block agricarnationFloating; + @ObjectHolder("floating_agricarnation_chibi") public static Block agricarnationChibiFloating; + @ObjectHolder("floating_hopperhock") public static Block hopperhockFloating; + @ObjectHolder("floating_hopperhock_chibi") public static Block hopperhockChibiFloating; + @ObjectHolder("floating_tangleberrie") public static Block tangleberrieFloating; + @ObjectHolder("floating_jiyuulia") public static Block jiyuuliaFloating; + @ObjectHolder("floating_rannuncarpus") public static Block rannuncarpusFloating; + @ObjectHolder("floating_rannuncarpus_chibi") public static Block rannuncarpusChibiFloating; + @ObjectHolder("floating_hyacidus") public static Block hyacidusFloating; + @ObjectHolder("floating_pollidisiac") public static Block pollidisiacFloating; + @ObjectHolder("floating_clayconia") public static Block clayconiaFloating; + @ObjectHolder("floating_clayconia_chibi") public static Block clayconiaChibiFloating; + @ObjectHolder("floating_loonium") public static Block looniumFloating; + @ObjectHolder("floating_daffomill") public static Block daffomillFloating; + @ObjectHolder("floating_vinculotus") public static Block vinculotusFloating; + @ObjectHolder("floating_spectranthemum") public static Block spectranthemumFloating; + @ObjectHolder("floating_medumone") public static Block medumoneFloating; + @ObjectHolder("floating_marimorphosis") public static Block marimorphosisFloating; + @ObjectHolder("floating_marimorphosis_chibi") public static Block marimorphosisChibiFloating; + @ObjectHolder("floating_bubbell") public static Block bubbellFloating; + @ObjectHolder("floating_bubbell_chibi") public static Block bubbellChibiFloating; + @ObjectHolder("floating_solegnolia") public static Block solegnoliaFloating; + @ObjectHolder("floating_solegnolia_chibi") public static Block solegnoliaChibiFloating; + @ObjectHolder("floating_orechid_ignem") public static Block orechidIgnemFloating; + + private static ResourceLocation floating(ResourceLocation orig) { + return new ResourceLocation(orig.getNamespace(), "floating_" + orig.getPath()); + } - @ObjectHolder("hydroangeas") public static SubTileType hydroangeas; - @ObjectHolder("endoflame") public static SubTileType endoflame; - @ObjectHolder("thermalily") public static SubTileType thermalily; - @ObjectHolder("rosa_arcana") public static SubTileType rosaArcana; - @ObjectHolder("munchdew") public static SubTileType munchdew; - @ObjectHolder("entropinnyum") public static SubTileType entropinnyum; - @ObjectHolder("kekimurus") public static SubTileType kekimurus; - @ObjectHolder("gourmaryllis") public static SubTileType gourmaryllis; - @ObjectHolder("narslimmus") public static SubTileType narslimmus; - @ObjectHolder("spectrolus") public static SubTileType spectrolus; - @ObjectHolder("dandelifeon") public static SubTileType dandelifeon; - @ObjectHolder("rafflowsia") public static SubTileType rafflowsia; - @ObjectHolder("shulk_me_not") public static SubTileType shulkMeNot; + private static ResourceLocation chibi(ResourceLocation orig) { + return new ResourceLocation(orig.getNamespace(), orig.getPath() + "_chibi"); + } - @ObjectHolder("bellethorn") public static SubTileType bellethorn; - @ObjectHolder("bellethorn_chibi") public static SubTileType bellethornChibi; - @ObjectHolder("bergamute") public static SubTileType bergamute; - @ObjectHolder("dreadthorn") public static SubTileType dreadthorn; - @ObjectHolder("heisei_dream") public static SubTileType heiseiDream; - @ObjectHolder("tigerseye") public static SubTileType tigerseye; - @ObjectHolder("jaded_amaranthus") public static SubTileType jadedAmaranthus; - @ObjectHolder("orechid") public static SubTileType orechid; - @ObjectHolder("fallen_kanade") public static SubTileType fallenKanade; - @ObjectHolder("exoflame") public static SubTileType exoflame; - @ObjectHolder("agricarnation") public static SubTileType agricarnation; - @ObjectHolder("agricarnation_chibi") public static SubTileType agricarnationChibi; - @ObjectHolder("hopperhock") public static SubTileType hopperhock; - @ObjectHolder("hopperhock_chibi") public static SubTileType hopperhockChibi; - @ObjectHolder("tangleberrie") public static SubTileType tangleberrie; - @ObjectHolder("jiyuulia") public static SubTileType jiyuulia; - @ObjectHolder("rannuncarpus") public static SubTileType rannuncarpus; - @ObjectHolder("rannuncarpus_chibi") public static SubTileType rannuncarpusChibi; - @ObjectHolder("hyacidus") public static SubTileType hyacidus; - @ObjectHolder("pollidisiac") public static SubTileType pollidisiac; - @ObjectHolder("clayconia") public static SubTileType clayconia; - @ObjectHolder("clayconia_chibi") public static SubTileType clayconiaChibi; - @ObjectHolder("loonium") public static SubTileType loonium; - @ObjectHolder("daffomill") public static SubTileType daffomill; - @ObjectHolder("vinculotus") public static SubTileType vinculotus; - @ObjectHolder("spectranthemum") public static SubTileType spectranthemum; - @ObjectHolder("medumone") public static SubTileType medumone; - @ObjectHolder("marimorphosis") public static SubTileType marimorphosis; - @ObjectHolder("marimorphosis_chibi") public static SubTileType marimorphosisChibi; - @ObjectHolder("bubbell") public static SubTileType bubbell; - @ObjectHolder("bubbell_chibi") public static SubTileType bubbellChibi; - @ObjectHolder("solegnolia") public static SubTileType solegnolia; - @ObjectHolder("solegnolia_chibi") public static SubTileType solegnoliaChibi; - @ObjectHolder("orechid_ignem") public static SubTileType orechidIgnem; + private static final List, ResourceLocation>> TYPES = ImmutableList., ResourceLocation>>of( + Pair.of(SubTilePureDaisy::new, LibBlockNames.SUBTILE_PUREDAISY), + Pair.of(SubTileManastar::new, LibBlockNames.SUBTILE_MANASTAR), + Pair.of(SubTileEndoflame::new, LibBlockNames.SUBTILE_ENDOFLAME), + Pair.of(SubTileHydroangeas::new, LibBlockNames.SUBTILE_HYDROANGEAS), + Pair.of(SubTileThermalily::new, LibBlockNames.SUBTILE_THERMALILY), + Pair.of(SubTileArcaneRose::new, LibBlockNames.SUBTILE_ARCANE_ROSE), + Pair.of(SubTileMunchdew::new, LibBlockNames.SUBTILE_MUNCHDEW), + Pair.of(SubTileEntropinnyum::new, LibBlockNames.SUBTILE_ENTROPINNYUM), + Pair.of(SubTileKekimurus::new, LibBlockNames.SUBTILE_KEKIMURUS), + Pair.of(SubTileGourmaryllis::new, LibBlockNames.SUBTILE_GOURMARYLLIS), + Pair.of(SubTileNarslimmus::new, LibBlockNames.SUBTILE_NARSLIMMUS), + Pair.of(SubTileSpectrolus::new, LibBlockNames.SUBTILE_SPECTROLUS), + Pair.of(SubTileDandelifeon::new, LibBlockNames.SUBTILE_DANDELIFEON), + Pair.of(SubTileRafflowsia::new, LibBlockNames.SUBTILE_RAFFLOWSIA), + Pair.of(SubTileShulkMeNot::new, LibBlockNames.SUBTILE_SHULK_ME_NOT), + Pair.of(SubTileBellethorn::new, LibBlockNames.SUBTILE_BELLETHORN), + Pair.of(SubTileBellethorn.Mini::new, chibi(LibBlockNames.SUBTILE_BELLETHORN)), + Pair.of(SubTileBergamute::new, LibBlockNames.SUBTILE_BERGAMUTE), + Pair.of(SubTileDreadthorn::new, LibBlockNames.SUBTILE_DREADTHORN), + Pair.of(SubTileHeiseiDream::new, LibBlockNames.SUBTILE_HEISEI_DREAM), + Pair.of(SubTileTigerseye::new, LibBlockNames.SUBTILE_TIGERSEYE), + Pair.of(SubTileJadedAmaranthus::new, LibBlockNames.SUBTILE_JADED_AMARANTHUS), + Pair.of(SubTileOrechid::new, LibBlockNames.SUBTILE_ORECHID), + Pair.of(SubTileFallenKanade::new, LibBlockNames.SUBTILE_FALLEN_KANADE), + Pair.of(SubTileExoflame::new, LibBlockNames.SUBTILE_EXOFLAME), + Pair.of(SubTileAgricarnation::new, LibBlockNames.SUBTILE_AGRICARNATION), + Pair.of(SubTileAgricarnation.Mini::new, chibi(LibBlockNames.SUBTILE_AGRICARNATION)), + Pair.of(SubTileHopperhock::new, LibBlockNames.SUBTILE_HOPPERHOCK), + Pair.of(SubTileHopperhock.Mini::new, chibi(LibBlockNames.SUBTILE_HOPPERHOCK)), + Pair.of(SubTileTangleberrie::new, LibBlockNames.SUBTILE_TANGLEBERRIE), + Pair.of(SubTileJiyuulia::new, LibBlockNames.SUBTILE_JIYUULIA), + Pair.of(SubTileRannuncarpus::new, LibBlockNames.SUBTILE_RANNUNCARPUS), + Pair.of(SubTileRannuncarpus.Mini::new, chibi(LibBlockNames.SUBTILE_RANNUNCARPUS)), + Pair.of(SubTileHyacidus::new, LibBlockNames.SUBTILE_HYACIDUS), + Pair.of(SubTilePollidisiac::new, LibBlockNames.SUBTILE_POLLIDISIAC), + Pair.of(SubTileClayconia::new, LibBlockNames.SUBTILE_CLAYCONIA), + Pair.of(SubTileClayconia.Mini::new, chibi(LibBlockNames.SUBTILE_CLAYCONIA)), + Pair.of(SubTileLoonuim::new, LibBlockNames.SUBTILE_LOONIUM), + Pair.of(SubTileDaffomill::new, LibBlockNames.SUBTILE_DAFFOMILL), + Pair.of(SubTileVinculotus::new, LibBlockNames.SUBTILE_VINCULOTUS), + Pair.of(SubTileSpectranthemum::new, LibBlockNames.SUBTILE_SPECTRANTHEMUM), + Pair.of(SubTileMedumone::new, LibBlockNames.SUBTILE_MEDUMONE), + Pair.of(SubTileMarimorphosis::new, LibBlockNames.SUBTILE_MARIMORPHOSIS), + Pair.of(SubTileMarimorphosis.Mini::new, chibi(LibBlockNames.SUBTILE_MARIMORPHOSIS)), + Pair.of(SubTileBubbell::new, LibBlockNames.SUBTILE_BUBBELL), + Pair.of(SubTileBubbell.Mini::new, chibi(LibBlockNames.SUBTILE_BUBBELL)), + Pair.of(SubTileSolegnolia::new, LibBlockNames.SUBTILE_SOLEGNOLIA), + Pair.of(SubTileSolegnolia.Mini::new, chibi(LibBlockNames.SUBTILE_SOLEGNOLIA)), + Pair.of(SubTileOrechidIgnem::new, LibBlockNames.SUBTILE_ORECHID_IGNEM) + ); @SubscribeEvent - public static void initSubtiles(RegistryEvent.Register evt) { - IForgeRegistry r = evt.getRegistry(); - r.register(new SubTileType(SubTileType.MISC_TYPE, DummySubTile::new).setRegistryName(BotaniaAPI.DUMMY_SUBTILE_NAME)); - r.register(new SubTileType(SubTileType.MISC_TYPE, SubTilePureDaisy::new).setRegistryName(LibBlockNames.SUBTILE_PUREDAISY)); - r.register(new SubTileType(SubTileType.MISC_TYPE, SubTileManastar::new).setRegistryName(LibBlockNames.SUBTILE_MANASTAR)); + public static void registerBlocks(RegistryEvent.Register evt) { + IForgeRegistry r = evt.getRegistry(); + Block.Properties props = Block.Properties.from(Blocks.POPPY); + Block.Properties floatProps = Block.Properties.create(Material.GROUND).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileHydroangeas::new).setRegistryName(LibBlockNames.SUBTILE_HYDROANGEAS)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileEndoflame::new).setRegistryName(LibBlockNames.SUBTILE_ENDOFLAME)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileThermalily::new).setRegistryName(LibBlockNames.SUBTILE_THERMALILY)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileArcaneRose::new).setRegistryName(LibBlockNames.SUBTILE_ARCANE_ROSE)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileMunchdew::new).setRegistryName(LibBlockNames.SUBTILE_MUNCHDEW)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileEntropinnyum::new).setRegistryName(LibBlockNames.SUBTILE_ENTROPINNYUM)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileKekimurus::new).setRegistryName(LibBlockNames.SUBTILE_KEKIMURUS)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileGourmaryllis::new).setRegistryName(LibBlockNames.SUBTILE_GOURMARYLLIS)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileNarslimmus::new).setRegistryName(LibBlockNames.SUBTILE_NARSLIMMUS)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileSpectrolus::new).setRegistryName(LibBlockNames.SUBTILE_SPECTROLUS)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileDandelifeon::new).setRegistryName(LibBlockNames.SUBTILE_DANDELIFEON)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileRafflowsia::new).setRegistryName(LibBlockNames.SUBTILE_RAFFLOWSIA)); - r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileShulkMeNot::new).setRegistryName(LibBlockNames.SUBTILE_SHULK_ME_NOT)); + for (Pair, ResourceLocation> type : TYPES) { + register(r, new BlockSpecialFlower(props, type.getLeft()), type.getValue()); + register(r, new BlockFloatingSpecialFlower(floatProps, type.getLeft()), floating(type.getValue())); + } + } - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBellethorn::new).setRegistryName(LibBlockNames.SUBTILE_BELLETHORN)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBellethorn.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_BELLETHORN.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileDreadthorn::new).setRegistryName(LibBlockNames.SUBTILE_DREADTHORN)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHeiseiDream::new).setRegistryName(LibBlockNames.SUBTILE_HEISEI_DREAM)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileTigerseye::new).setRegistryName(LibBlockNames.SUBTILE_TIGERSEYE)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileJadedAmaranthus::new).setRegistryName(LibBlockNames.SUBTILE_JADED_AMARANTHUS)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileOrechid::new).setRegistryName(LibBlockNames.SUBTILE_ORECHID)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileOrechidIgnem::new).setRegistryName(LibBlockNames.SUBTILE_ORECHID_IGNEM)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileFallenKanade::new).setRegistryName(LibBlockNames.SUBTILE_FALLEN_KANADE)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileExoflame::new).setRegistryName(LibBlockNames.SUBTILE_EXOFLAME)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileAgricarnation::new).setRegistryName(LibBlockNames.SUBTILE_AGRICARNATION)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileAgricarnation.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_AGRICARNATION.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHopperhock::new).setRegistryName(LibBlockNames.SUBTILE_HOPPERHOCK)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHopperhock.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_HOPPERHOCK.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileTangleberrie::new).setRegistryName(LibBlockNames.SUBTILE_TANGLEBERRIE)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileJiyuulia::new).setRegistryName(LibBlockNames.SUBTILE_JIYUULIA)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileRannuncarpus::new).setRegistryName(LibBlockNames.SUBTILE_RANNUNCARPUS)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileRannuncarpus.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_RANNUNCARPUS.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHyacidus::new).setRegistryName(LibBlockNames.SUBTILE_HYACIDUS)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTilePollidisiac::new).setRegistryName(LibBlockNames.SUBTILE_POLLIDISIAC)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileClayconia::new).setRegistryName(LibBlockNames.SUBTILE_CLAYCONIA)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileClayconia.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_CLAYCONIA.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileLoonuim::new).setRegistryName(LibBlockNames.SUBTILE_LOONIUM)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileDaffomill::new).setRegistryName(LibBlockNames.SUBTILE_DAFFOMILL)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileVinculotus::new).setRegistryName(LibBlockNames.SUBTILE_VINCULOTUS)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSpectranthemum::new).setRegistryName(LibBlockNames.SUBTILE_SPECTRANTHEMUM)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMedumone::new).setRegistryName(LibBlockNames.SUBTILE_MEDUMONE)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMarimorphosis::new).setRegistryName(LibBlockNames.SUBTILE_MARIMORPHOSIS)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMarimorphosis.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_MARIMORPHOSIS.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBubbell::new).setRegistryName(LibBlockNames.SUBTILE_BUBBELL)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBubbell.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_BUBBELL.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSolegnolia::new).setRegistryName(LibBlockNames.SUBTILE_SOLEGNOLIA)); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSolegnolia.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_SOLEGNOLIA.getPath() + "_chibi")); - r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBergamute::new).setRegistryName(LibBlockNames.SUBTILE_BERGAMUTE)); + @SubscribeEvent + public static void registerItemBlocks(RegistryEvent.Register evt) { + IForgeRegistry b = ForgeRegistries.BLOCKS; + IForgeRegistry r = evt.getRegistry(); + Item.Properties props = ModItems.defaultBuilder(); + + for (Pair, ResourceLocation> type : TYPES) { + Block block = b.getValue(type.getRight()); + Block floating = b.getValue(floating(type.getRight())); + + register(r, new ItemBlockSpecialFlower(block, props), type.getRight()); + register(r, new ItemBlockSpecialFlower(floating, props), floating(type.getRight())); + } + } + + @SubscribeEvent + public static void registerTEs(RegistryEvent.Register> evt) { + IForgeRegistry> r = evt.getRegistry(); + + for (Pair, ResourceLocation> type : TYPES) { + register(r, TileEntityType.Builder.create(type.getLeft()).build(null), type.getRight()); + } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index a9fe5bc34..c754b7215 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -42,7 +42,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileFloatingFlower; -import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.IFloatingFlowerVariant; import vazkii.botania.common.lexicon.LexiconData; @@ -80,27 +79,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable { return BlockRenderLayer.CUTOUT; } - /* todo 1.13 - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.ISLAND_TYPE }); - } - - @Nonnull - @Override - public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) { - state = getActualState(state, world, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); - if (te instanceof TileFloatingFlower) { - state = ((IExtendedBlockState) state).with(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingFlower) te).getIslandType()); - } else if (te instanceof TileFloatingSpecialFlower) { - state = ((IExtendedBlockState) state).with(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingSpecialFlower) te).getIslandType()); - } - return state; - } - */ - @OnlyIn(Dist.CLIENT) @Override public void animateTick(IBlockState state, World world, BlockPos pos, Random rand) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index 476824e41..fde04284c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -11,40 +11,46 @@ package vazkii.botania.common.block.subtile; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.Botania; +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; + +public class SubTileManastar extends TileEntitySpecialFlower { + @ObjectHolder(LibMisc.MOD_ID + ":manastar") + public static TileEntityType TYPE; -public class SubTileManastar extends SubTileEntity { private static final int SET_STATE_EVENT = 0; private static final int NONE = 0, DECREASING = 1, INCREASING = 2; private int lastMana = 0; private int state = NONE; - public SubTileManastar(SubTileType type) { - super(type); + public SubTileManastar() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(getWorld().isRemote) { if(state != NONE && Math.random() > 0.6) - Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, state == INCREASING ? 0.05F : 1F, 0.05F, state == INCREASING ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); + Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, state == INCREASING ? 0.05F : 1F, 0.05F, state == INCREASING ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); } else { int mana = 0; for(EnumFacing dir : MathHelper.HORIZONTALS) { - BlockPos pos = supertile.getPos().offset(dir); + BlockPos pos = getPos().offset(dir); if(getWorld().isBlockLoaded(pos)) { - TileEntity tile = supertile.getWorld().getTileEntity(pos); + TileEntity tile = getWorld().getTileEntity(pos); if(tile instanceof IManaPool) mana += ((IManaPool) tile).getCurrentMana(); } @@ -52,7 +58,7 @@ public class SubTileManastar extends SubTileEntity { int newState = mana > lastMana ? INCREASING : mana < lastMana ? DECREASING : NONE; if(newState != state) - getWorld().addBlockEvent(getPos(), supertile.getBlockState().getBlock(), SET_STATE_EVENT, newState); + getWorld().addBlockEvent(getPos(), getBlockState().getBlock(), SET_STATE_EVENT, newState); if(ticksExisted % 60 == 0) lastMana = mana; 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 e1411df4f..225e64110 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -13,21 +13,26 @@ package vazkii.botania.common.block.subtile; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.Botania; +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; import java.util.Arrays; -public class SubTilePureDaisy extends SubTileEntity { +public class SubTilePureDaisy extends TileEntitySpecialFlower { + @ObjectHolder(LibMisc.MOD_ID + ":pure_daisy") + public static TileEntityType TYPE; private static final String TAG_POSITION = "position"; private static final String TAG_TICKS_REMAINING = "ticksRemaining"; @@ -51,14 +56,14 @@ public class SubTilePureDaisy extends SubTileEntity { // Bitfield of active positions, used clientside for particles private int activePositions = 0; - public SubTilePureDaisy(SubTileType type) { - super(type); + public SubTilePureDaisy() { + super(TYPE); Arrays.fill(ticksRemaining, -1); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(getWorld().isRemote) { for (int i = 0; i < POSITIONS.length; i++) { @@ -76,8 +81,8 @@ public class SubTilePureDaisy extends SubTileEntity { positionAt = 0; BlockPos acoords = POSITIONS[positionAt]; - BlockPos coords = supertile.getPos().add(acoords); - World world = supertile.getWorld(); + BlockPos coords = getPos().add(acoords); + World world = getWorld(); if(!world.isAirBlock(coords)) { world.profiler.startSection("findRecipe"); RecipePureDaisy recipe = findRecipe(coords); @@ -92,9 +97,9 @@ public class SubTilePureDaisy extends SubTileEntity { ticksRemaining[positionAt] = -1; if(recipe.set(world,coords, this)) { - world.addBlockEvent(getPos(), supertile.getBlockState().getBlock(), RECIPE_COMPLETE_EVENT, positionAt); + world.addBlockEvent(getPos(), getBlockState().getBlock(), RECIPE_COMPLETE_EVENT, positionAt); if(ConfigHandler.COMMON.blockBreakParticles.get()) - supertile.getWorld().playEvent(2001, coords, Block.getStateId(recipe.getOutputState())); + getWorld().playEvent(2001, coords, Block.getStateId(recipe.getOutputState())); } } } else ticksRemaining[positionAt] = -1; @@ -112,7 +117,7 @@ public class SubTilePureDaisy extends SubTileEntity { } if (newActivePositions != activePositions) { - getWorld().addBlockEvent(getPos(), supertile.getBlockState().getBlock(), UPDATE_ACTIVE_EVENT, newActivePositions); + getWorld().addBlockEvent(getPos(), getBlockState().getBlock(), UPDATE_ACTIVE_EVENT, newActivePositions); } } @@ -159,7 +164,7 @@ public class SubTilePureDaisy extends SubTileEntity { public void readFromPacketNBT(NBTTagCompound cmp) { positionAt = cmp.getInt(TAG_POSITION); - if(supertile.getWorld() != null && !supertile.getWorld().isRemote) + if(getWorld() != null && !getWorld().isRemote) for(int i = 0; i < ticksRemaining.length; i++) ticksRemaining[i] = cmp.getInt(TAG_TICKS_REMAINING + i); } 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 e4ed61ff8..58911dfd8 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 @@ -19,30 +19,39 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tags.BlockTags; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; 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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; +import vazkii.botania.common.lib.LibMisc; -public class SubTileAgricarnation extends SubTileFunctional { +public class SubTileAgricarnation extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":agricarnation") + public static TileEntityType TYPE; private static final int RANGE = 5; private static final int RANGE_MINI = 2; - public SubTileAgricarnation(SubTileType type) { + public SubTileAgricarnation(TileEntityType type) { super(type); } - @Override - public void onUpdate() { - super.onUpdate(); + public SubTileAgricarnation() { + this(TYPE); + } - if(supertile.getWorld().isRemote) + @Override + public void tickFlower() { + super.tickFlower(); + + if(getWorld().isRemote) return; if(ticksExisted % 200 == 0) @@ -50,22 +59,22 @@ public class SubTileAgricarnation extends SubTileFunctional { if(ticksExisted % 6 == 0 && redstoneSignal == 0) { int range = getRange(); - int x = supertile.getPos().getX() + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; - int z = supertile.getPos().getZ() + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; + int x = getPos().getX() + getWorld().rand.nextInt(range * 2 + 1) - range; + int z = getPos().getZ() + getWorld().rand.nextInt(range * 2 + 1) - range; for(int i = 4; i > -2; i--) { - int y = supertile.getPos().getY() + i; + int y = getPos().getY() + i; BlockPos pos = new BlockPos(x, y, z); - if(supertile.getWorld().isAirBlock(pos)) + if(getWorld().isAirBlock(pos)) continue; if(isPlant(pos) && mana > 5) { - Block block = supertile.getWorld().getBlockState(pos).getBlock(); + Block block = getWorld().getBlockState(pos).getBlock(); mana -= 5; - supertile.getWorld().getPendingBlockTicks().scheduleTick(pos, block, 1); + getWorld().getPendingBlockTicks().scheduleTick(pos, block, 1); if(ConfigHandler.COMMON.blockBreakParticles.get()) - supertile.getWorld().playEvent(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); - supertile.getWorld().playSound(null, x, y, z, ModSounds.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); + getWorld().playEvent(2005, pos, 6 + getWorld().rand.nextInt(4)); + getWorld().playSound(null, x, y, z, ModSounds.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); break; } @@ -79,13 +88,13 @@ public class SubTileAgricarnation extends SubTileFunctional { } private boolean isPlant(BlockPos pos) { - IBlockState state = supertile.getWorld().getBlockState(pos); + IBlockState state = getWorld().getBlockState(pos); Block block = state.getBlock(); if(block == Blocks.GRASS || BlockTags.LEAVES.contains(block) || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) return false; Material mat = state.getMaterial(); - return mat != null && (mat == Material.PLANTS || mat == Material.CACTUS || mat == Material.GRASS || mat == Material.LEAVES || mat == Material.GOURD) && block instanceof IGrowable && ((IGrowable) block).canGrow(supertile.getWorld(), pos, supertile.getWorld().getBlockState(pos), supertile.getWorld().isRemote); + return mat != null && (mat == Material.PLANTS || mat == Material.CACTUS || mat == Material.GRASS || mat == Material.LEAVES || mat == Material.GOURD) && block instanceof IGrowable && ((IGrowable) block).canGrow(getWorld(), pos, getWorld().getBlockState(pos), getWorld().isRemote); } @Override @@ -113,8 +122,11 @@ public class SubTileAgricarnation extends SubTileFunctional { } public static class Mini extends SubTileAgricarnation { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":agricarnation_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public int getRange() { return RANGE_MINI; } 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 442ae5ee3..8aefa0e85 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 @@ -14,26 +14,35 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.DamageSource; 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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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 java.util.List; import java.util.function.Predicate; -public class SubTileBellethorn extends SubTileFunctional { +public class SubTileBellethorn extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":bellethorn") + public static TileEntityType TYPE; public static final int RANGE = 6; public static final int RANGE_MINI = 1; - public SubTileBellethorn(SubTileType type) { + public SubTileBellethorn(TileEntityType type) { super(type); } + public SubTileBellethorn() { + this(TYPE); + } + @Override public int getColor() { return 0xBA3421; @@ -45,10 +54,10 @@ public class SubTileBellethorn extends SubTileFunctional { } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(supertile.getWorld().isRemote || redstoneSignal > 0) + if(getWorld().isRemote || redstoneSignal > 0) return; if(ticksExisted % 200 == 0) @@ -58,7 +67,7 @@ public class SubTileBellethorn extends SubTileFunctional { if(ticksExisted % 5 == 0) { int range = getRange(); - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-range, -range, -range), supertile.getPos().add(range + 1, range + 1, range + 1)), getSelector()::test); + List entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(getPos().add(-range, -range, -range), getPos().add(range + 1, range + 1, range + 1)), getSelector()::test); for(EntityLivingBase entity : entities) { if(entity.hurtTime == 0 && mana >= manaToUse) { @@ -102,8 +111,11 @@ public class SubTileBellethorn extends SubTileFunctional { } public static class Mini extends SubTileBellethorn { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public int getRange() { return RANGE_MINI; } 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 e82cc15a5..4b2be838d 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 @@ -1,28 +1,34 @@ package vazkii.botania.common.block.subtile.functional; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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 java.util.Collections; import java.util.Set; import java.util.WeakHashMap; -public class SubTileBergamute extends SubTileFunctional { +public class SubTileBergamute extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":bergamute") + public static TileEntityType TYPE; + private static final int RANGE = 4; private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); - public SubTileBergamute(SubTileType type) { - super(type); + public SubTileBergamute() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if (supertile.getWorld().isRemote) { + if (getWorld().isRemote) { if(!existingFlowers.contains(this)) { existingFlowers.add(this); } @@ -33,8 +39,8 @@ public class SubTileBergamute extends SubTileFunctional { protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) - .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) - .filter(f -> f.supertile.getDistanceSq(x, y, z) <= RANGE * RANGE) + .filter(f -> f.getWorld().getTileEntity(f.getPos()) == f) + .filter(f -> f.getDistanceSq(x, y, z) <= RANGE * RANGE) .findAny().orElse(null); } 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 53f8aad6d..14bac26ea 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 @@ -14,18 +14,23 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; + +public class SubTileBubbell extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":bubbell") + public static TileEntityType TYPE; -public class SubTileBubbell extends SubTileFunctional { private static final int RANGE = 12; private static final int RANGE_MINI = 6; @@ -34,15 +39,19 @@ public class SubTileBubbell extends SubTileFunctional { int range = 2; - public SubTileBubbell(SubTileType type) { + public SubTileBubbell(TileEntityType type) { super(type); } - @Override - public void onUpdate() { - super.onUpdate(); + public SubTileBubbell() { + this(TYPE); + } - if(supertile.getWorld().isRemote) + @Override + public void tickFlower() { + super.tickFlower(); + + if(getWorld().isRemote) return; if(ticksExisted % 200 == 0) @@ -56,11 +65,11 @@ public class SubTileBubbell extends SubTileFunctional { for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-range, -range, -range), getPos().add(range, range, range))) { if(getPos().distanceSq(pos) < range * range) { - IBlockState state = supertile.getWorld().getBlockState(pos); + IBlockState state = getWorld().getBlockState(pos); if(state.getMaterial() == Material.WATER) { - supertile.getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2); - TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(pos); - air.setFlower(supertile); + getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2); + TileFakeAir air = (TileFakeAir) getWorld().getTileEntity(pos); + air.setFlower(this); } } } @@ -69,12 +78,8 @@ public class SubTileBubbell extends SubTileFunctional { public static boolean isValidBubbell(World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); - if(tile != null && tile instanceof ISubTileContainer) { - ISubTileContainer container = (ISubTileContainer) tile; - if(container.getSubTile() != null && container.getSubTile() instanceof SubTileBubbell) { - SubTileBubbell bubbell = (SubTileBubbell) container.getSubTile(); - return bubbell.mana > COST_PER_TICK; - } + if(tile instanceof SubTileBubbell) { + return ((SubTileBubbell) tile).mana > COST_PER_TICK; } return false; @@ -117,8 +122,11 @@ public class SubTileBubbell extends SubTileFunctional { } public static class Mini extends SubTileBubbell { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":bubbell_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public int getRange() { return RANGE_MINI; } 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 6b2532926..e9ee2f271 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 @@ -15,18 +15,23 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; import java.util.ArrayList; import java.util.List; -public class SubTileClayconia extends SubTileFunctional { +public class SubTileClayconia extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":clayconia") + public static TileEntityType TYPE; private static final int COST = 80; private static final int RANGE = 5; @@ -35,23 +40,27 @@ public class SubTileClayconia extends SubTileFunctional { private static final int RANGE_MINI = 2; private static final int RANGE_Y_MINI = 1; - public SubTileClayconia(SubTileType type) { + public SubTileClayconia(TileEntityType type) { super(type); } - @Override - public void onUpdate() { - super.onUpdate(); + public SubTileClayconia() { + this(TYPE); + } - if(!supertile.getWorld().isRemote && ticksExisted % 5 == 0) { + @Override + public void tickFlower() { + super.tickFlower(); + + if(!getWorld().isRemote && ticksExisted % 5 == 0) { if(mana >= COST) { BlockPos coords = getCoordsToPut(); if(coords != null) { - supertile.getWorld().removeBlock(coords); + getWorld().removeBlock(coords); if(ConfigHandler.COMMON.blockBreakParticles.get()) - supertile.getWorld().playEvent(2001, coords, Block.getStateId(Blocks.SAND.getDefaultState())); - EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.CLAY_BALL)); - supertile.getWorld().spawnEntity(item); + getWorld().playEvent(2001, coords, Block.getStateId(Blocks.SAND.getDefaultState())); + EntityItem item = new EntityItem(getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.CLAY_BALL)); + getWorld().spawnEntity(item); mana -= COST; } } @@ -67,15 +76,15 @@ public class SubTileClayconia extends SubTileFunctional { for(int i = -range; i < range + 1; i++) for(int j = -rangeY; j < rangeY + 1; j++) for(int k = -range; k < range + 1; k++) { - BlockPos pos = supertile.getPos().add(i, j, k); - Block block = supertile.getWorld().getBlockState(pos).getBlock(); + BlockPos pos = getPos().add(i, j, k); + Block block = getWorld().getBlockState(pos).getBlock(); if(block == Blocks.SAND) possibleCoords.add(pos); } if(possibleCoords.isEmpty()) return null; - return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size())); + return possibleCoords.get(getWorld().rand.nextInt(possibleCoords.size())); } @Override @@ -107,8 +116,11 @@ public class SubTileClayconia extends SubTileFunctional { } public static class Mini extends SubTileClayconia { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public int getRange() { return RANGE_MINI; } 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 22a64b81e..53234705e 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 @@ -17,24 +17,29 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketItemAge; import java.util.List; -public class SubTileDaffomill extends SubTileFunctional { +public class SubTileDaffomill extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":daffomill") + public static TileEntityType TYPE; private static final String TAG_ORIENTATION = "orientation"; private static final String TAG_WIND_TICKS = "windTicks"; @@ -42,16 +47,16 @@ public class SubTileDaffomill extends SubTileFunctional { private int windTicks = 0; private EnumFacing orientation = EnumFacing.NORTH; - public SubTileDaffomill(SubTileType type) { - super(type); + public SubTileDaffomill() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(supertile.getWorld().rand.nextInt(4) == 0) - Botania.proxy.wispFX(supertile.getPos().getX() + Math.random(), supertile.getPos().getY() + Math.random(), supertile.getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F); + if(getWorld().rand.nextInt(4) == 0) + Botania.proxy.wispFX(getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F); if(windTicks == 0 && mana > 0) { windTicks = 20; @@ -62,7 +67,7 @@ public class SubTileDaffomill extends SubTileFunctional { AxisAlignedBB axis = aabbForOrientation(); if(axis != null) { - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis); + List items = getWorld().getEntitiesWithinAABB(EntityItem.class, axis); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { if(item.isAlive() && item.age >= slowdown) { @@ -78,9 +83,9 @@ public class SubTileDaffomill extends SubTileFunctional { } private AxisAlignedBB aabbForOrientation() { - int x = supertile.getPos().getX(); - int y = supertile.getPos().getY(); - int z = supertile.getPos().getZ(); + int x = getPos().getX(); + int y = getPos().getY(); + int z = getPos().getZ(); int w = 2; int h = 3; int l = 16; @@ -133,7 +138,7 @@ public class SubTileDaffomill extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { AxisAlignedBB aabb = aabbForOrientation(); - aabb = new AxisAlignedBB(aabb.minX, supertile.getPos().getY(), aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ); + aabb = new AxisAlignedBB(aabb.minX, getPos().getY(), aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ); return new RadiusDescriptor.Rectangle(toBlockPos(), aabb); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index ebe51e23a..e48b77ac5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -12,16 +12,21 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.function.Predicate; public class SubTileDreadthorn extends SubTileBellethorn { + @ObjectHolder(LibMisc.MOD_ID + ":dreadthorn") + public static TileEntityType TYPE; - public SubTileDreadthorn(SubTileType type) { - super(type); + public SubTileDreadthorn() { + super(TYPE); } @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 a66f382ae..be1ecc569 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 @@ -17,37 +17,42 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.crafting.VanillaRecipeTypes; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; -public class SubTileExoflame extends SubTileFunctional { +public class SubTileExoflame extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":exoflame") + public static TileEntityType TYPE; private static final int RANGE = 5; private static final int RANGE_Y = 2; private static final int COST = 300; - public SubTileExoflame(SubTileType type) { - super(type); + public SubTileExoflame() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(supertile.getWorld().isRemote) + if(getWorld().isRemote) return; boolean did = false; for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) { - TileEntity tile = supertile.getWorld().getTileEntity(pos); - IBlockState state = supertile.getWorld().getBlockState(pos); + TileEntity tile = getWorld().getTileEntity(pos); + IBlockState state = getWorld().getBlockState(pos); Block block = state.getBlock(); if(tile != null) { if(tile instanceof TileEntityFurnace && block == Blocks.FURNACE) { @@ -56,7 +61,7 @@ public class SubTileExoflame extends SubTileFunctional { if(canSmelt && mana > 2) { if(furnace.getField(0) < 2) { // Field 0 -> Burn time if(furnace.getField(0) == 0) - supertile.getWorld().setBlockState(pos, state.with(BlockStateProperties.LIT, true)); + getWorld().setBlockState(pos, state.with(BlockStateProperties.LIT, true)); furnace.setField(0, 200); mana = Math.max(0, mana - COST); } 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 580583ae3..f2e7cf51e 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 @@ -13,32 +13,37 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.dimension.EndDimension; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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 java.util.List; -public class SubTileFallenKanade extends SubTileFunctional { +public class SubTileFallenKanade extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":fallen_kanade") + public static TileEntityType TYPE; private static final int RANGE = 2; private static final int COST = 120; - public SubTileFallenKanade(SubTileType type) { - super(type); + public SubTileFallenKanade() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(!supertile.getWorld().isRemote && !(supertile.getWorld().getDimension() instanceof EndDimension)) { + if(!getWorld().isRemote && !(getWorld().getDimension() instanceof EndDimension)) { boolean did = false; - List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List players = getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityPlayer player : players) { if(player.getActivePotionEffect(MobEffects.REGENERATION) == null && mana >= COST) { player.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 59, 2, true, true)); 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 9ed940fa9..32a35c3af 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 @@ -14,42 +14,42 @@ import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIAttackMelee; -import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityAIHurtByTarget; -import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; import net.minecraft.entity.monster.IMob; +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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibObfuscation; +import vazkii.botania.common.lib.LibMisc; -import java.util.ArrayList; import java.util.List; -public class SubTileHeiseiDream extends SubTileFunctional { +public class SubTileHeiseiDream extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":heisei_dream") + public static TileEntityType TYPE; private static final int RANGE = 5; - public SubTileHeiseiDream(SubTileType type) { - super(type); + public SubTileHeiseiDream() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(supertile.getWorld().isRemote) + if(getWorld().isRemote) return; final int cost = 100; @SuppressWarnings("unchecked") - List mobs = (List) supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); + List mobs = (List) getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1 && mana >= cost) for(IMob mob : mobs) { 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 0723a141b..c3ba1303f 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 @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -28,21 +29,25 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; +import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.GL11; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; -public class SubTileHopperhock extends SubTileFunctional { +public class SubTileHopperhock extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":hopperhock") + public static TileEntityType TYPE; private static final String TAG_FILTER_TYPE = "filterType"; private static final int RANGE_MANA = 10; @@ -53,23 +58,27 @@ public class SubTileHopperhock extends SubTileFunctional { private int filterType = 0; - public SubTileHopperhock(SubTileType type) { + public SubTileHopperhock(TileEntityType type) { super(type); } - @Override - public void onUpdate() { - super.onUpdate(); + public SubTileHopperhock() { + this(TYPE); + } - if(supertile.getWorld().isRemote || redstoneSignal > 0) + @Override + public void tickFlower() { + super.tickFlower(); + + if(getWorld().isRemote || redstoneSignal > 0) return; boolean pulledAny = false; int range = getRange(); - BlockPos pos = supertile.getPos(); + BlockPos pos = getPos(); - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); + List items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { @@ -84,7 +93,7 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : EnumFacing.values()) { BlockPos pos_ = pos.offset(dir); - InvWithLocation inv = InventoryHelper.getInventoryWithLocation(supertile.getWorld(), pos_, dir.getOpposite()); + InvWithLocation inv = InventoryHelper.getInventoryWithLocation(getWorld(), pos_, dir.getOpposite()); if(inv != null) { List filter = getFilterForInventory(pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); @@ -157,12 +166,12 @@ public class SubTileHopperhock extends SubTileFunctional { List filter = new ArrayList<>(); if(recursiveForDoubleChests) { - TileEntity tileEntity = supertile.getWorld().getTileEntity(pos); - Block chest = supertile.getWorld().getBlockState(pos).getBlock(); + TileEntity tileEntity = getWorld().getTileEntity(pos); + Block chest = getWorld().getBlockState(pos).getBlock(); if(tileEntity instanceof TileEntityChest) for(EnumFacing dir : MathHelper.HORIZONTALS) - if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) { + if(getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) { filter.addAll(getFilterForInventory(pos.offset(dir), false)); break; } @@ -170,7 +179,7 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : MathHelper.HORIZONTALS) { AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(dir)); - List frames = supertile.getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb); + List frames = getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb); for(EntityItemFrame frame : frames) { if(frame.facingDirection == dir) filter.add(frame.getDisplayedItem()); @@ -254,8 +263,11 @@ public class SubTileHopperhock extends SubTileFunctional { } public static class Mini extends SubTileHopperhock { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":hopperhock_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public int getRange() { return mana > 0 ? RANGE_MANA_MINI : RANGE_MINI; } 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 0703e75c7..6593024a4 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 @@ -15,33 +15,38 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; +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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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 java.util.List; -public class SubTileHyacidus extends SubTileFunctional { +public class SubTileHyacidus extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":hyacidus") + public static TileEntityType TYPE; private static final int RANGE = 6; - public SubTileHyacidus(SubTileType type) { - super(type); + public SubTileHyacidus() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(supertile.getWorld().isRemote || redstoneSignal > 0) + if(getWorld().isRemote || redstoneSignal > 0) return; final int cost = 20; - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityLivingBase entity : entities) { if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.POISON) == null && mana >= cost && !entity.world.isRemote && entity.getCreatureAttribute() != CreatureAttribute.UNDEAD) { entity.addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); 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 96781a0de..6eeb17b28 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 @@ -14,50 +14,54 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +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.state.BotaniaStateProps; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; -public class SubTileJadedAmaranthus extends SubTileFunctional { +public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":jaded_amaranthus") + public static TileEntityType TYPE; private static final int COST = 100; final int RANGE = 4; - public SubTileJadedAmaranthus(SubTileType type) { - super(type); + public SubTileJadedAmaranthus() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(supertile.getWorld().isRemote || redstoneSignal > 0) + if(getWorld().isRemote || redstoneSignal > 0) return; if(ticksExisted % 30 == 0 && mana >= COST) { BlockPos pos = new BlockPos( - supertile.getPos().getX() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1), - supertile.getPos().getY() + RANGE, - supertile.getPos().getZ() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1) + getPos().getX() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1), + getPos().getY() + RANGE, + getPos().getZ() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1) ); BlockPos up = pos.up(); for(int i = 0; i < RANGE * 2; i++) { - IBlockState stateAbove = supertile.getWorld().getBlockState(up); - EnumDyeColor color = EnumDyeColor.byId(supertile.getWorld().rand.nextInt(16)); + IBlockState stateAbove = getWorld().getBlockState(up); + EnumDyeColor color = EnumDyeColor.byId(getWorld().rand.nextInt(16)); IBlockState flower = ModBlocks.getFlower(color).getDefaultState(); - if((supertile.getWorld().isAirBlock(up) || stateAbove.getMaterial() != Material.WATER && flower.isValidPosition(supertile.getWorld(), up))) { + if((getWorld().isAirBlock(up) || stateAbove.getMaterial() != Material.WATER && flower.isValidPosition(getWorld(), up))) { if(ConfigHandler.COMMON.blockBreakParticles.get()) - supertile.getWorld().playEvent(2001, up, Block.getStateId(flower)); - supertile.getWorld().setBlockState(up, flower); + getWorld().playEvent(2001, up, Block.getStateId(flower)); + getWorld().setBlockState(up, flower); mana -= COST; sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java index 99d789b60..d5579b2d4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java @@ -10,14 +10,19 @@ */ package vazkii.botania.common.block.subtile.functional; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; public class SubTileJiyuulia extends SubTileTangleberrie { + @ObjectHolder(LibMisc.MOD_ID + ":jiyuulia") + public static TileEntityType TYPE; - public SubTileJiyuulia(SubTileType type) { - super(type); + public SubTileJiyuulia() { + super(TYPE); } @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 16ae92577..e392d060d 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 @@ -32,20 +32,21 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.storage.loot.LootContext; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -54,7 +55,9 @@ import java.util.List; import java.util.Random; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class SubTileLoonuim extends SubTileFunctional { +public class SubTileLoonuim extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":loonium") + public static TileEntityType TYPE; private static final int COST = 35000; private static final int RANGE = 5; @@ -64,15 +67,15 @@ public class SubTileLoonuim extends SubTileFunctional { private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon"); - public SubTileLoonuim(SubTileType type) { - super(type); + public SubTileLoonuim() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - World world = supertile.getWorld(); + World world = getWorld(); if(!world.isRemote && redstoneSignal == 0 && ticksExisted % 100 == 0 && mana >= COST) { Random rand = world.rand; @@ -88,9 +91,9 @@ public class SubTileLoonuim extends SubTileFunctional { } while(stack.isEmpty() || BLACKLIST.contains(stack.getItem())); int bound = RANGE * 2 + 1; - int xp = supertile.getPos().getX() - RANGE + rand.nextInt(bound); - int yp = supertile.getPos().getY(); - int zp = supertile.getPos().getZ() - RANGE + rand.nextInt(bound); + int xp = getPos().getX() - RANGE + rand.nextInt(bound); + int yp = getPos().getY(); + int zp = getPos().getZ() - RANGE + rand.nextInt(bound); BlockPos pos = new BlockPos(xp, yp - 1, zp); do { 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 6e5dedfb0..de7744d53 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 @@ -14,23 +14,27 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; import java.util.ArrayList; import java.util.List; import java.util.Set; -public class SubTileMarimorphosis extends SubTileFunctional { +public class SubTileMarimorphosis extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis") + public static TileEntityType TYPE; private static final int COST = 12; private static final int RANGE = 8; @@ -50,14 +54,18 @@ public class SubTileMarimorphosis extends SubTileFunctional { Type.MESA }; - public SubTileMarimorphosis(SubTileType type) { + public SubTileMarimorphosis(TileEntityType type) { super(type); } + public SubTileMarimorphosis() { + this(TYPE); + } + @Override - public void onUpdate() { - super.onUpdate(); - if(supertile.getWorld().isRemote || redstoneSignal > 0) + public void tickFlower() { + super.tickFlower(); + if(getWorld().isRemote || redstoneSignal > 0) return; if(mana >= COST && ticksExisted % 2 == 0) { @@ -65,9 +73,9 @@ public class SubTileMarimorphosis extends SubTileFunctional { if(coords != null) { IBlockState state = getStoneToPut(coords); if(state != null) { - supertile.getWorld().setBlockState(coords, state); + getWorld().setBlockState(coords, state); if(ConfigHandler.COMMON.blockBreakParticles.get()) - supertile.getWorld().playEvent(2001, coords, Block.getStateId(state)); + getWorld().playEvent(2001, coords, Block.getStateId(state)); mana -= COST; sync(); @@ -77,7 +85,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public IBlockState getStoneToPut(BlockPos coords) { - Set types = BiomeDictionary.getTypes(supertile.getWorld().getBiome(coords)); + Set types = BiomeDictionary.getTypes(getWorld().getBiome(coords)); List values = new ArrayList<>(); for (Type type : TYPES) { @@ -90,7 +98,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { values.add(block); } - return values.get(supertile.getWorld().rand.nextInt(values.size())).getDefaultState(); + return values.get(getWorld().rand.nextInt(values.size())).getDefaultState(); } private Block biomeTypeToBlock(Type biomeType) { @@ -115,14 +123,14 @@ public class SubTileMarimorphosis extends SubTileFunctional { BlockStateMatcher matcher = BlockStateMatcher.forBlock(Blocks.STONE); for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-range, -rangeY, -range), getPos().add(range, rangeY, range))) { - IBlockState state = supertile.getWorld().getBlockState(pos); - if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, matcher)) + IBlockState state = getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, getWorld(), pos, matcher)) possibleCoords.add(pos); } if(possibleCoords.isEmpty()) return null; - return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size())); + return possibleCoords.get(getWorld().rand.nextInt(possibleCoords.size())); } @Override @@ -159,8 +167,11 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public static class Mini extends SubTileMarimorphosis { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public int getRange() { return RANGE_MINI; } 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 20cda825b..710a84afa 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 @@ -14,29 +14,34 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; +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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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 java.util.List; -public class SubTileMedumone extends SubTileFunctional { +public class SubTileMedumone extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":medumone") + public static TileEntityType TYPE; private static final int RANGE = 6; - public SubTileMedumone(SubTileType type) { - super(type); + public SubTileMedumone() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(!supertile.getWorld().isRemote && mana > 0) { - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + if(!getWorld().isRemote && mana > 0) { + List entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityLivingBase entity : entities) if(!(entity instanceof EntityPlayer)) { 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 e15c65312..03163cbe1 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 @@ -13,31 +13,33 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.WeightedRandom; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.Predicate; -public class SubTileOrechid extends SubTileFunctional { +public class SubTileOrechid extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":orechid") + public static TileEntityType TYPE; private static final int COST = 17500; private static final int COST_GOG = 700; @@ -47,15 +49,19 @@ public class SubTileOrechid extends SubTileFunctional { private static final int RANGE_Y = 3; private static final int TRIES = 20; - public SubTileOrechid(SubTileType type) { + public SubTileOrechid(TileEntityType type) { super(type); } - @Override - public void onUpdate() { - super.onUpdate(); + public SubTileOrechid() { + this(TYPE); + } - if(supertile.getWorld().isRemote || redstoneSignal > 0 || !canOperate()) + @Override + public void tickFlower() { + super.tickFlower(); + + if(getWorld().isRemote || redstoneSignal > 0 || !canOperate()) return; int cost = getCost(); @@ -64,10 +70,10 @@ public class SubTileOrechid extends SubTileFunctional { if(coords != null) { IBlockState state = getOreToPut(); if(state != null) { - supertile.getWorld().setBlockState(coords, state); + getWorld().setBlockState(coords, state); if(ConfigHandler.COMMON.blockBreakParticles.get()) - supertile.getWorld().playEvent(2001, coords, Block.getStateId(state)); - supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.orechid, SoundCategory.BLOCKS, 2F, 1F); + getWorld().playEvent(2001, coords, Block.getStateId(state)); + getWorld().playSound(null, getPos(), ModSounds.orechid, SoundCategory.BLOCKS, 2F, 1F); mana -= cost; sync(); @@ -83,7 +89,7 @@ public class SubTileOrechid extends SubTileFunctional { for(ResourceLocation s : map.keySet()) values.add(new TagRandomItem(map.get(s), s)); - ResourceLocation ore = ((TagRandomItem) WeightedRandom.getRandomItem(supertile.getWorld().rand, values)).s; + ResourceLocation ore = ((TagRandomItem) WeightedRandom.getRandomItem(getWorld().rand, values)).s; Tag tag = BlockTags.getCollection().get(ore); if(tag != null && !tag.getAllElements().isEmpty()) { return tag.getRandomElement(getWorld().getRandom()).getDefaultState(); @@ -97,14 +103,14 @@ public class SubTileOrechid extends SubTileFunctional { List possibleCoords = new ArrayList<>(); for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) { - IBlockState state = supertile.getWorld().getBlockState(pos); - if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, getReplaceMatcher())) + IBlockState state = getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, getWorld(), pos, getReplaceMatcher())) possibleCoords.add(pos); } if(possibleCoords.isEmpty()) return null; - return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size())); + return possibleCoords.get(getWorld().rand.nextInt(possibleCoords.size())); } public boolean canOperate() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index 77e86df61..5aa32eaa7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -12,26 +12,31 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.Map; import java.util.function.Predicate; public class SubTileOrechidIgnem extends SubTileOrechid { + @ObjectHolder(LibMisc.MOD_ID + ":orechid_ignem") + public static TileEntityType TYPE; private static final int COST = 20000; - public SubTileOrechidIgnem(SubTileType type) { - super(type); + public SubTileOrechidIgnem() { + super(TYPE); } @Override public boolean canOperate() { - return supertile.getWorld().getDimension().isNether(); + return getWorld().getDimension().isNether(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 71ef56a85..448661136 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 @@ -13,33 +13,37 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; +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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibObfuscation; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -public class SubTilePollidisiac extends SubTileFunctional { +public class SubTilePollidisiac extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":pollidisiac") + public static TileEntityType TYPE; private static final int RANGE = 6; - public SubTilePollidisiac(SubTileType type) { - super(type); + public SubTilePollidisiac() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(!supertile.getWorld().isRemote) { + if(!getWorld().isRemote) { int manaCost = 12; - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); - List animals = supertile.getWorld().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List animals = getWorld().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityAnimal animal : animals) { @@ -58,7 +62,7 @@ public class SubTilePollidisiac extends SubTileFunctional { mana -= manaCost; animal.inLove = 1200; - supertile.getWorld().setEntityState(animal, (byte)18); + getWorld().setEntityState(animal, (byte)18); } } } 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 43cf24686..df3099696 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 @@ -16,44 +16,40 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFlowerPlaceable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibObfuscation; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -public class SubTileRannuncarpus extends SubTileFunctional { +public class SubTileRannuncarpus extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus") + public static TileEntityType TYPE; private static final int RANGE = 2; private static final int RANGE_Y = 3; @@ -65,19 +61,23 @@ public class SubTileRannuncarpus extends SubTileFunctional { private static final int RANGE_PLACE_MINI = 2; private static final int RANGE_PLACE_Y_MINI = 2; - public SubTileRannuncarpus(SubTileType type) { + public SubTileRannuncarpus(TileEntityType type) { super(type); } - @Override - public void onUpdate() { - super.onUpdate(); + public SubTileRannuncarpus() { + this(TYPE); + } - if(supertile.getWorld().isRemote || redstoneSignal > 0) + @Override + public void tickFlower() { + super.tickFlower(); + + if(getWorld().isRemote || redstoneSignal > 0) return; if(ticksExisted % 10 == 0) { - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); List validPositions = getCandidatePositions(); int slowdown = getSlowdownFactor(); @@ -89,8 +89,8 @@ public class SubTileRannuncarpus extends SubTileFunctional { Item stackItem = stack.getItem(); if(stackItem instanceof ItemBlock || stackItem instanceof IFlowerPlaceable) { if(!validPositions.isEmpty()) { - BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); - BlockItemUseContext ctx = new RannuncarpusPlaceContext(supertile.getWorld(), stack, coords, EnumFacing.UP, 0, 0, 0); + BlockPos coords = validPositions.get(getWorld().rand.nextInt(validPositions.size())); + BlockItemUseContext ctx = new RannuncarpusPlaceContext(getWorld(), stack, coords, EnumFacing.UP, 0, 0, 0); boolean success = false; if(stackItem instanceof IFlowerPlaceable) { @@ -101,8 +101,8 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(success) { if(ConfigHandler.COMMON.blockBreakParticles.get()) { - IBlockState state = supertile.getWorld().getBlockState(ctx.getPos()); - supertile.getWorld().playEvent(2001, coords, Block.getStateId(state)); + IBlockState state = getWorld().getBlockState(ctx.getPos()); + getWorld().playEvent(2001, coords, Block.getStateId(state)); } validPositions.remove(coords); if(mana > 1) @@ -116,18 +116,18 @@ public class SubTileRannuncarpus extends SubTileFunctional { } public IBlockState getUnderlyingBlock() { - return supertile.getWorld().getBlockState(supertile.getPos().down(supertile instanceof IFloatingFlower ? 1 : 2)); + return getWorld().getBlockState(getPos().down(isFloating() ? 1 : 2)); } private List getCandidatePositions() { int rangePlace = getRange(); int rangePlaceY = getRangeY(); - BlockPos pos = supertile.getPos(); + BlockPos pos = getPos(); IBlockState filter = getUnderlyingBlock(); List ret = new ArrayList<>(); for (BlockPos pos_ : BlockPos.getAllInBox(pos.add(-rangePlace, -rangePlaceY, -rangePlace), pos.add(rangePlace, rangePlaceY, rangePlace))) { - if (filter == supertile.getWorld().getBlockState(pos_)) + if (filter == getWorld().getBlockState(pos_)) ret.add(pos_); } return ret; @@ -194,8 +194,11 @@ public class SubTileRannuncarpus extends SubTileFunctional { } public static class Mini extends SubTileRannuncarpus { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public int getRange() { return mana > 0 ? RANGE_PLACE_MANA_MINI : RANGE_PLACE_MINI; } 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 ea1ed1c36..54e23a86e 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 @@ -12,29 +12,38 @@ package vazkii.botania.common.block.subtile.functional; import com.google.common.collect.MapMaker; import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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 java.util.Collections; import java.util.Set; -public class SubTileSolegnolia extends SubTileFunctional { +public class SubTileSolegnolia extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":solegnolia") + public static TileEntityType TYPE; private static final double RANGE = 5; private static final double RANGE_MINI = 1; private static final Set existingFlowers = Collections.newSetFromMap(new MapMaker().concurrencyLevel(2).weakKeys().makeMap()); - public SubTileSolegnolia(SubTileType type) { + public SubTileSolegnolia(TileEntityType type) { super(type); } + public SubTileSolegnolia() { + this(TYPE); + } + @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(!existingFlowers.contains(this)) { existingFlowers.add(this); @@ -49,9 +58,9 @@ public class SubTileSolegnolia extends SubTileFunctional { public static boolean hasSolegnoliaAround(Entity e) { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) - .filter(f -> f.supertile.getWorld() == e.world) - .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) - .filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange()) + .filter(f -> f.getWorld() == e.world) + .filter(f -> f.getWorld().getTileEntity(f.getPos()) == f) + .filter(f -> f.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange()) .findAny().isPresent(); } @@ -80,8 +89,11 @@ public class SubTileSolegnolia extends SubTileFunctional { } public static class Mini extends SubTileSolegnolia { - public Mini(SubTileType type) { - super(type); + @ObjectHolder(LibMisc.MOD_ID + ":solegnolia_chibi") + public static TileEntityType TYPE; + + public Mini() { + super(TYPE); } @Override public double getRange() { return RANGE_MINI; } 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 bdfe4507d..77e2d5fca 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,25 +17,28 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; import vazkii.botania.common.network.PacketHandler; import java.util.List; -public class SubTileSpectranthemum extends SubTileFunctional { +public class SubTileSpectranthemum extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":spectranthemum") + public static TileEntityType TYPE; private static final String TAG_BIND_X = "bindX"; private static final String TAG_BIND_Y = "bindY"; @@ -49,20 +52,20 @@ public class SubTileSpectranthemum extends SubTileFunctional { private BlockPos bindPos = new BlockPos(0, -1, 0); - public SubTileSpectranthemum(SubTileType type) { - super(type); + public SubTileSpectranthemum() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(!supertile.getWorld().isRemote && redstoneSignal == 0 && supertile.getWorld().isBlockLoaded(bindPos)) { - BlockPos pos = supertile.getPos(); + if(!getWorld().isRemote && redstoneSignal == 0 && getWorld().isBlockLoaded(bindPos)) { + BlockPos pos = getPos(); boolean did = false; - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-RANGE, -RANGE, -RANGE), pos.add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-RANGE, -RANGE, -RANGE), pos.add(RANGE + 1, RANGE + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { @@ -139,7 +142,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { boolean bound = super.bindTo(player, wand, pos, side); - if(!bound && !pos.equals(bindPos) && pos.distanceSq(supertile.getPos()) <= BIND_RANGE * BIND_RANGE && !pos.equals(supertile.getPos())) { + if(!bound && !pos.equals(bindPos) && pos.distanceSq(getPos()) <= BIND_RANGE * BIND_RANGE && !pos.equals(getPos())) { bindPos = pos; sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 9b305e5cd..43546442b 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 @@ -12,38 +12,47 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -public class SubTileTangleberrie extends SubTileFunctional { +public class SubTileTangleberrie extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":tangleberrie") + public static TileEntityType TYPE; - public SubTileTangleberrie(SubTileType type) { + public SubTileTangleberrie(TileEntityType type) { super(type); } + public SubTileTangleberrie() { + this(TYPE); + } + @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(mana > 0) { - double x1 = supertile.getPos().getX() + 0.5; - double y1 = supertile.getPos().getY() + 0.5; - double z1 = supertile.getPos().getZ() + 0.5; + double x1 = getPos().getX() + 0.5; + double y1 = getPos().getY() + 0.5; + double z1 = getPos().getZ() + 0.5; double maxDist = getMaxDistance(); double range = getRange(); AxisAlignedBB boundingBox = new AxisAlignedBB(x1 - range, y1 - range, z1 - range, x1 + range + 1, y1 + range + 1, z1 + range + 1); - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); + List entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); for(EntityLivingBase entity : entities) { if(entity instanceof EntityPlayer || !entity.isNonBoss()) @@ -57,7 +66,7 @@ public class SubTileTangleberrie extends SubTileFunctional { if(distance > maxDist && distance < range) { MathHelper.setEntityMotionFromVector(entity, new Vector3(x1, y1, z1), getMotionVelocity()); - if(supertile.getWorld().rand.nextInt(3) == 0) + if(getWorld().rand.nextInt(3) == 0) Botania.proxy.sparkleFX(x2 + Math.random() * entity.width, y2 + Math.random() * entity.height, z2 + Math.random() * entity.width, 0.5F, 0.5F, 0.5F, 1F, 3); } } 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 45cc7de94..899940dfd 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 @@ -18,38 +18,42 @@ import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; +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.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibObfuscation; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; -public class SubTileTigerseye extends SubTileFunctional { +public class SubTileTigerseye extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":tigerseye") + public static TileEntityType TYPE; private static final int RANGE = 10; private static final int RANGE_Y = 4; - public SubTileTigerseye(SubTileType type) { - super(type); + public SubTileTigerseye() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(supertile.getWorld().isRemote) + if(getWorld().isRemote) return; final int cost = 70; boolean shouldAfffect = mana >= cost; - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); + List entities = getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); for(EntityLiving entity : entities) { List entries = new ArrayList<>(entity.tasks.taskEntries); 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 3d1cec6e7..588c5af48 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 @@ -11,45 +11,46 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ObjectHolder; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileType; +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; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.WeakHashMap; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class SubTileVinculotus extends SubTileFunctional { +public class SubTileVinculotus extends TileEntityFunctionalFlower { + @ObjectHolder(LibMisc.MOD_ID + ":vinculotus") + public static TileEntityType TYPE; - // Must store position since red string spoofers are only active during onUpdate + // Must store position since red string spoofers are only active during tick // But our main logic runs outside, in the event handler public static final Map existingFlowers = new WeakHashMap<>(); private static final int RANGE = 64; - public SubTileVinculotus(SubTileType type) { - super(type); + public SubTileVinculotus() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(!supertile.getWorld().isRemote) { + if(!getWorld().isRemote) { BlockPos pos = existingFlowers.get(this); if (pos == null || !pos.equals(getPos())) existingFlowers.put(this, getPos()); @@ -91,7 +92,7 @@ public class SubTileVinculotus extends SubTileFunctional { SubTileVinculotus flower = e.getKey(); BlockPos activePos = e.getValue(); - if(flower == null || flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().world || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) + if(flower == null || flower.redstoneSignal > 0 || flower.mana <= cost || flower.getWorld() != event.getEntityLiving().world || flower.getWorld().getTileEntity(flower.getPos()) != flower) continue; double x = activePos.getX() + 0.5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 2e6293338..b085527b2 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 @@ -12,32 +12,37 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; +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.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +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; import java.util.List; -public class SubTileArcaneRose extends SubTileGenerating { +public class SubTileArcaneRose extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":rosa_arcana") + public static TileEntityType TYPE; private static final int RANGE = 1; - public SubTileArcaneRose(SubTileType type) { - super(type); + public SubTileArcaneRose() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(mana >= getMaxMana()) return; - List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List players = getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityPlayer player : players) if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { ExperienceHelper.drainPlayerXP(player, 1); @@ -45,7 +50,7 @@ public class SubTileArcaneRose extends SubTileGenerating { return; } - List orbs = supertile.getWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List orbs = getWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityXPOrb orb : orbs) { mana += orb.getXpValue() * 35; orb.remove(); 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 055ff37da..4bfee2b9f 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 @@ -13,20 +13,25 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +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; import java.util.ArrayList; import java.util.List; -public class SubTileDandelifeon extends SubTileGenerating { +public class SubTileDandelifeon extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":dandelifeon") + public static TileEntityType TYPE; private static final int RANGE = 12; private static final int SPEED = 10; @@ -45,15 +50,15 @@ public class SubTileDandelifeon extends SubTileGenerating { { +0, -1 } }; - public SubTileDandelifeon(SubTileType type) { - super(type); + public SubTileDandelifeon() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(!supertile.getWorld().isRemote && redstoneSignal > 0 && ticksExisted % SPEED == 0) + if(!getWorld().isRemote && redstoneSignal > 0 && ticksExisted % SPEED == 0) runSimulation(); } @@ -93,7 +98,7 @@ public class SubTileDandelifeon extends SubTileGenerating { } } - BlockPos pos = supertile.getPos(); + BlockPos pos = getPos(); for(int[] change : changes) { BlockPos pos_ = pos.add(-RANGE + change[0], 0, -RANGE + change[1]); @@ -111,7 +116,7 @@ public class SubTileDandelifeon extends SubTileGenerating { int diam = RANGE * 2 + 1; int[][] table = new int[diam][diam]; - BlockPos pos = supertile.getPos(); + BlockPos pos = getPos(); for(int i = 0; i < diam; i++) for(int j = 0; j < diam; j++) { @@ -123,9 +128,9 @@ public class SubTileDandelifeon extends SubTileGenerating { } private int getCellGeneration(BlockPos pos) { - TileEntity tile = supertile.getWorld().getTileEntity(pos); + TileEntity tile = getWorld().getTileEntity(pos); if(tile instanceof TileCell) - return ((TileCell) tile).isSameFlower(supertile) ? ((TileCell) tile).getGeneration() : 0; + return ((TileCell) tile).isSameFlower(this) ? ((TileCell) tile).getGeneration() : 0; return -1; } @@ -165,7 +170,7 @@ public class SubTileDandelifeon extends SubTileGenerating { } void setBlockForGeneration(BlockPos pos, int gen, int prevGen) { - World world = supertile.getWorld(); + World world = getWorld(); IBlockState stateAt = world.getBlockState(pos); Block blockAt = stateAt.getBlock(); TileEntity tile = world.getTileEntity(pos); @@ -176,11 +181,11 @@ public class SubTileDandelifeon extends SubTileGenerating { } else if(blockAt == ModBlocks.cellBlock) { if(gen < 0) world.removeBlock(pos); - else ((TileCell) tile).setGeneration(supertile, gen); - } else if(gen >= 0 && blockAt.isAir(stateAt, supertile.getWorld(), pos)) { + else ((TileCell) tile).setGeneration(this, gen); + } else if(gen >= 0 && blockAt.isAir(stateAt, getWorld(), pos)) { world.setBlockState(pos, ModBlocks.cellBlock.getDefaultState()); tile = world.getTileEntity(pos); - ((TileCell) tile).setGeneration(supertile, gen); + ((TileCell) tile).setGeneration(this, gen); } } 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 879715c15..05ba39d2d 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 @@ -14,23 +14,27 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Particles; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; -import vazkii.botania.common.block.ModBlocks; +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; +import vazkii.botania.common.lib.LibMisc; + +public class SubTileEndoflame extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":endoflame") + public static TileEntityType TYPE; -public class SubTileEndoflame extends SubTileGenerating { private static final String TAG_BURN_TIME = "burnTime"; private static final int FUEL_CAP = 32000; private static final int RANGE = 3; @@ -38,21 +42,21 @@ public class SubTileEndoflame extends SubTileGenerating { private int burnTime = 0; - public SubTileEndoflame(SubTileType type) { - super(type); + public SubTileEndoflame() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(burnTime > 0) burnTime--; if(getWorld().isRemote) { - if(burnTime > 0 && supertile.getWorld().rand.nextInt(10) == 0) { + if(burnTime > 0 && getWorld().rand.nextInt(10) == 0) { Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.7, 0.4); - supertile.getWorld().addParticle(Particles.FLAME, supertile.getPos().getX() + offset.x + Math.random() * 0.2, supertile.getPos().getY() + offset.y, supertile.getPos().getZ() + offset.z + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); + getWorld().addParticle(Particles.FLAME, getPos().getX() + offset.x + Math.random() * 0.2, getPos().getY() + offset.y, getPos().getZ() + offset.z + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); } return; } @@ -62,7 +66,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(mana < getMaxMana()) { int slowdown = getSlowdownFactor(); - for(EntityItem item : supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)))) { + for(EntityItem item : getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)))) { if(item.age >= 59 + slowdown && !item.removed) { ItemStack stack = item.getItem(); if(stack.isEmpty() || stack.getItem().hasContainerItem(stack)) @@ -73,7 +77,7 @@ public class SubTileEndoflame extends SubTileGenerating { this.burnTime = Math.min(FUEL_CAP, burnTime) / 2; stack.shrink(1); - supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); + getWorld().playSound(null, getPos(), ModSounds.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); getWorld().addBlockEvent(getPos(), getWorld().getBlockState(getPos()).getBlock(), START_BURN_EVENT, item.getEntityId()); sync(); 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 cbd603576..83807a75f 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 @@ -14,42 +14,45 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.Particles; import net.minecraft.init.SoundEvents; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; 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.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.network.PacketBotaniaEffect; -import vazkii.botania.common.network.PacketHandler; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -public class SubTileEntropinnyum extends SubTileGenerating { +public class SubTileEntropinnyum extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":entropinnyum") + public static TileEntityType TYPE; private static final int RANGE = 12; private static final int EXPLODE_EFFECT_EVENT = 0; - public SubTileEntropinnyum(SubTileType type) { - super(type); + public SubTileEntropinnyum() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if(!supertile.getWorld().isRemote && mana == 0) { - List tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + if(!getWorld().isRemote && mana == 0) { + List tnts = getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityTNTPrimed tnt : tnts) { - if(tnt.getFuse() == 1 && !tnt.removed && !supertile.getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) { - tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F); + if(tnt.getFuse() == 1 && !tnt.removed && !getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) { + tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (getWorld().rand.nextFloat() - getWorld().rand.nextFloat()) * 0.2F) * 0.7F); tnt.remove(); mana += getMaxMana(); sync(); - getWorld().addBlockEvent(getPos(), supertile.getBlockState().getBlock(), EXPLODE_EFFECT_EVENT, tnt.getEntityId()); + getWorld().addBlockEvent(getPos(), getBlockState().getBlock(), EXPLODE_EFFECT_EVENT, tnt.getEntityId()); break; } } 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 cbfd1b59c..bc7aa541d 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 @@ -13,25 +13,29 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Particles; import net.minecraft.init.SoundEvents; -import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.particles.ItemParticleData; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; import net.minecraft.world.WorldServer; 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.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -public class SubTileGourmaryllis extends SubTileGenerating { +public class SubTileGourmaryllis extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":gourmaryllis") + public static TileEntityType TYPE; private static final String TAG_COOLDOWN = "cooldown"; private static final String TAG_DIGESTING_MANA = "digestingMana"; @@ -44,15 +48,15 @@ public class SubTileGourmaryllis extends SubTileGenerating { private ItemStack lastFood = ItemStack.EMPTY; private int lastFoodCount = 0; - public SubTileGourmaryllis(SubTileType type) { - super(type); + public SubTileGourmaryllis() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if (supertile.getWorld().isRemote) + if (getWorld().isRemote) return; if(cooldown > -1) @@ -65,20 +69,20 @@ public class SubTileGourmaryllis extends SubTileGenerating { digestingMana = 0; float burpPitch = 1 - (lastFoodCount - 1) * 0.05F; - getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, burpPitch); + getWorld().playSound(null, getPos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, burpPitch); sync(); } else if(cooldown % munchInterval == 0) { - getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 0.5f, 1); + getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 0.5f, 1); Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.6, 0.4); - ((WorldServer) supertile.getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, lastFood), supertile.getPos().getX()+offset.x, supertile.getPos().getY()+offset.y, supertile.getPos().getZ()+offset.z, 10, 0.1D, 0.1D, 0.1D, 0.03D); + ((WorldServer) getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, lastFood), getPos().getX()+offset.x, getPos().getY()+offset.y, getPos().getZ()+offset.z, 10, 0.1D, 0.1D, 0.1D, 0.03D); } } int slowdown = getSlowdownFactor(); - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { ItemStack stack = item.getItem(); @@ -99,7 +103,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { cooldown = val * 10; item.playSound(SoundEvents.ENTITY_GENERIC_EAT, 0.2F, 0.6F); sync(); - ((WorldServer) supertile.getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D); + ((WorldServer) getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D); } item.remove(); 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 5ffe3e667..64520aecc 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 @@ -21,24 +21,29 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tags.FluidTags; import net.minecraft.tags.Tag; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.Arrays; import java.util.Collections; import java.util.List; -public class SubTileHydroangeas extends SubTileGenerating { +public class SubTileHydroangeas extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":hydroangeas") + public static TileEntityType TYPE; private static final String TAG_BURN_TIME = "burnTime"; private static final String TAG_COOLDOWN = "cooldown"; @@ -47,44 +52,48 @@ public class SubTileHydroangeas extends SubTileGenerating { int burnTime, cooldown; - public SubTileHydroangeas(SubTileType type) { + public SubTileHydroangeas() { + this(TYPE); + } + + public SubTileHydroangeas(TileEntityType type) { super(type); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(cooldown > 0) { cooldown--; for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(supertile.getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); + Botania.proxy.wispFX(getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); } if(burnTime == 0) { - if(mana < getMaxMana() && !supertile.getWorld().isRemote) { + if(mana < getMaxMana() && !getWorld().isRemote) { List offsets = Arrays.asList(OFFSETS); Collections.shuffle(offsets); for(BlockPos offset : offsets) { - BlockPos pos = supertile.getPos().add(offset); + BlockPos pos = getPos().add(offset); - IFluidState fstate = supertile.getWorld().getFluidState(pos); + IFluidState fstate = getWorld().getFluidState(pos); Tag search = getMaterialToSearchFor(); if(fstate.isTagged(search) && (getBlockToSearchBelow() == null - || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) + || getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && fstate.isSource()) { if(search != FluidTags.WATER) - supertile.getWorld().setBlockState(pos, Blocks.AIR.getDefaultState()); + getWorld().setBlockState(pos, Blocks.AIR.getDefaultState()); else { int waterAround = 0; for(EnumFacing dir : EnumFacing.values()) - if(supertile.getWorld().getFluidState(pos.offset(dir)).isTagged(search)) + if(getWorld().getFluidState(pos.offset(dir)).isTagged(search)) waterAround++; if(waterAround < 2) - supertile.getWorld().setBlockState(pos, Blocks.AIR.getDefaultState()); + getWorld().setBlockState(pos, Blocks.AIR.getDefaultState()); } if(cooldown == 0) @@ -98,7 +107,7 @@ public class SubTileHydroangeas extends SubTileGenerating { } } } else { - if(supertile.getWorld().rand.nextInt(8) == 0) + if(getWorld().rand.nextInt(8) == 0) doBurnParticles(); burnTime--; if(burnTime == 0) { @@ -109,7 +118,7 @@ public class SubTileHydroangeas extends SubTileGenerating { } public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); } public Tag getMaterialToSearchFor() { @@ -121,7 +130,7 @@ public class SubTileHydroangeas extends SubTileGenerating { } public void playSound() { - supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_DRINK, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); + getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_DRINK, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); } public int getBurnTime() { @@ -188,7 +197,7 @@ public class SubTileHydroangeas extends SubTileGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getPrecipitation() == Biome.RainType.RAIN && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = getWorld().getBiome(getPos()).getPrecipitation() == Biome.RainType.RAIN && (getWorld().isRaining() || getWorld().isThundering()); return rain ? 2 : 3; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index 100604535..ebb82dc71 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 @@ -14,46 +14,51 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockCake; import net.minecraft.block.state.IBlockState; import net.minecraft.init.SoundEvents; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; 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.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; -public class SubTileKekimurus extends SubTileGenerating { +public class SubTileKekimurus extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":kekimurus") + public static TileEntityType TYPE; private static final int RANGE = 5; - public SubTileKekimurus(SubTileType type) { - super(type); + public SubTileKekimurus() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if (supertile.getWorld().isRemote) + if (getWorld().isRemote) return; int mana = 1800; - if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 80 == 0) { + if(getMaxMana() - this.mana >= mana && !getWorld().isRemote && ticksExisted % 80 == 0) { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { - BlockPos pos = supertile.getPos().add(i - RANGE, j - RANGE, k - RANGE); - IBlockState state = supertile.getWorld().getBlockState(pos); + BlockPos pos = getPos().add(i - RANGE, j - RANGE, k - RANGE); + IBlockState state = getWorld().getBlockState(pos); Block block = state.getBlock(); if(block instanceof BlockCake) { int nextSlicesEaten = state.get(BlockCake.BITES) + 1; if(nextSlicesEaten > 6) - supertile.getWorld().removeBlock(pos); - else supertile.getWorld().setBlockState(pos, state.with(BlockCake.BITES, nextSlicesEaten), 1 | 2); + getWorld().removeBlock(pos); + else getWorld().setBlockState(pos, state.with(BlockCake.BITES, nextSlicesEaten), 1 | 2); - supertile.getWorld().playEvent(2001, pos, Block.getStateId(state)); - supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F); + getWorld().playEvent(2001, pos, Block.getStateId(state)); + getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F); this.mana += mana; sync(); return; 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 6b36c5441..dca870b98 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 @@ -11,28 +11,32 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tags.BlockTags; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +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; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class SubTileMunchdew extends SubTileGenerating { +public class SubTileMunchdew extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":munchdew") + public static TileEntityType TYPE; private static final String TAG_COOLDOWN = "cooldown"; private static final String TAG_ATE_ONCE = "ateOnce"; @@ -44,13 +48,13 @@ public class SubTileMunchdew extends SubTileGenerating { private int ticksWithoutEating = -1; private int cooldown = 0; - public SubTileMunchdew(SubTileType type) { - super(type); + public SubTileMunchdew() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(getWorld().isRemote) return; @@ -66,13 +70,13 @@ public class SubTileMunchdew extends SubTileGenerating { eatLeaves : { if(getMaxMana() - mana >= manaPerLeaf && ticksExisted % 4 == 0) { List coords = new ArrayList<>(); - BlockPos pos = supertile.getPos(); + BlockPos pos = getPos(); nextCoord: for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-RANGE, 0, -RANGE), pos.add(RANGE, RANGE_Y, RANGE))) { - if(supertile.getWorld().getBlockState(pos_).getBlock().isIn(BlockTags.LEAVES)) { + if(getWorld().getBlockState(pos_).getBlock().isIn(BlockTags.LEAVES)) { for(EnumFacing dir : EnumFacing.values()) { - if(supertile.getWorld().isAirBlock(pos_.offset(dir))) { + if(getWorld().isAirBlock(pos_.offset(dir))) { coords.add(pos_); break nextCoord; } @@ -85,12 +89,12 @@ public class SubTileMunchdew extends SubTileGenerating { Collections.shuffle(coords); BlockPos breakCoords = coords.get(0); - IBlockState state = supertile.getWorld().getBlockState(breakCoords); - supertile.getWorld().removeBlock(breakCoords); + IBlockState state = getWorld().getBlockState(breakCoords); + getWorld().removeBlock(breakCoords); ticksWithoutEating = 0; ateOnce = true; if(ConfigHandler.COMMON.blockBreakParticles.get()) - supertile.getWorld().playEvent(2001, breakCoords, Block.getStateId(state)); + getWorld().playEvent(2001, breakCoords, Block.getStateId(state)); mana += manaPerLeaf; } } 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 a3c3ec696..30e0c789f 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 @@ -13,43 +13,46 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Particles; import net.minecraft.init.SoundEvents; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class SubTileNarslimmus extends SubTileGenerating { +public class SubTileNarslimmus extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":narslimmus") + public static TileEntityType TYPE; public static final String TAG_WORLD_SPAWNED = "Botania:WorldSpawned"; private static final int RANGE = 2; - public SubTileNarslimmus(SubTileType type) { - super(type); + public SubTileNarslimmus() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); if(ticksExisted % 5 == 0) { - List slimes = supertile.getWorld().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List slimes = getWorld().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntitySlime slime : slimes) { if(slime.getEntityData().getBoolean(TAG_WORLD_SPAWNED) && slime.isAlive()) { int size = slime.getSlimeSize(); 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 57f6a252b..492b9ab8f 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 @@ -15,67 +15,72 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nullable; import java.util.List; -public class SubTileRafflowsia extends SubTileGenerating { +public class SubTileRafflowsia extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":rafflowsia") + public static TileEntityType TYPE; private static final String TAG_LAST_FLOWER = "lastFlower"; private static final String TAG_LAST_FLOWER_TIMES = "lastFlowerTimes"; + private static final Tag SPECIAL_FLOWERS = new BlockTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "special_flowers")); - private String lastFlower; + @Nullable + private Block lastFlower; private int lastFlowerTimes; private static final int RANGE = 5; - public SubTileRafflowsia(SubTileType type) { - super(type); + public SubTileRafflowsia() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); int mana = 2100; - if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 40 == 0) { + if(getMaxMana() - this.mana >= mana && !getWorld().isRemote && ticksExisted % 40 == 0) { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { - BlockPos pos = supertile.getPos().add(i - RANGE, j - RANGE, k - RANGE); + BlockPos pos = getPos().add(i - RANGE, j - RANGE, k - RANGE); - TileEntity tile = supertile.getWorld().getTileEntity(pos); - if(tile instanceof ISubTileContainer) { - SubTileEntity stile = ((ISubTileContainer) tile).getSubTile(); - String name = stile.getUnlocalizedName(); - - if(!(stile instanceof SubTileRafflowsia)) { - boolean last = name.equals(lastFlower); - if(last) - lastFlowerTimes++; - else { - lastFlower = name; - lastFlowerTimes = 1; - } - - float mod = 1F / lastFlowerTimes; - - getWorld().destroyBlock(pos, false); - this.mana += mana * mod; - sync(); - return; + IBlockState state = getWorld().getBlockState(pos); + if(state.isIn(SPECIAL_FLOWERS) && state.getBlock() != ModSubtiles.rafflowsia) { + if(state.getBlock() == lastFlower) + lastFlowerTimes++; + else { + lastFlower = state.getBlock(); + lastFlowerTimes = 1; } + + float mod = 1F / lastFlowerTimes; + + getWorld().destroyBlock(pos, false); + this.mana += mana * mod; + sync(); + return; } } } @@ -85,7 +90,8 @@ public class SubTileRafflowsia extends SubTileGenerating { public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); - cmp.putString(TAG_LAST_FLOWER, lastFlower); + if(lastFlower != null) + cmp.putString(TAG_LAST_FLOWER, lastFlower.getRegistryName().toString()); cmp.putInt(TAG_LAST_FLOWER_TIMES, lastFlowerTimes); } @@ -93,7 +99,9 @@ public class SubTileRafflowsia extends SubTileGenerating { public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); - lastFlower = cmp.getString(TAG_LAST_FLOWER); + ResourceLocation id = ResourceLocation.tryCreate(cmp.getString(TAG_LAST_FLOWER)); + if(id != null) + lastFlower = ForgeRegistries.BLOCKS.getValue(id); lastFlowerTimes = cmp.getInt(TAG_LAST_FLOWER_TIMES); } @@ -102,7 +110,8 @@ public class SubTileRafflowsia extends SubTileGenerating { super.populateDropStackNBTs(drops); ItemStack stack = drops.get(0); - ItemNBTHelper.setString(stack, TAG_LAST_FLOWER, lastFlower); + if(lastFlower != null) + ItemNBTHelper.setString(stack, TAG_LAST_FLOWER, lastFlower.getRegistryName().toString()); ItemNBTHelper.setInt(stack, TAG_LAST_FLOWER_TIMES, lastFlowerTimes); } @@ -110,7 +119,9 @@ public class SubTileRafflowsia extends SubTileGenerating { public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { super.onBlockPlacedBy(world, pos, state, entity, stack); - lastFlower = ItemNBTHelper.getString(stack, TAG_LAST_FLOWER, ""); + ResourceLocation id = ResourceLocation.tryCreate(ItemNBTHelper.getString(stack, TAG_LAST_FLOWER, "")); + if(id != null) + lastFlower = ForgeRegistries.BLOCKS.getValue(id); lastFlowerTimes = ItemNBTHelper.getInt(stack, TAG_LAST_FLOWER_TIMES, 0); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java index 151f2349d..1dddf06c7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java @@ -9,28 +9,33 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.init.MobEffects; import net.minecraft.init.Particles; import net.minecraft.init.SoundEvents; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; -public class SubTileShulkMeNot extends SubTileGenerating { +public class SubTileShulkMeNot extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":shulk_me_not") + public static TileEntityType TYPE; private static final int RADIUS = 8; - public SubTileShulkMeNot(SubTileType type) { - super(type); + public SubTileShulkMeNot() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); int generate = getMaxMana(); 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 ac636e8e4..4e83ab5f4 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 @@ -15,30 +15,33 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; import net.minecraft.init.Particles; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.particles.ItemParticleData; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.WorldServer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +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; import java.awt.Color; import java.util.List; -public class SubTileSpectrolus extends SubTileGenerating { +public class SubTileSpectrolus extends TileEntityGeneratingFlower { + @ObjectHolder(LibMisc.MOD_ID + ":spectrolus") + public static TileEntityType TYPE; private static final String TAG_NEXT_COLOR = "nextColor"; @@ -46,18 +49,18 @@ public class SubTileSpectrolus extends SubTileGenerating { private EnumDyeColor nextColor = EnumDyeColor.WHITE; - public SubTileSpectrolus(SubTileType type) { - super(type); + public SubTileSpectrolus() { + super(TYPE); } @Override - public void onUpdate() { - super.onUpdate(); + public void tickFlower() { + super.tickFlower(); - if (supertile.getWorld().isRemote) + if (getWorld().isRemote) return; - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { @@ -71,7 +74,7 @@ public class SubTileSpectrolus extends SubTileGenerating { nextColor = nextColor == EnumDyeColor.BLACK ? EnumDyeColor.WHITE : EnumDyeColor.values()[nextColor.ordinal() + 1]; sync(); - ((WorldServer) supertile.getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D); + ((WorldServer) getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D); } item.remove(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 505194f67..c0b563d8e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -14,17 +14,22 @@ import net.minecraft.block.material.Material; import net.minecraft.fluid.Fluid; import net.minecraft.tags.FluidTags; import net.minecraft.tags.Tag; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; public class SubTileThermalily extends SubTileHydroangeas { + @ObjectHolder(LibMisc.MOD_ID + ":thermalily") + public static TileEntityType TYPE; - public SubTileThermalily(SubTileType type) { - super(type); + public SubTileThermalily() { + super(TYPE); } @Override @@ -39,7 +44,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); } @Override @@ -49,7 +54,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void playSound() { - supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); + getWorld().playSound(null, getPos(), ModSounds.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); } @Override 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 18c28ed46..f730b7a68 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -10,69 +10,82 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.registries.ObjectHolder; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -public class TileFloatingFlower extends TileMod implements IFloatingFlower { +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_ISLAND_TYPE = "islandType"; - public static ItemStack forcedStack = ItemStack.EMPTY; - private IslandType type = IslandType.GRASS; + private static final String TAG_FLOATING_DATA = "floating"; + public static ItemStack forcedStack = ItemStack.EMPTY; + private final IFloatingFlower floatingData = new FloatingFlowerImpl() { + @Override + public ItemStack getDisplayStack() { + if(!forcedStack.isEmpty()) { + ItemStack retStack = forcedStack; + forcedStack = ItemStack.EMPTY; + return retStack; + } else { + Block b = getBlockState().getBlock(); + if(b instanceof BlockFloatingFlower) { + return new ItemStack(ModBlocks.getShinyFlower(((BlockFloatingFlower) b).color)); + } else { + return ItemStack.EMPTY; + } + } + } + }; + private final LazyOptional floatingDataCap = LazyOptional.of(() -> floatingData); public TileFloatingFlower() { super(TYPE); } + @Nonnull @Override - public ItemStack getDisplayStack() { - if(!forcedStack.isEmpty()) { - ItemStack retStack = forcedStack; - forcedStack = ItemStack.EMPTY; - return retStack; + public LazyOptional getCapability(@Nonnull Capability cap, @Nullable EnumFacing side) { + if(cap == BotaniaAPI.FLOATING_FLOWER_CAP) { + return floatingDataCap.cast(); } - return new ItemStack(getBlockState().getBlock()); + return super.getCapability(cap, side); } @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - IslandType oldType = getIslandType(); + IFloatingFlower.IslandType oldType = floatingData.getIslandType(); super.onDataPacket(net, packet); - if(oldType != getIslandType()) { + if(oldType != floatingData.getIslandType()) { world.markBlockRangeForRenderUpdate(pos, pos); } } - @Override - public IslandType getIslandType() { - return type; - } - - @Override - public void setIslandType(IslandType type) { - this.type = type; - } - @Override public void writePacketNBT(NBTTagCompound cmp) { - cmp.putString(TAG_ISLAND_TYPE, type.toString()); + cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); } @Override public void readPacketNBT(NBTTagCompound cmp) { - type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); + BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java deleted file mode 100644 index 5c1fd3602..000000000 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Nov 17, 2014, 5:41:58 PM (GMT)] - */ -package vazkii.botania.common.block.tile; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; - -public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFloatingFlower { - - public static final String TAG_ISLAND_TYPE = "islandType"; - private IslandType type = IslandType.GRASS; - - @Override - public boolean isOnSpecialSoil() { - return false; - } - - @Override - public ItemStack getDisplayStack() { - return ItemBlockSpecialFlower.ofType(getSubTile().getType()); - } - - @Override - public IslandType getIslandType() { - return type; - } - - @Override - public void setIslandType(IslandType type) { - this.type = type; - } - - @Override - public void writePacketNBT(NBTTagCompound cmp) { - super.writePacketNBT(cmp); - cmp.putString(TAG_ISLAND_TYPE, type.toString()); - } - - @Override - public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - IslandType oldType = getIslandType(); - super.onDataPacket(net, packet); - if(oldType != getIslandType()) { - world.markBlockRangeForRenderUpdate(pos, pos); - } - } - - @Override - public void readPacketNBT(NBTTagCompound cmp) { - super.readPacketNBT(cmp); - type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); - } - - @Override - public int getSlowdownFactor() { - IslandType type = getIslandType(); - if (type == IslandType.MYCEL) - return SLOWDOWN_FACTOR_MYCEL; - else if (type == IslandType.PODZOL) - return SLOWDOWN_FACTOR_PODZOL; - return 0; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java deleted file mode 100644 index df58fcdd2..000000000 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ /dev/null @@ -1,233 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 22, 2014, 7:21:51 PM (GMT)] - */ -package vazkii.botania.common.block.tile; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ITickable; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.ISubTileSlowableContainer; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileType; -import vazkii.botania.api.wand.IWandBindable; -import vazkii.botania.common.BotaniaRegistries; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.string.TileRedStringRelay; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; - -import java.util.List; - -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer, ITickable { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.SPECIAL_FLOWER) - public static TileEntityType TYPE; - - private static final String TAG_SUBTILE_NAME = "subTileName"; - private static final String TAG_SUBTILE_CMP = "subTileCmp"; - - private SubTileEntity subTile; - - public TileSpecialFlower() { - super(TYPE); - } - - @Override - public SubTileEntity getSubTile() { - return subTile; - } - - @Override - public void setSubTile(SubTileType type) { - setSubTile(type.create()); - } - - private void setSubTile(SubTileEntity tile) { - subTile = tile; - subTile.setSupertile(this); - } - - @Override - public void tick() { - if(subTile != null) { - world.profiler.startSection(() -> subTile.getType().getRegistryName().toString()); - TileEntity tileBelow = world.getTileEntity(pos.down()); - if(tileBelow instanceof TileRedStringRelay) { - BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding(); - if(coords != null) { - BlockPos currPos = pos; - setPos(coords); - subTile.onUpdate(); - setPos(currPos); - - world.profiler.endSection(); - return; - } - } - - boolean special = isOnSpecialSoil(); - if(special) { - subTile.overgrowth = true; - if(subTile.isOvergrowthAffected()) { - subTile.onUpdate(); - subTile.overgrowthBoost = true; - } - } - subTile.onUpdate(); - subTile.overgrowth = false; - subTile.overgrowthBoost = false; - world.profiler.endSection(); - } - } - - public boolean isOnSpecialSoil() { - return world.getBlockState(pos.down()).getBlock() == ModBlocks.enchantedSoil; - } - - @Override - public void writePacketNBT(NBTTagCompound cmp) { - super.writePacketNBT(cmp); - - if(subTile != null) { - cmp.putString(TAG_SUBTILE_NAME, subTile.getType().getRegistryName().toString()); - NBTTagCompound subCmp = new NBTTagCompound(); - cmp.put(TAG_SUBTILE_CMP, subCmp); - subTile.writeToPacketNBTInternal(subCmp); - } - } - - @Override - public void readPacketNBT(NBTTagCompound cmp) { - super.readPacketNBT(cmp); - - if(cmp.contains(TAG_SUBTILE_NAME)) { - ResourceLocation id = new ResourceLocation(cmp.getString(TAG_SUBTILE_NAME)); - if(subTile == null || !id.equals(subTile.getType().getRegistryName())) - setSubTile(BotaniaRegistries.SUBTILES.getValue(id)); - subTile.readFromPacketNBTInternal(cmp.getCompound(TAG_SUBTILE_CMP)); - } - } - - public LexiconEntry getEntry() { - return subTile == null ? null : subTile.getEntry(); - } - - public boolean onWanded(ItemStack wand, EntityPlayer player) { - return subTile == null ? false : subTile.onWanded(player, wand); - } - - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { - if (subTile != null) - subTile.onBlockPlacedBy(world, pos, state, entity, stack); - } - - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); - } - - public void onBlockAdded(World world, BlockPos pos, IBlockState state) { - if (subTile != null) - subTile.onBlockAdded(world, pos, state); - } - - public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { - if (subTile != null) - subTile.onBlockHarvested(world, pos, state, player); - } - - public List getDrops(List list) { - if (subTile != null) - subTile.getDrops(list); - - return list; - } - - @Override - public boolean receiveClientEvent(int id, int param) { - if(subTile != null) - return subTile.receiveClientEvent(id, param); - return super.receiveClientEvent(id, param); - } - - @OnlyIn(Dist.CLIENT) - public void renderHUD(Minecraft mc) { - if(subTile != null) - subTile.renderHUD(mc); - } - - @Override - public BlockPos getBinding() { - if(subTile == null) - return null; - return subTile.getBinding(); - } - - @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { - if(subTile == null) - return false; - return subTile.canSelect(player, wand, pos, side); - } - - @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { - if(subTile == null) - return false; - return subTile.bindTo(player, wand, pos, side); - } - - public int getLightValue() { - if(subTile == null) - return 0; - return subTile.getLightValue(); - } - - public int getComparatorInputOverride() { - if(subTile == null) - return 0; - return subTile.getComparatorInputOverride(); - } - - public int getPowerLevel(EnumFacing side) { - if(subTile == null) - return 0; - return subTile.getPowerLevel(side); - } - - @Override - public int getSlowdownFactor() { - Block below = world.getBlockState(getPos().down()).getBlock(); - if(below == Blocks.MYCELIUM) - return SLOWDOWN_FACTOR_MYCEL; - - if(below == Blocks.PODZOL) { - return SLOWDOWN_FACTOR_PODZOL; - } - - return 0; - } -} 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 976f029fa..b00fa9891 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,7 +18,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.subtile.ISubTileContainer; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -37,7 +37,7 @@ public class TileRedStringRelay extends TileRedString { Block block = world.getBlockState(pos).getBlock(); TileEntity tile = world.getTileEntity(pos); - return (block instanceof BlockFlower || block instanceof BlockMushroom || block instanceof BlockDoublePlant) && (tile == null || !(tile instanceof ISubTileContainer)); + return (block instanceof BlockFlower || block instanceof BlockMushroom || block instanceof BlockDoublePlant) && (tile == null || !(tile instanceof TileEntitySpecialFlower)); } } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 435910bf5..3ef67b09b 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -13,8 +13,11 @@ package vazkii.botania.common.core; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.tags.ItemTags; import net.minecraft.util.IItemProvider; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -24,6 +27,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import java.util.Comparator; public final class BotaniaCreativeTab extends ItemGroup { @@ -55,7 +59,7 @@ public final class BotaniaCreativeTab extends ItemGroup { for(EnumDyeColor color : EnumDyeColor.values()) addItem(ModBlocks.getFlower(color)); - addItem(ModBlocks.specialFlower); + addTag(new ResourceLocation(LibMisc.MOD_ID, "special_flowers")); for(EnumDyeColor color : EnumDyeColor.values()) this.addItem(ModItems.getPetal(color)); addItem(ModItems.pestleAndMortar); @@ -430,7 +434,7 @@ public final class BotaniaCreativeTab extends ItemGroup { addItem(ModBlocks.getShinyFlower(color)); for(EnumDyeColor color : EnumDyeColor.values()) addItem(ModBlocks.getFloatingFlower(color)); - addItem(ModBlocks.floatingSpecialFlower); + addTag(new ResourceLocation(LibMisc.MOD_ID, "special_floating_flowers")); addItem(ModBlocks.petalBlockWhite); addItem(ModBlocks.petalBlockOrange); addItem(ModBlocks.petalBlockMagenta); @@ -623,6 +627,12 @@ public final class BotaniaCreativeTab extends ItemGroup { ModItems.cosmetics.values().forEach(this::addItem); } + private void addTag(ResourceLocation tagId) { + ItemTags.getCollection().getOrCreate(tagId).getAllElements().stream() + .sorted(Comparator.comparing(ForgeRegistryEntry::getRegistryName)) + .forEach(this::addItem); + } + private void addItem(IItemProvider item) { item.asItem().fillItemGroup(this, list); } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index ff07ac324..7558fce3a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -14,8 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -39,10 +37,9 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.ISpecialFlower; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.Botania; @@ -96,16 +93,6 @@ public class InternalMethodHandler extends DummyMethodHandler { return new PageCraftingRecipe(key, recipe); } - @Override - public ModelResourceLocation getSubTileBlockModelForName(String name) { - return BotaniaAPIClient.getRegisteredSubtileBlockModels().get(name); - } - - @Override - public ModelResourceLocation getSubTileItemModelForName(String name) { - return BotaniaAPIClient.getRegisteredSubtileItemModels().get(name); - } - @Override public LexiconPage petalRecipesPage(String key, List recipes) { return new PagePetalRecipe<>(key, recipes); @@ -156,21 +143,6 @@ public class InternalMethodHandler extends DummyMethodHandler { return new PageMultiblock(key, mb); } - @Override - public ItemStack getSubTileAsStack(SubTileType subTile) { - return ItemBlockSpecialFlower.ofType(subTile); - } - - @Override - public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile) { - return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), subTile); - } - - @Override - public SubTileType getStackSubTileKey(ItemStack stack) { - return ItemBlockSpecialFlower.getType(stack); - } - @Override public IManaNetwork getManaNetworkInstance() { return ManaNetworkHandler.instance; @@ -192,8 +164,8 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { - return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.manaSpreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.manaPool) : new ItemStack(ModItems.twigWand); + public ItemStack getBindDisplayForFlowerType(TileEntitySpecialFlower e) { + return e instanceof TileEntityGeneratingFlower ? new ItemStack(ModBlocks.manaSpreader) : e instanceof TileEntityFunctionalFlower ? new ItemStack(ModBlocks.manaPool) : new ItemStack(ModItems.twigWand); } @Override diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c061a1d40..195d612d3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -11,54 +11,23 @@ package vazkii.botania.common.crafting; import com.google.common.collect.ImmutableList; -import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.crafting.VanillaRecipeTypes; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.server.ServerLifecycleHooks; -import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.Botania; -import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.crafting.recipe.AncientWillRecipe; -import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe; -import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; -import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; -import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; -import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; -import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; -import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; -import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; -import vazkii.botania.common.crafting.recipe.ManaUpgradeRecipe; -import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; -import vazkii.botania.common.crafting.recipe.ShapelessManaUpgradeRecipe; -import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; -import vazkii.botania.common.crafting.recipe.SpellClothRecipe; -import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibOreDict; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModCraftingRecipes { public static ResourceLocation recipeLexicon; @@ -328,17 +297,6 @@ public final class ModCraftingRecipes { public static ResourceLocation recipeFelPumpkin; public static ResourceLocation recipeEndPortal; - @SubscribeEvent - public static void registerRecipes(FMLServerStartingEvent evt) { - evt.getServer().getResourceManager().addReloadListener(manager -> { - // todo 1.13 have each subtile responsible for itself - for (ResourceLocation s : BotaniaRegistries.SUBTILES.getKeys()) { - ResourceLocation id = new ResourceLocation(LibMisc.MOD_ID, "floating_" + s.toString().replaceAll(":", "_")); - evt.getServer().getRecipeManager().addRecipe(new SpecialFloatingFlowerRecipe(id, s)); - } - }); - } - public static void init() { // Can't do this in RegistryEvent.Register event handler since it seems JSON recipes aren't loaded yet recipesPetals = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.PETAL)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 23c88c3e9..c77eeeb85 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -16,10 +16,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ItemTags; +import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.imc.IMC; import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.ModSubtiles; @@ -178,7 +178,7 @@ public final class ModManaAlchemyRecipes { IMCSender.send(IMC.REGISTER_MANA_INFUSION, mini(ModSubtiles.solegnoliaChibi, ModSubtiles.solegnolia)); } - private static RecipeManaInfusion mini(SubTileType mini, SubTileType full) { - return RecipeManaInfusion.alchemy(mini.getRegistryName(), ItemBlockSpecialFlower.ofType(mini), new IngredientNBTSubset(ItemBlockSpecialFlower.ofType(full)), 2500); + private static RecipeManaInfusion mini(IItemProvider mini, IItemProvider full) { + return RecipeManaInfusion.alchemy(mini.asItem().getRegistryName(), new ItemStack(mini), Ingredient.fromItems(full), 2500); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 401b26826..e80947379 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -18,6 +18,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; @@ -110,54 +111,54 @@ public final class ModPetalRecipes { Ingredient pixieDust = Ingredient.fromItems(ModItems.pixieDust); Ingredient gaiaSpirit = Ingredient.fromItems(ModItems.lifeEssence); - pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); - manastarRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MANASTAR), lightBlue, green, red, cyan); + pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.pureDaisy), white, white, white, white); + manastarRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.manastar), lightBlue, green, red, cyan); - endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, brown, red, lightGray); - hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), blue, blue, cyan, cyan); - thermalilyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), red, orange, orange, runeEarth, runeFire); - arcaneRoseRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ARCANE_ROSE), pink, pink, purple, purple, lime, runeMana); - munchdewRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MUNCHDEW), lime, lime, red, red, green, runeGluttony); - entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM), red, red, gray, gray, white, white, runeWrath, runeFire); - kekimurusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS), white, white, orange, orange, brown, brown,runeGluttony, pixieDust); - gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_GOURMARYLLIS), lightGray, lightGray, yellow, yellow, red, runeFire, runeSummer); - narslimmusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), lime, lime, green, green, black, runeSummer, runeWater); - spectrolusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS), red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust); - rafflowsiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RAFFLOWSIA), purple, purple, green, green, black, runeEarth, runePride, pixieDust); - shulkMeNotRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SHULK_ME_NOT), purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath); - dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit); + endoflameRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.endoflame), brown, brown, red, lightGray); + hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hydroangeas), blue, blue, cyan, cyan); + thermalilyRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.thermalily), red, orange, orange, runeEarth, runeFire); + arcaneRoseRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rosaArcana), pink, pink, purple, purple, lime, runeMana); + munchdewRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.munchdew), lime, lime, red, red, green, runeGluttony); + entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.entropinnyum), red, red, gray, gray, white, white, runeWrath, runeFire); + kekimurusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.kekimurus), white, white, orange, orange, brown, brown,runeGluttony, pixieDust); + gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.gourmaryllis), lightGray, lightGray, yellow, yellow, red, runeFire, runeSummer); + narslimmusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.narslimmus), lime, lime, green, green, black, runeSummer, runeWater); + spectrolusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.spectrolus), red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust); + rafflowsiaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rafflowsia), purple, purple, green, green, black, runeEarth, runePride, pixieDust); + shulkMeNotRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.shulkMeNot), purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath); + dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.dandelifeon), purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit); - jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purple, lime, green, runeSpring, redstoneRoot); - bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), red, red, red, cyan, cyan, redstoneRoot); - dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DREADTHORN), black, black, black, cyan, cyan, redstoneRoot); - heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HEISEI_DREAM), magenta, magenta, purple, pink, runeWrath, pixieDust); - tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TIGERSEYE), yellow, brown, orange, lime, runeAutumn); + jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.jadedAmaranthus), purple, lime, green, runeSpring, redstoneRoot); + bellethorneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bellethorn), red, red, red, cyan, cyan, redstoneRoot); + dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.dreadthorn), black, black, black, cyan, cyan, redstoneRoot); + heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.heiseiDream), magenta, magenta, purple, pink, runeWrath, pixieDust); + tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.tigerseye), yellow, brown, orange, lime, runeAutumn); if(Botania.gardenOfGlassLoaded) - orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, gray, yellow, yellow, green, green, red, red); - else orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, gray, yellow, green, red, runePride, runeGreed, redstoneRoot, pixieDust); + orechidRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechid), gray, gray, yellow, yellow, green, green, red, red); + else orechidRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechid), gray, gray, yellow, green, red, runePride, runeGreed, redstoneRoot, pixieDust); - orechidIgnemRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID_IGNEM), red, red, white, white, pink, runePride, runeGreed, redstoneRoot, pixieDust); + orechidIgnemRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechidIgnem), red, red, white, white, pink, runePride, runeGreed, redstoneRoot, pixieDust); if(ConfigHandler.COMMON.fallenKanadeEnabled.get()) - fallenKanadeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_FALLEN_KANADE), white, white, yellow, yellow, orange, runeSpring); - exoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_EXOFLAME), red, red, gray, lightGray, runeFire, runeSummer); - agricarnationRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_AGRICARNATION), lime, lime, green, yellow, runeSpring, redstoneRoot); - hopperhockRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HOPPERHOCK), gray, gray, lightGray, lightGray, runeAir, redstoneRoot); - tangleberrieRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TANGLEBERRIE), cyan, cyan, gray, lightGray, runeAir, runeEarth); - jiyuuliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JIYUULIA), pink, pink, purple, lightGray, runeWater, runeAir); - rannuncarpusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RANNUNCARPUS), orange, orange, yellow, runeEarth, redstoneRoot); - hyacidusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYACIDUS), purple, purple, magenta, magenta, green, runeWater, runeAutumn, redstoneRoot); - pollidisiacRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_POLLIDISIAC), red, red, pink, pink, orange, runeLust, runeFire); - clayconiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_CLAYCONIA), lightGray, lightGray, gray, cyan, runeEarth); - looniumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_LOONIUM), green, green, green, green, gray, runeSloth, runeGluttony, runeEnvy, redstoneRoot, pixieDust); - daffomillRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAFFOMILL), white, white, brown, yellow, runeAir, redstoneRoot); - vinculotusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_VINCULOTUS), black, black, purple, purple, green, runeWater, runeSloth, runeLust, redstoneRoot); - spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTRANTHEMUM), white, white, lightGray, lightGray, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust); - medumoneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MEDUMONE), brown, brown, gray, gray, runeEarth, redstoneRoot); - marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot); - bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust); - solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SOLEGNOLIA), brown, brown, red, blue, redstoneRoot); - bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot); + fallenKanadeRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.fallenKanade), white, white, yellow, yellow, orange, runeSpring); + exoflameRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.exoflame), red, red, gray, lightGray, runeFire, runeSummer); + agricarnationRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.agricarnation), lime, lime, green, yellow, runeSpring, redstoneRoot); + hopperhockRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hopperhock), gray, gray, lightGray, lightGray, runeAir, redstoneRoot); + tangleberrieRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.tangleberrie), cyan, cyan, gray, lightGray, runeAir, runeEarth); + jiyuuliaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.jiyuulia), pink, pink, purple, lightGray, runeWater, runeAir); + rannuncarpusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rannuncarpus), orange, orange, yellow, runeEarth, redstoneRoot); + hyacidusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hyacidus), purple, purple, magenta, magenta, green, runeWater, runeAutumn, redstoneRoot); + pollidisiacRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.pollidisiac), red, red, pink, pink, orange, runeLust, runeFire); + clayconiaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.clayconia), lightGray, lightGray, gray, cyan, runeEarth); + looniumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.loonium), green, green, green, green, gray, runeSloth, runeGluttony, runeEnvy, redstoneRoot, pixieDust); + daffomillRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.daffomill), white, white, brown, yellow, runeAir, redstoneRoot); + vinculotusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.vinculotus), black, black, purple, purple, green, runeWater, runeSloth, runeLust, redstoneRoot); + spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.spectranthemum), white, white, lightGray, lightGray, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust); + medumoneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.medumone), brown, brown, gray, gray, runeEarth, redstoneRoot); + marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.marimorphosis), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot); + bubbellRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bubbell), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust); + solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.solegnolia), brown, brown, red, blue, redstoneRoot); + bergamuteRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bergamute), orange, green, green, redstoneRoot); ItemStack stack = new ItemStack(Items.PLAYER_HEAD); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java deleted file mode 100644 index c5c3a6cb2..000000000 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Nov 17, 2014, 6:34:36 PM (GMT)] - */ -package vazkii.botania.common.crafting.recipe; - -import com.google.gson.JsonObject; -import net.minecraft.block.Block; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeHidden; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.JsonUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.registries.IForgeRegistryEntry; -import vazkii.botania.api.subtile.SubTileType; -import vazkii.botania.common.BotaniaRegistries; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.decor.BlockFloatingFlower; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; - -public class SpecialFloatingFlowerRecipe extends IRecipeHidden { - private static final ResourceLocation TYPE_ID = new ResourceLocation(LibMisc.MOD_ID, "special_floating_flower"); - public final ResourceLocation flowerType; - - public SpecialFloatingFlowerRecipe(ResourceLocation id, ResourceLocation flowerType) { - super(id); - this.flowerType = flowerType; - } - - @Override - public boolean matches(@Nonnull IInventory inv, @Nonnull World world) { - boolean foundFloatingFlower = false; - boolean foundSpecialFlower = false; - - for(int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if(!stack.isEmpty()) { - if(Block.getBlockFromItem(stack.getItem()) instanceof BlockFloatingFlower) - foundFloatingFlower = true; - - else if(stack.getItem() == ModBlocks.specialFlower.asItem() && ItemBlockSpecialFlower.getType(stack).equals(flowerType)) - foundSpecialFlower = true; - - else return false; // Found an invalid item, breaking the recipe - } - } - - return foundFloatingFlower && foundSpecialFlower; - } - - @Nonnull - @Override - public ItemStack getCraftingResult(@Nonnull IInventory inv) { - ItemStack specialFlower = ItemStack.EMPTY; - - for(int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if(!stack.isEmpty() && stack.getItem() == ModBlocks.specialFlower.asItem() && ItemBlockSpecialFlower.getType(stack).equals(flowerType)) - specialFlower = stack; - } - - if(specialFlower.isEmpty()) - return ItemStack.EMPTY; - - SubTileType type = BotaniaRegistries.SUBTILES.getValue(flowerType); - return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), type); - } - - @Override - public boolean canFit(int width, int height) { - return width * height >= 2; - } - - @Nonnull - @Override - public IRecipeSerializer getSerializer() { - return SERIALIZER; - } - - public static final IRecipeSerializer SERIALIZER = new IRecipeSerializer() { - @Nonnull - @Override - public SpecialFloatingFlowerRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) { - ResourceLocation flowerType = new ResourceLocation(JsonUtils.getString(json, "flower_type")); - return new SpecialFloatingFlowerRecipe(recipeId, flowerType); - } - - @Nonnull - @Override - public SpecialFloatingFlowerRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) { - ResourceLocation flowerType = buffer.readResourceLocation(); - return new SpecialFloatingFlowerRecipe(recipeId, flowerType); - } - - @Override - public void write(@Nonnull PacketBuffer buffer, @Nonnull SpecialFloatingFlowerRecipe recipe) { - buffer.writeResourceLocation(recipe.flowerType); - } - - @Nonnull - @Override - public ResourceLocation getName() { - return TYPE_ID; - } - }; -} diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index eaeb7c9d0..3fb8f7a2f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -10,22 +10,17 @@ */ package vazkii.botania.common.item; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.api.subtile.ISubTileContainer; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.util.function.BiFunction; @@ -45,16 +40,16 @@ public class ItemObedienceStick extends ItemMod { TileEntity tileAt = world.getTileEntity(pos); if(tileAt instanceof IManaPool || tileAt instanceof IManaCollector) { boolean pool = tileAt instanceof IManaPool; - BiFunction act = pool ? functionalActuator : generatingActuator; - int range = pool ? SubTileFunctional.LINK_RANGE : SubTileGenerating.LINK_RANGE; + BiFunction act = pool ? functionalActuator : generatingActuator; + int range = pool ? TileEntityFunctionalFlower.LINK_RANGE : TileEntityGeneratingFlower.LINK_RANGE; for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range))) { if(pos_.distanceSq(pos) > range * range) continue; TileEntity tile = world.getTileEntity(pos_); - if(tile instanceof ISubTileContainer) { - SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile(); + if(tile instanceof TileEntitySpecialFlower) { + TileEntitySpecialFlower subtile = ((TileEntitySpecialFlower) tile); if(act.apply(subtile, tileAt)) { Vector3 orig = new Vector3(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5); Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); @@ -69,17 +64,17 @@ public class ItemObedienceStick extends ItemMod { return EnumActionResult.PASS; } - private static final BiFunction generatingActuator = (flower, tile) -> { - if(flower instanceof SubTileGenerating) { - ((SubTileGenerating) flower).linkToForcefully(tile); + private static final BiFunction generatingActuator = (flower, tile) -> { + if(flower instanceof TileEntityGeneratingFlower) { + ((TileEntityGeneratingFlower) flower).linkToForcefully(tile); return true; } return false; }; - private static final BiFunction functionalActuator = (flower, tile) -> { - if(flower instanceof SubTileFunctional) { - ((SubTileFunctional) flower).linkToForcefully(tile); + private static final BiFunction functionalActuator = (flower, tile) -> { + if(flower instanceof TileEntityFunctionalFlower) { + ((TileEntityFunctionalFlower) flower).linkToForcefully(tile); return true; } return false; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java deleted file mode 100644 index 96a1935a8..000000000 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Nov 17, 2014, 5:39:08 PM (GMT)] - */ -package vazkii.botania.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; - -import javax.annotation.Nonnull; - -public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { - - public ItemBlockFloatingSpecialFlower(Block block, Properties props) { - super(block, props); - } - - @Nonnull - @Override - public ITextComponent getDisplayName(@Nonnull ItemStack stack) { - ITextComponent flowerName = super.getDisplayName(stack); - return new TextComponentTranslation("botaniamisc.floatingPrefix").appendSibling(flowerName); - } - -} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index f00e6e667..b15b05e71 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -10,29 +10,22 @@ */ package vazkii.botania.common.item.block; -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.AdvancementManager; -import net.minecraft.advancements.PlayerAdvancements; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -40,13 +33,8 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.SubTileType; -import vazkii.botania.common.BotaniaRegistries; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; @@ -56,109 +44,31 @@ import javax.annotation.Nonnull; import java.util.List; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { +public class ItemBlockSpecialFlower extends ItemBlockMod { + private static final Tag GENERATING = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "generating_special_flowers")); + private static final Tag FUNCTIONAL = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "functional_special_flowers")); + private static final Tag MISC = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "misc_special_flowers")); public ItemBlockSpecialFlower(Block block1, Properties props) { super(block1, props); } - @Override - public boolean placeBlock(BlockItemUseContext ctx, @Nonnull IBlockState newState) { - boolean placed = super.placeBlock(ctx, newState); - if(placed) { - World world = ctx.getWorld(); - BlockPos pos = ctx.getPos(); - ItemStack stack = ctx.getItem(); - - SubTileType type = getType(ctx.getItem()); - TileEntity te = world.getTileEntity(pos); - if(te instanceof TileSpecialFlower) { - TileSpecialFlower tile = (TileSpecialFlower) te; - tile.setSubTile(type); - tile.onBlockAdded(world, pos, newState); - tile.onBlockPlacedBy(world, pos, newState, ctx.getPlayer(), stack); - if(!world.isRemote) - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8); - } - } - - return placed; - } - - @Nonnull - @Override - public String getTranslationKey(ItemStack stack) { - return getType(stack).getTranslationKey(stack); - } - @OnlyIn(Dist.CLIENT) @Override - public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { - SubTileType type = getType(par1ItemStack); - type.addTooltip(par1ItemStack, world, stacks); + public void addInformation(@Nonnull ItemStack stack, World world, @Nonnull List tooltip, @Nonnull ITooltipFlag flag) { + if(GENERATING.contains(this)) { + tooltip.add(new TextComponentTranslation("botania.flowerType.generating").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE)); + } else if(FUNCTIONAL.contains(this)) { + tooltip.add(new TextComponentTranslation("botania.flowerType.functional").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE)); + } else if(MISC.contains(this)) { + tooltip.add(new TextComponentTranslation("botania.flowerType.misc").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE)); + } if(ConfigHandler.CLIENT.referencesEnabled.get()) { - ITextComponent lore = type.getLore(par1ItemStack); - if(lore != null) - stacks.add(lore.applyTextStyles(TextFormatting.ITALIC, TextFormatting.GRAY)); + String key = getTranslationKey() + ".reference"; + ITextComponent lore = new TextComponentTranslation(key); + if(!lore.getString().equals(key)) + tooltip.add(lore.applyTextStyles(TextFormatting.ITALIC, TextFormatting.GRAY)); } } - - @Override - public String getCreatorModId(ItemStack itemStack) { - return getType(itemStack).getRegistryName().getNamespace(); - } - - public static SubTileType getType(ItemStack stack) { - ResourceLocation id = BotaniaAPI.DUMMY_SUBTILE_NAME; - if(stack.hasTag()) { - id = new ResourceLocation(ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, BotaniaAPI.DUMMY_SUBTILE_NAME.toString())); - } - return BotaniaRegistries.SUBTILES.getValue(id); - } - - public static ItemStack ofType(ResourceLocation type) { - return ofType(BotaniaRegistries.SUBTILES.getValue(type)); - } - - public static ItemStack ofType(SubTileType type) { - return ofType(new ItemStack(ModBlocks.specialFlower), type); - } - - public static ItemStack ofType(ItemStack stack, ResourceLocation type) { - return ofType(stack, BotaniaRegistries.SUBTILES.getValue(type)); - } - - public static ItemStack ofType(ItemStack stack, SubTileType type) { - ItemNBTHelper.setString(stack, SubTileEntity.TAG_TYPE, type.getRegistryName().toString()); - return stack; - } - - @Override - public String getKey(ItemStack stack) { - return "flower." + getType(stack); - } - - @SubscribeEvent - public static void onItemPickup(EntityItemPickupEvent evt) { - if(evt.getItem().getItem().getItem() == Item.getItemFromBlock(ModBlocks.specialFlower)) { - SubTileType type = getType(evt.getItem().getItem()); - - /* todo 1.13 use tags after flattening - Class subtile = BotaniaAPI.getSubTileMapping(type); - if(SubTileGenerating.class.isAssignableFrom(subtile)) { - PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/generating_flower"), "code_triggered"); - } - - if(SubTileFunctional.class.isAssignableFrom(subtile)) { - PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/functional_flower"), "code_triggered"); - } - */ - - if(BotaniaAPI.DUMMY_SUBTILE_NAME.equals(type.getRegistryName())) { - PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/null_flower"), "code_triggered"); - } - } - } - } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 78c3db85b..b8c52106b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -24,6 +24,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModMultiblocks; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.ModBrewRecipes; @@ -355,7 +356,7 @@ public final class LexiconData { .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe)) - .setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + .setIcon(new ItemStack(ModSubtiles.pureDaisy)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingwood)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingrock)); LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1); @@ -537,7 +538,7 @@ public final class LexiconData { flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); flowerShrinking.setPriority() .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)) - .setIcon(ItemBlockSpecialFlower.ofType(new ResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.getNamespace(), LibBlockNames.SUBTILE_BELLETHORN.getPath() + "_chibi"))); + .setIcon(new ItemStack(ModSubtiles.bellethornChibi)); flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); diff --git a/src/main/resources/assets/botania/blockstates/agricarnation.json b/src/main/resources/assets/botania/blockstates/agricarnation.json index 84497a47e..0c437dd26 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnation.json +++ b/src/main/resources/assets/botania/blockstates/agricarnation.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_agricarnation" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_agricarnation" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/agricarnation" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/agricarnation_chibi.json b/src/main/resources/assets/botania/blockstates/agricarnation_chibi.json new file mode 100644 index 000000000..05acc976b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/agricarnation_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/agricarnation_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/agricarnationchibi.json b/src/main/resources/assets/botania/blockstates/agricarnationchibi.json deleted file mode 100644 index d4cf110c4..000000000 --- a/src/main/resources/assets/botania/blockstates/agricarnationchibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_agricarnation_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_agricarnation_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/arcanerose.json b/src/main/resources/assets/botania/blockstates/arcanerose.json deleted file mode 100644 index 0450d92d6..000000000 --- a/src/main/resources/assets/botania/blockstates/arcanerose.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_arcane_rose" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_arcane_rose" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethorn.json b/src/main/resources/assets/botania/blockstates/bellethorn.json index 370cdd224..f474fe789 100644 --- a/src/main/resources/assets/botania/blockstates/bellethorn.json +++ b/src/main/resources/assets/botania/blockstates/bellethorn.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_bellethorne" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_bellethorne" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/bellethorn" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethorn_chibi.json b/src/main/resources/assets/botania/blockstates/bellethorn_chibi.json new file mode 100644 index 000000000..8cc49095e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellethorn_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/bellethorn_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethornchibi.json b/src/main/resources/assets/botania/blockstates/bellethornchibi.json deleted file mode 100644 index a3782a7db..000000000 --- a/src/main/resources/assets/botania/blockstates/bellethornchibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_bellethorne_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_bellethorne_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bergamute.json b/src/main/resources/assets/botania/blockstates/bergamute.json index 9eaa85c0a..36cf23993 100644 --- a/src/main/resources/assets/botania/blockstates/bergamute.json +++ b/src/main/resources/assets/botania/blockstates/bergamute.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_bergamute" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_bergamute" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/bergamute" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbell.json b/src/main/resources/assets/botania/blockstates/bubbell.json index d75724eb1..c5d622449 100644 --- a/src/main/resources/assets/botania/blockstates/bubbell.json +++ b/src/main/resources/assets/botania/blockstates/bubbell.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_bubbell" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_bubbell" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/bubbell" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbell_chibi.json b/src/main/resources/assets/botania/blockstates/bubbell_chibi.json new file mode 100644 index 000000000..6c3550797 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bubbell_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/bubbell_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbellchibi.json b/src/main/resources/assets/botania/blockstates/bubbellchibi.json deleted file mode 100644 index 2f6583254..000000000 --- a/src/main/resources/assets/botania/blockstates/bubbellchibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_bubbell_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_bubbell_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/clayconia.json b/src/main/resources/assets/botania/blockstates/clayconia.json index f4f2b1f08..1b39fe049 100644 --- a/src/main/resources/assets/botania/blockstates/clayconia.json +++ b/src/main/resources/assets/botania/blockstates/clayconia.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_clayconia" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_clayconia" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/clayconia" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/clayconia_chibi.json b/src/main/resources/assets/botania/blockstates/clayconia_chibi.json new file mode 100644 index 000000000..1738bf45d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/clayconia_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/clayconia_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/clayconiachibi.json b/src/main/resources/assets/botania/blockstates/clayconiachibi.json deleted file mode 100644 index 93e08fed8..000000000 --- a/src/main/resources/assets/botania/blockstates/clayconiachibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_clayconia_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_clayconia_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daffomill.json b/src/main/resources/assets/botania/blockstates/daffomill.json index cfdb37dd1..cc0f52b38 100644 --- a/src/main/resources/assets/botania/blockstates/daffomill.json +++ b/src/main/resources/assets/botania/blockstates/daffomill.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_daffomill" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_daffomill" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/daffomill" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dandelifeon.json b/src/main/resources/assets/botania/blockstates/dandelifeon.json index ae908cbb7..35debd6db 100644 --- a/src/main/resources/assets/botania/blockstates/dandelifeon.json +++ b/src/main/resources/assets/botania/blockstates/dandelifeon.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_dandelifeon" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_dandelifeon" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/dandelifeon" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreadthorn.json b/src/main/resources/assets/botania/blockstates/dreadthorn.json index 7ce16ef52..83590fd2a 100644 --- a/src/main/resources/assets/botania/blockstates/dreadthorn.json +++ b/src/main/resources/assets/botania/blockstates/dreadthorn.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_dreadthorne" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_dreadthorne" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/dreadthorn" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endoflame.json b/src/main/resources/assets/botania/blockstates/endoflame.json index 873aa8b71..00548dae3 100644 --- a/src/main/resources/assets/botania/blockstates/endoflame.json +++ b/src/main/resources/assets/botania/blockstates/endoflame.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_endoflame" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_endoflame" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/endoflame" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/entropinnyum.json b/src/main/resources/assets/botania/blockstates/entropinnyum.json index bf3ca4fbc..b06bfbf8c 100644 --- a/src/main/resources/assets/botania/blockstates/entropinnyum.json +++ b/src/main/resources/assets/botania/blockstates/entropinnyum.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_entropinnyum" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_entropinnyum" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/entropinnyum" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/exoflame.json b/src/main/resources/assets/botania/blockstates/exoflame.json index 8e1617222..b10fcace0 100644 --- a/src/main/resources/assets/botania/blockstates/exoflame.json +++ b/src/main/resources/assets/botania/blockstates/exoflame.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_exoflame" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_exoflame" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/exoflame" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fallen_kanade.json b/src/main/resources/assets/botania/blockstates/fallen_kanade.json new file mode 100644 index 000000000..640da6c5c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fallen_kanade.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/fallen_kanade" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fallenkanade.json b/src/main/resources/assets/botania/blockstates/fallenkanade.json deleted file mode 100644 index e339a460d..000000000 --- a/src/main/resources/assets/botania/blockstates/fallenkanade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_fallen_kanade" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_fallen_kanade" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gourmaryllis.json b/src/main/resources/assets/botania/blockstates/gourmaryllis.json index 8b1a5f13c..dfa6a1172 100644 --- a/src/main/resources/assets/botania/blockstates/gourmaryllis.json +++ b/src/main/resources/assets/botania/blockstates/gourmaryllis.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_gourmaryllis" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_gourmaryllis" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/gourmaryllis" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/heisei_dream.json b/src/main/resources/assets/botania/blockstates/heisei_dream.json new file mode 100644 index 000000000..79bd9de8e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/heisei_dream.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/heisei_dream" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/heiseidream.json b/src/main/resources/assets/botania/blockstates/heiseidream.json deleted file mode 100644 index f75a5d9ad..000000000 --- a/src/main/resources/assets/botania/blockstates/heiseidream.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_heisei_dream" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_heisei_dream" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhock.json b/src/main/resources/assets/botania/blockstates/hopperhock.json index 2cd6d12bc..ba1c5f8f1 100644 --- a/src/main/resources/assets/botania/blockstates/hopperhock.json +++ b/src/main/resources/assets/botania/blockstates/hopperhock.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_hopperhock" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_hopperhock" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/hopperhock" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhock_chibi.json b/src/main/resources/assets/botania/blockstates/hopperhock_chibi.json new file mode 100644 index 000000000..66111820f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhock_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/hopperhock_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhockchibi.json b/src/main/resources/assets/botania/blockstates/hopperhockchibi.json deleted file mode 100644 index afe9f0e86..000000000 --- a/src/main/resources/assets/botania/blockstates/hopperhockchibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_hopperhock_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_hopperhock_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hyacidus.json b/src/main/resources/assets/botania/blockstates/hyacidus.json index fbe1f229d..b6707ae65 100644 --- a/src/main/resources/assets/botania/blockstates/hyacidus.json +++ b/src/main/resources/assets/botania/blockstates/hyacidus.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_hyacidus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_hyacidus" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/hyacidus" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeas.json b/src/main/resources/assets/botania/blockstates/hydroangeas.json index b2964fb23..49a2535db 100644 --- a/src/main/resources/assets/botania/blockstates/hydroangeas.json +++ b/src/main/resources/assets/botania/blockstates/hydroangeas.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_hydroangeas" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_hydroangeas" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/hydroangeas" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json deleted file mode 100644 index 254937775..000000000 --- a/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_hydroangeas_decor" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_hydroangeas_decor" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jaded_amaranthus.json b/src/main/resources/assets/botania/blockstates/jaded_amaranthus.json new file mode 100644 index 000000000..bd883e58d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jaded_amaranthus.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/jaded_amaranthus" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jadedamaranthus.json b/src/main/resources/assets/botania/blockstates/jadedamaranthus.json deleted file mode 100644 index 297a951d2..000000000 --- a/src/main/resources/assets/botania/blockstates/jadedamaranthus.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_jaded_amaranthus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_jaded_amaranthus" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jiyuulia.json b/src/main/resources/assets/botania/blockstates/jiyuulia.json index 2fbdb6a66..c4586a3c8 100644 --- a/src/main/resources/assets/botania/blockstates/jiyuulia.json +++ b/src/main/resources/assets/botania/blockstates/jiyuulia.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_jiyuulia" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_jiyuulia" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/jiyuulia" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/kekimurus.json b/src/main/resources/assets/botania/blockstates/kekimurus.json index e1e20f777..f8f126344 100644 --- a/src/main/resources/assets/botania/blockstates/kekimurus.json +++ b/src/main/resources/assets/botania/blockstates/kekimurus.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_kekimurus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_kekimurus" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/kekimurus" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/loonium.json b/src/main/resources/assets/botania/blockstates/loonium.json index 735fa680d..c494d6053 100644 --- a/src/main/resources/assets/botania/blockstates/loonium.json +++ b/src/main/resources/assets/botania/blockstates/loonium.json @@ -1,18 +1,5 @@ { - "forge_marker": 1, "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_loonium" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_loonium" - } - }] + "": { "model": "botania:block/loonium" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manastar.json b/src/main/resources/assets/botania/blockstates/manastar.json index 863526912..0e2d646e9 100644 --- a/src/main/resources/assets/botania/blockstates/manastar.json +++ b/src/main/resources/assets/botania/blockstates/manastar.json @@ -1,18 +1,5 @@ { - "forge_marker": 1, "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_misc_manastar" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_misc_manastar" - } - }] + "": { "model": "botania:block/manastar" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosis.json b/src/main/resources/assets/botania/blockstates/marimorphosis.json index eb1c94d39..0da530ea8 100644 --- a/src/main/resources/assets/botania/blockstates/marimorphosis.json +++ b/src/main/resources/assets/botania/blockstates/marimorphosis.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_marimorphosis" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_marimorphosis" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/marimorphosis" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosis_chibi.json b/src/main/resources/assets/botania/blockstates/marimorphosis_chibi.json new file mode 100644 index 000000000..4b25eb179 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosis_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/marimorphosis_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosischibi.json b/src/main/resources/assets/botania/blockstates/marimorphosischibi.json deleted file mode 100644 index 318b0fb0b..000000000 --- a/src/main/resources/assets/botania/blockstates/marimorphosischibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_marimorphosis_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_marimorphosis_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/medumone.json b/src/main/resources/assets/botania/blockstates/medumone.json index 8c0fdaea9..58d84e469 100644 --- a/src/main/resources/assets/botania/blockstates/medumone.json +++ b/src/main/resources/assets/botania/blockstates/medumone.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_medumone" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_medumone" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/medumone" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/munchdew.json b/src/main/resources/assets/botania/blockstates/munchdew.json index afe89c719..35da68d99 100644 --- a/src/main/resources/assets/botania/blockstates/munchdew.json +++ b/src/main/resources/assets/botania/blockstates/munchdew.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_munchdew" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_munchdew" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/munchdew" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/narslimmus.json b/src/main/resources/assets/botania/blockstates/narslimmus.json index 353f3f8d1..78cd51fea 100644 --- a/src/main/resources/assets/botania/blockstates/narslimmus.json +++ b/src/main/resources/assets/botania/blockstates/narslimmus.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_narslimmus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_narslimmus" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/narslimmus" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechid.json b/src/main/resources/assets/botania/blockstates/orechid.json index eea0acef2..fe5697776 100644 --- a/src/main/resources/assets/botania/blockstates/orechid.json +++ b/src/main/resources/assets/botania/blockstates/orechid.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_orechid" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_orechid" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/orechid" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechid_ignem.json b/src/main/resources/assets/botania/blockstates/orechid_ignem.json new file mode 100644 index 000000000..8e3943e76 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orechid_ignem.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/orechid_ignem" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechidignem.json b/src/main/resources/assets/botania/blockstates/orechidignem.json deleted file mode 100644 index fc6d3f69b..000000000 --- a/src/main/resources/assets/botania/blockstates/orechidignem.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_orechid_ignem" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_orechid_ignem" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pollidisiac.json b/src/main/resources/assets/botania/blockstates/pollidisiac.json index 431198f0e..7a51770de 100644 --- a/src/main/resources/assets/botania/blockstates/pollidisiac.json +++ b/src/main/resources/assets/botania/blockstates/pollidisiac.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_pollidisiac" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_pollidisiac" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/pollidisiac" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pure_daisy.json b/src/main/resources/assets/botania/blockstates/pure_daisy.json new file mode 100644 index 000000000..02ea6670e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pure_daisy.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/pure_daisy" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/puredaisy.json b/src/main/resources/assets/botania/blockstates/puredaisy.json deleted file mode 100644 index bbda164b0..000000000 --- a/src/main/resources/assets/botania/blockstates/puredaisy.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_misc_pure_daisy" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_misc_pure_daisy" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rafflowsia.json b/src/main/resources/assets/botania/blockstates/rafflowsia.json index 7bb04f467..b2ea6ed78 100644 --- a/src/main/resources/assets/botania/blockstates/rafflowsia.json +++ b/src/main/resources/assets/botania/blockstates/rafflowsia.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_rafflowsia" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_rafflowsia" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/rafflowsia" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpus.json b/src/main/resources/assets/botania/blockstates/rannuncarpus.json index ec7bd7cb3..54348bd12 100644 --- a/src/main/resources/assets/botania/blockstates/rannuncarpus.json +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_rannuncarpus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_rannuncarpus" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/rannuncarpus" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpus_chibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpus_chibi.json new file mode 100644 index 000000000..b38473b76 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/rannuncarpus_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json deleted file mode 100644 index 4976e24b5..000000000 --- a/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_rannuncarpus_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_rannuncarpus_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rosa_arcana.json b/src/main/resources/assets/botania/blockstates/rosa_arcana.json new file mode 100644 index 000000000..4753fb6da --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rosa_arcana.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/rosa_arcana" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shulk_me_not.json b/src/main/resources/assets/botania/blockstates/shulk_me_not.json index 9036eae22..ea6d4611a 100644 --- a/src/main/resources/assets/botania/blockstates/shulk_me_not.json +++ b/src/main/resources/assets/botania/blockstates/shulk_me_not.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_shulk_me_not" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_shulk_me_not" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/shulk_me_not" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnolia.json b/src/main/resources/assets/botania/blockstates/solegnolia.json index 0ad37bdc5..200b740ab 100644 --- a/src/main/resources/assets/botania/blockstates/solegnolia.json +++ b/src/main/resources/assets/botania/blockstates/solegnolia.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_solegnolia" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_solegnolia" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/solegnolia" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnolia_chibi.json b/src/main/resources/assets/botania/blockstates/solegnolia_chibi.json new file mode 100644 index 000000000..72c61840e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnolia_chibi.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/solegnolia_chibi" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnoliachibi.json b/src/main/resources/assets/botania/blockstates/solegnoliachibi.json deleted file mode 100644 index d6eff97df..000000000 --- a/src/main/resources/assets/botania/blockstates/solegnoliachibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_solegnolia_chibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_solegnolia_chibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/specialflower.json b/src/main/resources/assets/botania/blockstates/specialflower.json deleted file mode 100644 index 2de520f82..000000000 --- a/src/main/resources/assets/botania/blockstates/specialflower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:specialFlower", - "transform": "forge:default-item", - "custom": { "base": "botania:specialflower#basemodel" } - }, - "variants": { - "": [{}], - "basemodel": [{ - "model": "minecraft:cross", - "textures": { - "cross": "botania:blocks/flower16" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectranthemum.json b/src/main/resources/assets/botania/blockstates/spectranthemum.json index a32326f18..a2702964c 100644 --- a/src/main/resources/assets/botania/blockstates/spectranthemum.json +++ b/src/main/resources/assets/botania/blockstates/spectranthemum.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_spectranthemum" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_spectranthemum" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/spectranthemum" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectrolus.json b/src/main/resources/assets/botania/blockstates/spectrolus.json index 8e3dafa4f..fe39f2eca 100644 --- a/src/main/resources/assets/botania/blockstates/spectrolus.json +++ b/src/main/resources/assets/botania/blockstates/spectrolus.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_spectrolus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_spectrolus" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/spectrolus" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tangleberrie.json b/src/main/resources/assets/botania/blockstates/tangleberrie.json index 3745aa3c1..69a3818dc 100644 --- a/src/main/resources/assets/botania/blockstates/tangleberrie.json +++ b/src/main/resources/assets/botania/blockstates/tangleberrie.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_tangleberrie" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_tangleberrie" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/tangleberrie" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thermalily.json b/src/main/resources/assets/botania/blockstates/thermalily.json index b3f6f22f6..cca11f0b3 100644 --- a/src/main/resources/assets/botania/blockstates/thermalily.json +++ b/src/main/resources/assets/botania/blockstates/thermalily.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_gen_thermalily" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_gen_thermalily" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/thermalily" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tigerseye.json b/src/main/resources/assets/botania/blockstates/tigerseye.json index 1d7fb261a..e027fa8b8 100644 --- a/src/main/resources/assets/botania/blockstates/tigerseye.json +++ b/src/main/resources/assets/botania/blockstates/tigerseye.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_tigerseye" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_tigerseye" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/tigerseye" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/vinculotus.json b/src/main/resources/assets/botania/blockstates/vinculotus.json index 603a9e319..c12e7539d 100644 --- a/src/main/resources/assets/botania/blockstates/vinculotus.json +++ b/src/main/resources/assets/botania/blockstates/vinculotus.json @@ -1,18 +1,5 @@ -{ - "forge_marker": 1, - "variants": { - "": [{ - "model": "botania:block/shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/flower_func_vinculotus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/flower_func_vinculotus" - } - }] - } +{ + "variants": { + "": { "model": "botania:block/vinculotus" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index a15ddef4e..98f2b8120 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -180,66 +180,64 @@ "block.botania:platform": "Schimmerplattform", "block.botania:alfheimPortal": "Weltenbaumextrakt", - "block.botania:flower.": "Botania-Blume", + "block.botania.pure_daisy": "Reines Gänseblümchen", + "block.botania.pure_daisy.reference": "Welche Farbe möchtest du haben?", + "block.botania.manastar": "Manastern", + "block.botania.manastar.reference": "Wünsch dir was", - "block.botania:flower.puredaisy": "Reines Gänseblümchen", - "block.botania:flower.puredaisy.reference": "Welche Farbe möchtest du haben?", - "block.botania:flower.manastar": "Manastern", - "block.botania:flower.manastar.reference": "Wünsch dir was", + "block.botania.daybloom": "Tagesblüte", + "block.botania.daybloom.reference": "Stechendes Licht", + "block.botania.endoflame": "Endoflamme", + "block.botania.endoflame.reference": "Eine endotherme Reaktion", + "block.botania.hydroangeas": "Hydroangea", + "block.botania.hydroangeas.reference": "Vorsicht: Nass", + "block.botania.thermalily": "Thermalilie", + "block.botania.thermalily.reference": "Scharlachrot", + "block.botania.nightshade": "Nachtschatten", + "block.botania.nightshade.reference": "Geisterhaft", + "block.botania.rosa_arcana": "Rosa Arcana", + "block.botania.rosa_arcana.reference": "Erfahrung ist wichtig", + "block.botania.munchdew": "Mampftau", + "block.botania.munchdew.reference": "Mhm. Lecker.", + "block.botania.entropinnyum": "Entropinnyum", + "block.botania.entropinnyum.reference": "ZERSTÖRUNG!...Doch nicht", + "block.botania.kekimurus": "Kekimurus", + "block.botania.kekimurus.reference": "Zu finden in jeder Konditorei", - "block.botania:flower.daybloom": "Tagesblüte", - "block.botania:flower.daybloom.reference": "Stechendes Licht", - "block.botania:flower.endoflame": "Endoflamme", - "block.botania:flower.endoflame.reference": "Eine endotherme Reaktion", - "block.botania:flower.hydroangeas": "Hydroangea", - "block.botania:flower.hydroangeas.reference": "Vorsicht: Nass", - "block.botania:flower.thermalily": "Thermalilie", - "block.botania:flower.thermalily.reference": "Scharlachrot", - "block.botania:flower.nightshade": "Nachtschatten", - "block.botania:flower.nightshade.reference": "Geisterhaft", - "block.botania:flower.arcanerose": "Rosa Arcana", - "block.botania:flower.arcanerose.reference": "Erfahrung ist wichtig", - "block.botania:flower.munchdew": "Mampftau", - "block.botania:flower.munchdew.reference": "Mhm. Lecker.", - "block.botania:flower.entropinnyum": "Entropinnyum", - "block.botania:flower.entropinnyum.reference": "ZERSTÖRUNG!...Doch nicht", - "block.botania:flower.kekimurus": "Kekimurus", - "block.botania:flower.kekimurus.reference": "Zu finden in jeder Konditorei", - - "block.botania:flower.bellethorn": "Belldorn", - "block.botania:flower.bellethorn.reference": "Schneide dich nicht", - "block.botania:flower.dreadthorn": "Schreckdorn", - "block.botania:flower.dreadthorn.reference": "Plan C", - "block.botania:flower.heiseiDream": "Kehrnelke", - "block.botania:flower.heiseiDream.reference": "Ich hasse dich", - "block.botania:flower.tigerseye": "Tigerauge", - "block.botania:flower.tigerseye.reference": "Fürchte dich!", - "block.botania:flower.jadedAmaranthus": "Jaded-Amarant", - "block.botania:flower.jadedAmaranthus.reference": "Blumen! Überall Blumen!", - "block.botania:flower.orechid": "Erzblüte", - "block.botania:flower.orechid.reference": "Bergbau ist langweilig", - "block.botania:flower.fallenKanade": "Engelsblüte", - "block.botania:flower.fallenKanade.reference": "Himmlisch", - "block.botania:flower.exoflame": "Exoflamme", - "block.botania:flower.exoflame.reference": "Eine exotherme Reaktion", - "block.botania:flower.agricarnation": "Agraryophylle", - "block.botania:flower.agricarnation.reference": "Jetzt wird geackert", - "block.botania:flower.hopperhock": "Trichterkraut", - "block.botania:flower.hopperhock.reference": "Es wurde mir eingetrichtert", - "block.botania:flower.tangleberrie": "Wirrbeere", - "block.botania:flower.tangleberrie.reference": "Hübsches Gefängnis", - "block.botania:flower.jiyuulia": "Bannbeere", - "block.botania:flower.jiyuulia.reference": "Kraftfeldartig", - "block.botania:flower.rannuncarpus": "Rannawurzel", - "block.botania:flower.rannuncarpus.reference": "Wie praktisch.", - "block.botania:flower.hyacidus": "Cyazinthe", - "block.botania:flower.hyacidus.reference": "Nur nicht bewegen", - "block.botania:flower.pollidisiac": "Pollidisie", - "block.botania:flower.pollidisiac.reference": "Immer nur das Eine", - "block.botania:flower.clayconia": "Helehmie", - "block.botania:flower.clayconia.reference": "Welch eine Wonne", - "block.botania:flower.loonium": "Beutner", - "block.botania:flower.loonium.reference": "Ich bin reich!", + "block.botania.bellethorn": "Belldorn", + "block.botania.bellethorn.reference": "Schneide dich nicht", + "block.botania.dreadthorn": "Schreckdorn", + "block.botania.dreadthorn.reference": "Plan C", + "block.botania.heisei_dream": "Kehrnelke", + "block.botania.heisei_dream.reference": "Ich hasse dich", + "block.botania.tigerseye": "Tigerauge", + "block.botania.tigerseye.reference": "Fürchte dich!", + "block.botania.jaded_amaranthus": "Jaded-Amarant", + "block.botania.jaded_amaranthus.reference": "Blumen! Überall Blumen!", + "block.botania.orechid": "Erzblüte", + "block.botania.orechid.reference": "Bergbau ist langweilig", + "block.botania.fallen_kanade": "Engelsblüte", + "block.botania.fallen_kanade.reference": "Himmlisch", + "block.botania.exoflame": "Exoflamme", + "block.botania.exoflame.reference": "Eine exotherme Reaktion", + "block.botania.agricarnation": "Agraryophylle", + "block.botania.agricarnation.reference": "Jetzt wird geackert", + "block.botania.hopperhock": "Trichterkraut", + "block.botania.hopperhock.reference": "Es wurde mir eingetrichtert", + "block.botania.tangleberrie": "Wirrbeere", + "block.botania.tangleberrie.reference": "Hübsches Gefängnis", + "block.botania.jiyuulia": "Bannbeere", + "block.botania.jiyuulia.reference": "Kraftfeldartig", + "block.botania.rannuncarpus": "Rannawurzel", + "block.botania.rannuncarpus.reference": "Wie praktisch.", + "block.botania.hyacidus": "Cyazinthe", + "block.botania.hyacidus.reference": "Nur nicht bewegen", + "block.botania.pollidisiac": "Pollidisie", + "block.botania.pollidisiac.reference": "Immer nur das Eine", + "block.botania.clayconia": "Helehmie", + "block.botania.clayconia.reference": "Welch eine Wonne", + "block.botania.loonium": "Beutner", + "block.botania.loonium.reference": "Ich bin reich!", "item.botania:lexicon": "Lexica Botania", "item.botania:petal_white": "Mystisches Weißes Blütenblatt", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index b614a5aae..e358c1e94 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -296,7 +296,6 @@ "botania.knowledge.alfheim": "\u00a7aElven\u00a77 Knowledge", "botania.knowledge.relic": "\u00a75Relic\u00a77 Knowledge", - "botania.flowerType.passiveGenerating": "Passive Generating Flower", "botania.flowerType.generating": "Generating Flower", "botania.flowerType.functional": "Functional Flower", "botania.flowerType.misc": "Miscellaneous Flower", @@ -1110,109 +1109,106 @@ "block.botania.mutated_grass": "Mutated Grass", "block.botania.animatedTorch": "Animated Torch", - "block.flower.botania.dummy": "Botania Flower", - "block.flower.botania.dummy.reference": "If you have this, it means something went wrong, you should report it", + "block.botania.pure_daisy": "Pure Daisy", + "block.botania.pure_daisy.reference": "What color do you want to be?", + "block.botania.manastar": "Manastar", + "block.botania.manastar.reference": "Wish upon a star", - "block.flower.botania.puredaisy": "Pure Daisy", - "block.flower.botania.puredaisy.reference": "What color do you want to be?", - "block.flower.botania.manastar": "Manastar", - "block.flower.botania.manastar.reference": "Wish upon a star", + "block.botania.endoflame": "Endoflame", + "block.botania.endoflame.reference": "Endothermically reactive", + "block.botania.hydroangeas": "Hydroangeas", + "block.botania.hydroangeas.reference": "Just friendly crustaceans", + "block.botania.thermalily": "Thermalily", + "block.botania.thermalily.reference": "Not advised for blood mages", + "block.botania.rosa_arcana": "Rosa Arcana", + "block.botania.rosa_arcana.reference": "Ten blue orbs in the corner", + "block.botania.munchdew": "Munchdew", + "block.botania.munchdew.reference": "Does this count as cannibalism?", + "block.botania.entropinnyum": "Entropinnyum", + "block.botania.entropinnyum.reference": "Handle with care", + "block.botania.kekimurus": "Kekimurus", + "block.botania.kekimurus.reference": "This flower is a lie", + "block.botania.gourmaryllis": "Gourmaryllis", + "block.botania.gourmaryllis.reference": "How unpleasant", + "block.botania.narslimmus": "Narslimmus", + "block.botania.narslimmus.reference": "What's this? It's all sticky", + "block.botania.spectrolus": "Spectrolus", + "block.botania.spectrolus.reference": "Profiting off Hate", + "block.botania.dandelifeon": "Dandelifeon", + "block.botania.dandelifeon.reference": "C'est la vie", + "block.botania.rafflowsia": "Rafflowsia", + "block.botania.rafflowsia.reference": "Trap Hole Nightmare", + "block.botania.shulk_me_not": "Shulk Me Not", + "block.botania.shulk_me_not.reference": "Really feeling it", - "block.flower.botania.endoflame": "Endoflame", - "block.flower.botania.endoflame.reference": "Endothermically reactive", - "block.flower.botania.hydroangeas": "Hydroangeas", - "block.flower.botania.hydroangeas.reference": "Just friendly crustaceans", - "block.flower.botania.thermalily": "Thermalily", - "block.flower.botania.thermalily.reference": "Not advised for blood mages", - "block.flower.botania.arcanerose": "Rosa Arcana", - "block.flower.botania.arcanerose.reference": "Ten blue orbs in the corner", - "block.flower.botania.munchdew": "Munchdew", - "block.flower.botania.munchdew.reference": "Does this count as cannibalism?", - "block.flower.botania.entropinnyum": "Entropinnyum", - "block.flower.botania.entropinnyum.reference": "Handle with care", - "block.flower.botania.kekimurus": "Kekimurus", - "block.flower.botania.kekimurus.reference": "This flower is a lie", - "block.flower.botania.gourmaryllis": "Gourmaryllis", - "block.flower.botania.gourmaryllis.reference": "How unpleasant", - "block.flower.botania.narslimmus": "Narslimmus", - "block.flower.botania.narslimmus.reference": "What's this? It's all sticky", - "block.flower.botania.spectrolus": "Spectrolus", - "block.flower.botania.spectrolus.reference": "Profiting off Hate", - "block.flower.botania.dandelifeon": "Dandelifeon", - "block.flower.botania.dandelifeon.reference": "C'est la vie", - "block.flower.botania.rafflowsia": "Rafflowsia", - "block.flower.botania.rafflowsia.reference": "Trap Hole Nightmare", - "block.flower.botania.shulk_me_not": "Shulk Me Not", - "block.flower.botania.shulk_me_not.reference": "Really feeling it", - - "block.flower.botania.bellethorn": "Bellethorne", - "block.flower.botania.bellethorn.reference": "Kiss from a rose", - "block.flower.botania.bellethornChibi": "Bellethorne Petite", - "block.flower.botania.bellethornChibi.reference": "Kiss from a rose", - "block.flower.botania.dreadthorn": "Dreadthorne", - "block.flower.botania.dreadthorn.reference": "Just a prick", - "block.flower.botania.heiseiDream": "Heisei Dream", - "block.flower.botania.heiseiDream.reference": "Heisei heisei", - "block.flower.botania.tigerseye": "Tigerseye", - "block.flower.botania.tigerseye.reference": "The palmtop tiger", - "block.flower.botania.jadedAmaranthus": "Jaded Amaranthus", - "block.flower.botania.jadedAmaranthus.reference": "A couple died for this", - "block.flower.botania.orechid": "Orechid", - "block.flower.botania.orechid.reference": "I seed what you did there", - "block.flower.botania.orechidIgnem": "Orechid Ignem", - "block.flower.botania.orechidIgnem.reference": "Red like roses", - "block.flower.botania.fallenKanade": "Fallen Kanade", - "block.flower.botania.fallenKanade.reference": "I'm not an Angel", - "block.flower.botania.exoflame": "Exoflame", - "block.flower.botania.exoflame.reference": "Exothermically reactive", - "block.flower.botania.agricarnation": "Agricarnation", - "block.flower.botania.agricarnation.reference": "Wear on the 25th of april", - "block.flower.botania.agricarnationChibi": "Agricarnation Petite", - "block.flower.botania.agricarnationChibi.reference": "Wear on the 25th of april", - "block.flower.botania.hopperhock": "Hopperhock", - "block.flower.botania.hopperhock.reference": "It all funnels into it", - "block.flower.botania.hopperhockChibi": "Hopperhock Petite", - "block.flower.botania.hopperhockChibi.reference": "It all funnels into it", - "block.flower.botania.tangleberrie": "Tangleberrie", - "block.flower.botania.tangleberrie.reference": "No frying pans allowed", - "block.flower.botania.jiyuulia": "Jiyuulia", - "block.flower.botania.jiyuulia.reference": "Flügel der Freiheit", - "block.flower.botania.rannuncarpus": "Rannuncarpus", - "block.flower.botania.rannuncarpus.reference": "That's handy", - "block.flower.botania.rannuncarpusChibi": "Rannuncarpus Petite", - "block.flower.botania.rannuncarpusChibi.reference": "That's handy", - "block.flower.botania.hyacidus": "Hyacidus", - "block.flower.botania.hyacidus.reference": "If you don't walk, it doesn't hurt", - "block.flower.botania.pollidisiac": "Pollidisiac", - "block.flower.botania.pollidisiac.reference": "Birds and bees", - "block.flower.botania.clayconia": "Clayconia", - "block.flower.botania.clayconia.reference": "Rupees not included", - "block.flower.botania.clayconiaChibi": "Clayconia Petite", - "block.flower.botania.clayconiaChibi.reference": "Rupees not included", - "block.flower.botania.loonium": "Loonium", - "block.flower.botania.loonium.reference": "Hold it up above your head", - "block.flower.botania.daffomill": "Daffomill", - "block.flower.botania.daffomill.reference": "Cook's Assistant", - "block.flower.botania.vinculotus": "Vinculotus", - "block.flower.botania.vinculotus.reference": "Totally an Extra Utils ripoff", - "block.flower.botania.spectranthemum": "Spectranthemum", - "block.flower.botania.spectranthemum.reference": "In the shell", - "block.flower.botania.medumone": "Medumone", - "block.flower.botania.medumone.reference": "Solid as a rock", - "block.flower.botania.marimorphosis": "Marimorphosis", - "block.flower.botania.marimorphosis.reference": "U-M-R", - "block.flower.botania.marimorphosisChibi": "Marimorphosis Petite", - "block.flower.botania.marimorphosisChibi.reference": "U-M-R", - "block.flower.botania.bubbell": "Bubbell", - "block.flower.botania.bubbell.reference": "And whistle", - "block.flower.botania.bubbellChibi": "Bubbell Petite", - "block.flower.botania.bubbellChibi.reference": "And whistle", - "block.flower.botania.solegnolia": "Solegnolia", - "block.flower.botania.solegnolia.reference": "All your magnets are belong to us", - "block.flower.botania.solegnoliaChibi": "Solegnolia Petite", - "block.flower.botania.solegnoliaChibi.reference": "All your magnets are belong to us", - "block.flower.botania.bergamute": "Bergamute", - "block.flower.botania.bergamute.reference": "My lips are sealed", + "block.botania.bellethorn": "Bellethorne", + "block.botania.bellethorn.reference": "Kiss from a rose", + "block.botania.bellethorn_chibi": "Bellethorne Petite", + "block.botania.bellethorn_chibi.reference": "Kiss from a rose", + "block.botania.dreadthorn": "Dreadthorne", + "block.botania.dreadthorn.reference": "Just a prick", + "block.botania.heisei_dream": "Heisei Dream", + "block.botania.heisei_dream.reference": "Heisei heisei", + "block.botania.tigerseye": "Tigerseye", + "block.botania.tigerseye.reference": "The palmtop tiger", + "block.botania.jaded_amaranthus": "Jaded Amaranthus", + "block.botania.jaded_amaranthus.reference": "A couple died for this", + "block.botania.orechid": "Orechid", + "block.botania.orechid.reference": "I seed what you did there", + "block.botania.orechid_ignem": "Orechid Ignem", + "block.botania.orechid_ignem.reference": "Red like roses", + "block.botania.fallen_kanade": "Fallen Kanade", + "block.botania.fallen_kanade.reference": "I'm not an Angel", + "block.botania.exoflame": "Exoflame", + "block.botania.exoflame.reference": "Exothermically reactive", + "block.botania.agricarnation": "Agricarnation", + "block.botania.agricarnation.reference": "Wear on the 25th of april", + "block.botania.agricarnation_chibi": "Agricarnation Petite", + "block.botania.agricarnation_chibi.reference": "Wear on the 25th of april", + "block.botania.hopperhock": "Hopperhock", + "block.botania.hopperhock.reference": "It all funnels into it", + "block.botania.hopperhock_chibi": "Hopperhock Petite", + "block.botania.hopperhock_chibi.reference": "It all funnels into it", + "block.botania.tangleberrie": "Tangleberrie", + "block.botania.tangleberrie.reference": "No frying pans allowed", + "block.botania.jiyuulia": "Jiyuulia", + "block.botania.jiyuulia.reference": "Flügel der Freiheit", + "block.botania.rannuncarpus": "Rannuncarpus", + "block.botania.rannuncarpus.reference": "That's handy", + "block.botania.rannuncarpus_chibi": "Rannuncarpus Petite", + "block.botania.rannuncarpus_chibi.reference": "That's handy", + "block.botania.hyacidus": "Hyacidus", + "block.botania.hyacidus.reference": "If you don't walk, it doesn't hurt", + "block.botania.pollidisiac": "Pollidisiac", + "block.botania.pollidisiac.reference": "Birds and bees", + "block.botania.clayconia": "Clayconia", + "block.botania.clayconia.reference": "Rupees not included", + "block.botania.clayconia_chibi": "Clayconia Petite", + "block.botania.clayconia_chibi.reference": "Rupees not included", + "block.botania.loonium": "Loonium", + "block.botania.loonium.reference": "Hold it up above your head", + "block.botania.daffomill": "Daffomill", + "block.botania.daffomill.reference": "Cook's Assistant", + "block.botania.vinculotus": "Vinculotus", + "block.botania.vinculotus.reference": "Totally an Extra Utils ripoff", + "block.botania.spectranthemum": "Spectranthemum", + "block.botania.spectranthemum.reference": "In the shell", + "block.botania.medumone": "Medumone", + "block.botania.medumone.reference": "Solid as a rock", + "block.botania.marimorphosis": "Marimorphosis", + "block.botania.marimorphosis.reference": "U-M-R", + "block.botania.marimorphosis_chibi": "Marimorphosis Petite", + "block.botania.marimorphosis_chibi.reference": "U-M-R", + "block.botania.bubbell": "Bubbell", + "block.botania.bubbell.reference": "And whistle", + "block.botania.bubbell_chibi": "Bubbell Petite", + "block.botania.bubbell_chibi.reference": "And whistle", + "block.botania.solegnolia": "Solegnolia", + "block.botania.solegnolia.reference": "All your magnets are belong to us", + "block.botania.solegnolia_chibi": "Solegnolia Petite", + "block.botania.solegnolia_chibi.reference": "All your magnets are belong to us", + "block.botania.bergamute": "Bergamute", + "block.botania.bergamute.reference": "My lips are sealed", "item.botania:lexicon": "Lexica Botania", "item.botania:lexicon.bevo": "Lexica Botana", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index 2d6dde25e..87b5b94a9 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -899,101 +899,98 @@ "block.botania:buriedPetals14": "Pétalo rojo enterrado", "block.botania:buriedPetals15": "Pétalo negro enterrado", - "block.botania:flower.": "Flor de Botania", - "block.botania:flower..reference": "Si ves esto significa que algo va mal, deberías informar de ello.", + "block.botania.pure_daisy": "Margarita pura", + "block.botania.pure_daisy.reference": "¿Qué color quieres ser?", + "block.botania.manastar": "Manastrella", + "block.botania.manastar.reference": "Pide un deseo", - "block.botania:flower.puredaisy": "Margarita pura", - "block.botania:flower.puredaisy.reference": "¿Qué color quieres ser?", - "block.botania:flower.manastar": "Manastrella", - "block.botania:flower.manastar.reference": "Pide un deseo", + "block.botania.daybloom": "Flordía", + "block.botania.daybloom.reference": "Un hilo de luz", + "block.botania.endoflame": "Endollama", + "block.botania.endoflame.reference": "Lag chorreante", + "block.botania.hydroangeas": "Hidrortensia", + "block.botania.hydroangeas.reference": "Crustáceos amigables", + "block.botania.thermalily": "Termolila", + "block.botania.thermalily.reference": "De hecho, una Rosa escarlata", + "block.botania.nightshade": "Nochedona", + "block.botania.nightshade.reference": "Firma horrible", + "block.botania.rosa_arcana": "Rosa arcana", + "block.botania.rosa_arcana.reference": "Diez orbes azules en la esquina", + "block.botania.munchdew": "Tragarrocio", + "block.botania.munchdew.reference": "Ñam, ñam, el profesor de arte", + "block.botania.entropinnyum": "Entropinio", + "block.botania.entropinnyum.reference": "Las mahō shōjo son una opción", + "block.botania.kekimurus": "Kekimuro", + "block.botania.kekimurus.reference": "Esta flor es una mentira", + "block.botania.gourmaryllis": "Gurmerilia", + "block.botania.gourmaryllis.reference": "Fuyukai Desu", + "block.botania.narslimmus": "Narslimo", + "block.botania.narslimmus.reference": "¿Qué es esto? Se pega a todo", + "block.botania.spectrolus": "Espectrolo", + "block.botania.spectrolus.reference": "Beneficiandose del Odio", - "block.botania:flower.daybloom": "Flordía", - "block.botania:flower.daybloom.reference": "Un hilo de luz", - "block.botania:flower.endoflame": "Endollama", - "block.botania:flower.endoflame.reference": "Lag chorreante", - "block.botania:flower.hydroangeas": "Hidrortensia", - "block.botania:flower.hydroangeas.reference": "Crustáceos amigables", - "block.botania:flower.thermalily": "Termolila", - "block.botania:flower.thermalily.reference": "De hecho, una Rosa escarlata", - "block.botania:flower.nightshade": "Nochedona", - "block.botania:flower.nightshade.reference": "Firma horrible", - "block.botania:flower.arcanerose": "Rosa arcana", - "block.botania:flower.arcanerose.reference": "Diez orbes azules en la esquina", - "block.botania:flower.munchdew": "Tragarrocio", - "block.botania:flower.munchdew.reference": "Ñam, ñam, el profesor de arte", - "block.botania:flower.entropinnyum": "Entropinio", - "block.botania:flower.entropinnyum.reference": "Las mahō shōjo son una opción", - "block.botania:flower.kekimurus": "Kekimuro", - "block.botania:flower.kekimurus.reference": "Esta flor es una mentira", - "block.botania:flower.gourmaryllis": "Gurmerilia", - "block.botania:flower.gourmaryllis.reference": "Fuyukai Desu", - "block.botania:flower.narslimmus": "Narslimo", - "block.botania:flower.narslimmus.reference": "¿Qué es esto? Se pega a todo", - "block.botania:flower.spectrolus": "Espectrolo", - "block.botania:flower.spectrolus.reference": "Beneficiandose del Odio", - - "block.botania:flower.bellethorn": "Bellapúa", - "block.botania:flower.bellethorn.reference": "\"world's end, girl's rondo\"", - "block.botania:flower.bellethornChibi": "Bellapúita", - "block.botania:flower.bellethornChibi.reference": "\"world's end, girl's rondo\"", - "block.botania:flower.dreadthorn": "Temepúa", - "block.botania:flower.dreadthorn.reference": "Plan C", - "block.botania:flower.heiseiDream": "Sueño de Heisei", - "block.botania:flower.heiseiDream.reference": "Heisei heisei kowarete", - "block.botania:flower.tigerseye": "Tigróculo", - "block.botania:flower.tigerseye.reference": "El tigre compacto", - "block.botania:flower.jadedAmaranthus": "Amaranto harto", - "block.botania:flower.jadedAmaranthus.reference": "Una pareja murió por él", - "block.botania:flower.orechid": "Menarquídea", - "block.botania:flower.orechid.reference": "Siembro lo que hiciste.", - "block.botania:flower.orechidIgnem": "Menarquídea ígnea", - "block.botania:flower.orechidIgnem.reference": "Roja como las rosas", - "block.botania:flower.fallenKanade": "Kanade caída", - "block.botania:flower.fallenKanade.reference": "No soy un ángel", - "block.botania:flower.exoflame": "Exollama", - "block.botania:flower.exoflame.reference": "Llevando sus lazos negros", - "block.botania:flower.agricarnation": "Agricarnación", - "block.botania:flower.agricarnation.reference": "Llevar puesta el 25 de abril", - "block.botania:flower.agricarnationChibi": "Agricarnacioncita", - "block.botania:flower.agricarnationChibi.reference": "Llevar puesta el 25 de abril", - "block.botania:flower.hopperhock": "Tolvalcea", - "block.botania:flower.hopperhock.reference": "Canaliza todo adentro", - "block.botania:flower.hopperhockChibi": "Tolvalceita", - "block.botania:flower.hopperhockChibi.reference": "Canaliza todo adentro", - "block.botania:flower.tangleberrie": "Enredabaya", - "block.botania:flower.tangleberrie.reference": "No se permiten sartenes", - "block.botania:flower.jiyuulia": "Jiyuulia", - "block.botania:flower.jiyuulia.reference": "Flügel der Freiheit", - "block.botania:flower.rannuncarpus": "Ranuncarpo", - "block.botania:flower.rannuncarpus.reference": "Es útil", - "block.botania:flower.rannuncarpusChibi": "Ranuncarpito", - "block.botania:flower.rannuncarpusChibi.reference": "Es útil", - "block.botania:flower.hyacidus": "Hiácido", - "block.botania:flower.hyacidus.reference": "Si puedes caminar, será que no duele", - "block.botania:flower.pollidisiac": "Polidisíaco", - "block.botania:flower.pollidisiac.reference": "Pájaros y abejas", - "block.botania:flower.clayconia": "Arciconia", - "block.botania:flower.clayconia.reference": "Rupias no incluidas", - "block.botania:flower.loonium": "Botinia", - "block.botania:flower.loonium.reference": "Sostenla sobre tu cabeza", - "block.botania:flower.daffomill": "Polinillo", - "block.botania:flower.daffomill.reference": "Asintente de cocinero", - "block.botania:flower.vinculotus": "Vinculoto", - "block.botania:flower.vinculotus.reference": "Un timo del Extra Utilities", - "block.botania:flower.spectranthemum": "Espectrantemo", - "block.botania:flower.spectranthemum.reference": "En la concha", - "block.botania:flower.medumone": "Medumona", - "block.botania:flower.medumone.reference": "Desde un principio fue Hades", - "block.botania:flower.marimorphosis": "Marimorfosis", - "block.botania:flower.marimorphosis.reference": "Sólida como una roca", - "block.botania:flower.marimorphosisChibi": "Marimorfosita", - "block.botania:flower.marimorphosisChibi.reference": "Sólida como una roca", - "block.botania:flower.bubbell": "Burbumpana", - "block.botania:flower.bubbell.reference": "Y silva", - "block.botania:flower.bubbellChibi": "Burbumpanita", - "block.botania:flower.bubbellChibi.reference": "Y silva", - "block.botania:flower.solegnolia": "Solegnolia", - "block.botania:flower.solegnolia.reference": "Todos tus imanes nos pertenecen", + "block.botania.bellethorn": "Bellapúa", + "block.botania.bellethorn.reference": "\"world's end, girl's rondo\"", + "block.botania.bellethorn_chibi": "Bellapúita", + "block.botania.bellethorn_chibi.reference": "\"world's end, girl's rondo\"", + "block.botania.dreadthorn": "Temepúa", + "block.botania.dreadthorn.reference": "Plan C", + "block.botania.heisei_dream": "Sueño de Heisei", + "block.botania.heisei_dream.reference": "Heisei heisei kowarete", + "block.botania.tigerseye": "Tigróculo", + "block.botania.tigerseye.reference": "El tigre compacto", + "block.botania.jaded_amaranthus": "Amaranto harto", + "block.botania.jaded_amaranthus.reference": "Una pareja murió por él", + "block.botania.orechid": "Menarquídea", + "block.botania.orechid.reference": "Siembro lo que hiciste.", + "block.botania.orechid_ignem": "Menarquídea ígnea", + "block.botania.orechid_ignem.reference": "Roja como las rosas", + "block.botania.fallen_kanade": "Kanade caída", + "block.botania.fallen_kanade.reference": "No soy un ángel", + "block.botania.exoflame": "Exollama", + "block.botania.exoflame.reference": "Llevando sus lazos negros", + "block.botania.agricarnation": "Agricarnación", + "block.botania.agricarnation.reference": "Llevar puesta el 25 de abril", + "block.botania.agricarnation_chibi": "Agricarnacioncita", + "block.botania.agricarnation_chibi.reference": "Llevar puesta el 25 de abril", + "block.botania.hopperhock": "Tolvalcea", + "block.botania.hopperhock.reference": "Canaliza todo adentro", + "block.botania.hopperhock_chibi": "Tolvalceita", + "block.botania.hopperhock_chibi.reference": "Canaliza todo adentro", + "block.botania.tangleberrie": "Enredabaya", + "block.botania.tangleberrie.reference": "No se permiten sartenes", + "block.botania.jiyuulia": "Jiyuulia", + "block.botania.jiyuulia.reference": "Flügel der Freiheit", + "block.botania.rannuncarpus": "Ranuncarpo", + "block.botania.rannuncarpus.reference": "Es útil", + "block.botania.rannuncarpus_chibi": "Ranuncarpito", + "block.botania.rannuncarpus_chibi.reference": "Es útil", + "block.botania.hyacidus": "Hiácido", + "block.botania.hyacidus.reference": "Si puedes caminar, será que no duele", + "block.botania.pollidisiac": "Polidisíaco", + "block.botania.pollidisiac.reference": "Pájaros y abejas", + "block.botania.clayconia": "Arciconia", + "block.botania.clayconia.reference": "Rupias no incluidas", + "block.botania.loonium": "Botinia", + "block.botania.loonium.reference": "Sostenla sobre tu cabeza", + "block.botania.daffomill": "Polinillo", + "block.botania.daffomill.reference": "Asintente de cocinero", + "block.botania.vinculotus": "Vinculoto", + "block.botania.vinculotus.reference": "Un timo del Extra Utilities", + "block.botania.spectranthemum": "Espectrantemo", + "block.botania.spectranthemum.reference": "En la concha", + "block.botania.medumone": "Medumona", + "block.botania.medumone.reference": "Desde un principio fue Hades", + "block.botania.marimorphosis": "Marimorfosis", + "block.botania.marimorphosis.reference": "Sólida como una roca", + "block.botania.marimorphosis_chibi": "Marimorfosita", + "block.botania.marimorphosis_chibi.reference": "Sólida como una roca", + "block.botania.bubbell": "Burbumpana", + "block.botania.bubbell.reference": "Y silva", + "block.botania.bubbell_chibi": "Burbumpanita", + "block.botania.bubbell_chibi.reference": "Y silva", + "block.botania.solegnolia": "Solegnolia", + "block.botania.solegnolia.reference": "Todos tus imanes nos pertenecen", "item.botania:lexicon": "Lexica Botania", "item.botania:lexicon.bevo": "Lexica Botana", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index e1f20b406..ca1a2be2b 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -826,38 +826,35 @@ "block.botania:buriedPetals14": "Pétale rouge enterrée", "block.botania:buriedPetals15": "Pétale noire enterrée", - "block.botania:flower.": "Fleur Botania", - "block.botania:flower..reference": "Si vous voyez ceci, celà signifie que quelque chose s'est passé mal, vous devriez me le rapporter", + "block.botania.pure_daisy": "Pâquerette pure", + "block.botania.pure_daisy.reference": "De quelle couleur voulez-vous être ?", + "block.botania.manastar": "Étoile de mana", + "block.botania.manastar.reference": "Souhaitez sur une étoile", - "block.botania:flower.puredaisy": "Pâquerette pure", - "block.botania:flower.puredaisy.reference": "De quelle couleur voulez-vous être ?", - "block.botania:flower.manastar": "Étoile de mana", - "block.botania:flower.manastar.reference": "Souhaitez sur une étoile", - - "block.botania:flower.daybloom": "Fleur de jour", - "block.botania:flower.daybloom.reference": "Une piqure de lumière", - "block.botania:flower.endoflame": "Endoflamme", - "block.botania:flower.endoflame.reference": "Squirting Lag", - "block.botania:flower.hydroangeas": "Hydroangeas", - "block.botania:flower.hydroangeas.reference": "Simplement amis des crustacés", - "block.botania:flower.thermalily": "Therma-lis", - "block.botania:flower.thermalily.reference": "Un rose écarlate en effet", - "block.botania:flower.nightshade": "Ombrenuit", - "block.botania:flower.nightshade.reference": "Signature horrible", - "block.botania:flower.arcanerose": "Rosa Arcana", - "block.botania:flower.arcanerose.reference": "Ten blue orbs in the corner", - "block.botania:flower.munchdew": "Munchdew", - "block.botania:flower.munchdew.reference": "Nommy nommy the art teacher", - "block.botania:flower.entropinnyum": "Entropinnyum", - "block.botania:flower.entropinnyum.reference": "Les filles magiques sont en option", - "block.botania:flower.kekimurus": "Kekimurus", - "block.botania:flower.kekimurus.reference": "Cette fleur est un mensonge", - "block.botania:flower.gourmaryllis": "Gourmaryllis", - "block.botania:flower.gourmaryllis.reference": "Fuyukai Desu", - "block.botania:flower.narslimmus": "Narslimmus", - "block.botania:flower.narslimmus.reference": "Qu'es-ce-que c'est ? C'est tout collant", - "block.botania:flower.spectrolus": "Spectrolus", - "block.botania:flower.spectrolus.reference": "Profiter de la haine", + "block.botania.daybloom": "Fleur de jour", + "block.botania.daybloom.reference": "Une piqure de lumière", + "block.botania.endoflame": "Endoflamme", + "block.botania.endoflame.reference": "Squirting Lag", + "block.botania.hydroangeas": "Hydroangeas", + "block.botania.hydroangeas.reference": "Simplement amis des crustacés", + "block.botania.thermalily": "Therma-lis", + "block.botania.thermalily.reference": "Un rose écarlate en effet", + "block.botania.nightshade": "Ombrenuit", + "block.botania.nightshade.reference": "Signature horrible", + "block.botania.rosa_arcana": "Rosa Arcana", + "block.botania.rosa_arcana.reference": "Ten blue orbs in the corner", + "block.botania.munchdew": "Munchdew", + "block.botania.munchdew.reference": "Nommy nommy the art teacher", + "block.botania.entropinnyum": "Entropinnyum", + "block.botania.entropinnyum.reference": "Les filles magiques sont en option", + "block.botania.kekimurus": "Kekimurus", + "block.botania.kekimurus.reference": "Cette fleur est un mensonge", + "block.botania.gourmaryllis": "Gourmaryllis", + "block.botania.gourmaryllis.reference": "Fuyukai Desu", + "block.botania.narslimmus": "Narslimmus", + "block.botania.narslimmus.reference": "Qu'es-ce-que c'est ? C'est tout collant", + "block.botania.spectrolus": "Spectrolus", + "block.botania.spectrolus.reference": "Profiter de la haine", "item.botania:lexicon": "Lexica Botania", "item.botania:lexicon.bevo": "Lexica Botana", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index 45da368f2..9dab8cdc7 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -913,105 +913,102 @@ "block.botania:mutated_grass": "変異した草ブロック", "block.botania:animatedTorch": "動く松明", - "block.botania:flower.": "ボタニア花", - "block.botania:flower..reference": "何か不具合があるようです。報告をお願いします。", + "block.botania.pure_daisy": "ピュアデイジー", + "block.botania.pure_daisy.reference": "ねえ。あなたは何色になりたい?", + "block.botania.manastar": "マナスター", + "block.botania.manastar.reference": "星に願いを", - "block.botania:flower.puredaisy": "ピュアデイジー", - "block.botania:flower.puredaisy.reference": "ねえ。あなたは何色になりたい?", - "block.botania:flower.manastar": "マナスター", - "block.botania:flower.manastar.reference": "星に願いを", + "block.botania.endoflame": "エンドフレイム", + "block.botania.endoflame.reference": "吸熱反応性", + "block.botania.hydroangeas": "ハイドロエンゲス", + "block.botania.hydroangeas.reference": "人懐っこい魚たち", + "block.botania.thermalily": "サーマリリー", + "block.botania.thermalily.reference": "ブラッドメイジにはお勧めしない", + "block.botania.rosa_arcana": "ローザ・アルカナ", + "block.botania.rosa_arcana.reference": "角に10個の青いオーブ", + "block.botania.munchdew": "マンチデュー", + "block.botania.munchdew.reference": "これはカニバリズムに含まれますか?", + "block.botania.entropinnyum": "エントロピニウム", + "block.botania.entropinnyum.reference": "取扱注意", + "block.botania.kekimurus": "ケキムラス", + "block.botania.kekimurus.reference": "この花は嘘", + "block.botania.gourmaryllis": "ガーマリリス", + "block.botania.gourmaryllis.reference": "不愉快です", + "block.botania.narslimmus": "ナースライムス", + "block.botania.narslimmus.reference": "なにこれ?ベタベタする", + "block.botania.spectrolus": "スペクトロラス", + "block.botania.spectrolus.reference": "憎悪を力に", + "block.botania.dandelifeon": "ダンデライフオン", + "block.botania.dandelifeon.reference": "これが人生さ", + "block.botania.rafflowsia": "ラフロージア", + "block.botania.rafflowsia.reference": "蠱惑の落とし穴", - "block.botania:flower.endoflame": "エンドフレイム", - "block.botania:flower.endoflame.reference": "吸熱反応性", - "block.botania:flower.hydroangeas": "ハイドロエンゲス", - "block.botania:flower.hydroangeas.reference": "人懐っこい魚たち", - "block.botania:flower.thermalily": "サーマリリー", - "block.botania:flower.thermalily.reference": "ブラッドメイジにはお勧めしない", - "block.botania:flower.arcanerose": "ローザ・アルカナ", - "block.botania:flower.arcanerose.reference": "角に10個の青いオーブ", - "block.botania:flower.munchdew": "マンチデュー", - "block.botania:flower.munchdew.reference": "これはカニバリズムに含まれますか?", - "block.botania:flower.entropinnyum": "エントロピニウム", - "block.botania:flower.entropinnyum.reference": "取扱注意", - "block.botania:flower.kekimurus": "ケキムラス", - "block.botania:flower.kekimurus.reference": "この花は嘘", - "block.botania:flower.gourmaryllis": "ガーマリリス", - "block.botania:flower.gourmaryllis.reference": "不愉快です", - "block.botania:flower.narslimmus": "ナースライムス", - "block.botania:flower.narslimmus.reference": "なにこれ?ベタベタする", - "block.botania:flower.spectrolus": "スペクトロラス", - "block.botania:flower.spectrolus.reference": "憎悪を力に", - "block.botania:flower.dandelifeon": "ダンデライフオン", - "block.botania:flower.dandelifeon.reference": "これが人生さ", - "block.botania:flower.rafflowsia": "ラフロージア", - "block.botania:flower.rafflowsia.reference": "蠱惑の落とし穴", - - "block.botania:flower.bellethorn": "ベレソーン", - "block.botania:flower.bellethornChibi": "ベレソーン・プチ", - "block.botania:flower.dreadthorn": "ドレッドソーン", - "block.botania:flower.dreadthorn.reference": "ただ刺すだけ", - "block.botania:flower.heiseiDream": "ヘイセイドリーム", - "block.botania:flower.heiseiDream.reference": "ヘイセイヘイセイ", - "block.botania:flower.tigerseye": "タイガーズアイ", - "block.botania:flower.tigerseye.reference": "手乗りタイガー", - "block.botania:flower.jadedAmaranthus": "ジェイディッド・アマランサス", - "block.botania:flower.jadedAmaranthus.reference": "あるカップルはこれで死んだ", - "block.botania:flower.orechid": "オアキド", - "block.botania:flower.orechid.reference": "君がやったのはわかったよ", - "block.botania:flower.orechidIgnem": "オアキド・イグネム", - "block.botania:flower.orechidIgnem.reference": "バラのように赤い", - "block.botania:flower.fallenKanade": "フォーレン・カナデ", - "block.botania:flower.fallenKanade.reference": "あたしは天使なんかじゃないわ", - "block.botania:flower.exoflame": "エクソフレイム", - "block.botania:flower.exoflame.reference": "放熱反応性", - "block.botania:flower.agricarnation": "アグリカーネーション", - "block.botania:flower.agricarnation.reference": "4月25日に身に付ける", - "block.botania:flower.agricarnationChibi": "アグリカーネーション・プチ", - "block.botania:flower.agricarnationChibi.reference": "4月25日に身に付ける", - "block.botania:flower.hopperhock": "ホッパーホック", - "block.botania:flower.hopperhock.reference": "全部ここに流しこむ", - "block.botania:flower.hopperhockChibi": "ホッパーホック・プチ", - "block.botania:flower.hopperhockChibi.reference": "全部ここに流しこむ", - "block.botania:flower.tangleberrie": "タングルベリー", - "block.botania:flower.tangleberrie.reference": "フライパン禁止", - "block.botania:flower.jiyuulia": "ジユーリア", - "block.botania:flower.jiyuulia.reference": "フリューゲル・デア・フライハイト(自由の翼)", - "block.botania:flower.rannuncarpus": "ラナンカーパス", - "block.botania:flower.rannuncarpus.reference": "手のひらサイズ", - "block.botania:flower.rannuncarpusChibi": "ラナンカーパス・プチ", - "block.botania:flower.rannuncarpusChibi.reference": "手のひらサイズ", - "block.botania:flower.hyacidus": "ヒヤシダス", - "block.botania:flower.hyacidus.reference": "歩かなければ、毒を受けない", - "block.botania:flower.pollidisiac": "ポリディジアク", - "block.botania:flower.pollidisiac.reference": "鳥とハチと", - "block.botania:flower.clayconia": "クレイコニア", - "block.botania:flower.clayconia.reference": "ルピーは入っていません", - "block.botania:flower.clayconiaChibi": "クレイコニア・プチ", - "block.botania:flower.clayconiaChibi.reference": "ルピーは入っていません", - "block.botania:flower.loonium": "ルーニウム", - "block.botania:flower.loonium.reference": "頭の上に掲げてください", - "block.botania:flower.daffomill": "ダフォミル", - "block.botania:flower.daffomill.reference": "料理の手伝い", - "block.botania:flower.vinculotus": "ヴィンキュロタス", - "block.botania:flower.vinculotus.reference": "ExtraUtilitiesの完全にパクリ", - "block.botania:flower.spectranthemum": "スペクトランセマム", - "block.botania:flower.spectranthemum.reference": "攻殻のなかに", - "block.botania:flower.medumone": "メデュモネ", - "block.botania:flower.medumone.reference": "岩のように硬い", - "block.botania:flower.marimorphosis": "マリモルフォシス", - "block.botania:flower.marimorphosis.reference": "UMR!UMR!", - "block.botania:flower.marimorphosisChibi": "マリモルフォシス・チビ", - "block.botania:flower.marimorphosisChibi.reference": "UMAじゃないよ!", - "block.botania:flower.bubbell": "バッベル", - "block.botania:flower.bubbell.reference": "いまなら様々なオプション機能もついています", - "block.botania:flower.bubbellChibi": "バッベル・プチ", - "block.botania:flower.bubbellChibi.reference": "いまなら様々なオプション機能もついています", - "block.botania:flower.solegnolia": "ソレノリア", - "block.botania:flower.solegnolia.reference": "あなたは磁石をすべてわれわれが所属している!", - "block.botania:flower.solegnoliaChibi": "ソレノリア・プチ", - "block.botania:flower.solegnoliaChibi.reference": "あなたは磁石をすべてわれわれが所属している!", - "block.botania:flower.bergamute": "ベルガミュート", - "block.botania:flower.bergamute.reference": "閉ざしたままの口唇", + "block.botania.bellethorn": "ベレソーン", + "block.botania.bellethorn_chibi": "ベレソーン・プチ", + "block.botania.dreadthorn": "ドレッドソーン", + "block.botania.dreadthorn.reference": "ただ刺すだけ", + "block.botania.heisei_dream": "ヘイセイドリーム", + "block.botania.heisei_dream.reference": "ヘイセイヘイセイ", + "block.botania.tigerseye": "タイガーズアイ", + "block.botania.tigerseye.reference": "手乗りタイガー", + "block.botania.jaded_amaranthus": "ジェイディッド・アマランサス", + "block.botania.jaded_amaranthus.reference": "あるカップルはこれで死んだ", + "block.botania.orechid": "オアキド", + "block.botania.orechid.reference": "君がやったのはわかったよ", + "block.botania.orechid_ignem": "オアキド・イグネム", + "block.botania.orechid_ignem.reference": "バラのように赤い", + "block.botania.fallen_kanade": "フォーレン・カナデ", + "block.botania.fallen_kanade.reference": "あたしは天使なんかじゃないわ", + "block.botania.exoflame": "エクソフレイム", + "block.botania.exoflame.reference": "放熱反応性", + "block.botania.agricarnation": "アグリカーネーション", + "block.botania.agricarnation.reference": "4月25日に身に付ける", + "block.botania.agricarnation_chibi": "アグリカーネーション・プチ", + "block.botania.agricarnation_chibi.reference": "4月25日に身に付ける", + "block.botania.hopperhock": "ホッパーホック", + "block.botania.hopperhock.reference": "全部ここに流しこむ", + "block.botania.hopperhock_chibi": "ホッパーホック・プチ", + "block.botania.hopperhock_chibi.reference": "全部ここに流しこむ", + "block.botania.tangleberrie": "タングルベリー", + "block.botania.tangleberrie.reference": "フライパン禁止", + "block.botania.jiyuulia": "ジユーリア", + "block.botania.jiyuulia.reference": "フリューゲル・デア・フライハイト(自由の翼)", + "block.botania.rannuncarpus": "ラナンカーパス", + "block.botania.rannuncarpus.reference": "手のひらサイズ", + "block.botania.rannuncarpus_chibi": "ラナンカーパス・プチ", + "block.botania.rannuncarpus_chibi.reference": "手のひらサイズ", + "block.botania.hyacidus": "ヒヤシダス", + "block.botania.hyacidus.reference": "歩かなければ、毒を受けない", + "block.botania.pollidisiac": "ポリディジアク", + "block.botania.pollidisiac.reference": "鳥とハチと", + "block.botania.clayconia": "クレイコニア", + "block.botania.clayconia.reference": "ルピーは入っていません", + "block.botania.clayconia_chibi": "クレイコニア・プチ", + "block.botania.clayconia_chibi.reference": "ルピーは入っていません", + "block.botania.loonium": "ルーニウム", + "block.botania.loonium.reference": "頭の上に掲げてください", + "block.botania.daffomill": "ダフォミル", + "block.botania.daffomill.reference": "料理の手伝い", + "block.botania.vinculotus": "ヴィンキュロタス", + "block.botania.vinculotus.reference": "ExtraUtilitiesの完全にパクリ", + "block.botania.spectranthemum": "スペクトランセマム", + "block.botania.spectranthemum.reference": "攻殻のなかに", + "block.botania.medumone": "メデュモネ", + "block.botania.medumone.reference": "岩のように硬い", + "block.botania.marimorphosis": "マリモルフォシス", + "block.botania.marimorphosis.reference": "UMR!UMR!", + "block.botania.marimorphosis_chibi": "マリモルフォシス・チビ", + "block.botania.marimorphosis_chibi.reference": "UMAじゃないよ!", + "block.botania.bubbell": "バッベル", + "block.botania.bubbell.reference": "いまなら様々なオプション機能もついています", + "block.botania.bubbell_chibi": "バッベル・プチ", + "block.botania.bubbell_chibi.reference": "いまなら様々なオプション機能もついています", + "block.botania.solegnolia": "ソレノリア", + "block.botania.solegnolia.reference": "あなたは磁石をすべてわれわれが所属している!", + "block.botania.solegnolia_chibi": "ソレノリア・プチ", + "block.botania.solegnolia_chibi.reference": "あなたは磁石をすべてわれわれが所属している!", + "block.botania.bergamute": "ベルガミュート", + "block.botania.bergamute.reference": "閉ざしたままの口唇", "item.botania:lexicon": "ボタニア植物辞典", "item.botania:lexicon.bevo": "ボタニア植物辞典", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index cbff15bba..bf7b45ef1 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -863,96 +863,93 @@ "block.botania:bifrost": "비프로스트 블럭(기간제)", "block.botania:bifrostPerm": "비프로스트 블럭", - "block.botania:flower.": "보타니아 꽃", - "block.botania:flower..reference": "뭔가 잘못된 점이 있는경우, 그것을 알려주세요", + "block.botania.pure_daisy": "정화의 데이지", + "block.botania.pure_daisy.reference": "당신을 색으로 표현하자면 무슨 색?", + "block.botania.manastar": "마나의 별", + "block.botania.manastar.reference": "별에게 소원을 빌어보세요", - "block.botania:flower.puredaisy": "정화의 데이지", - "block.botania:flower.puredaisy.reference": "당신을 색으로 표현하자면 무슨 색?", - "block.botania:flower.manastar": "마나의 별", - "block.botania:flower.manastar.reference": "별에게 소원을 빌어보세요", + "block.botania.daybloom": "해맞이 꽃", + "block.botania.daybloom.reference": "빛의 함정", + "block.botania.endoflame": "불먹이 꽃", + "block.botania.endoflame.reference": "샤나(*역자 : 애니 '작안의 샤나' 주인공 이름) 같은 불꽃", + "block.botania.hydroangeas": "수국", + "block.botania.hydroangeas.reference": "갑각류들의 친구", + "block.botania.thermalily": "열백합", + "block.botania.thermalily.reference": "사실 백합이 아닌 진홍색 장미", + "block.botania.nightshade": "밤초롱꽃", + "block.botania.nightshade.reference": "무시무시한 특징", + "block.botania.rosa_arcana": "신비로운 장미", + "block.botania.rosa_arcana.reference": "당신의 초록색 오브는 제껍니다.", + "block.botania.munchdew": "이슬삯이", + "block.botania.munchdew.reference": "미술을 가르쳐주는건 완벽해!", + "block.botania.entropinnyum": "엔트로피늄", + "block.botania.entropinnyum.reference": "마법소녀는 옵션이라고?", + "block.botania.kekimurus": "케키머러스", + "block.botania.kekimurus.reference": "The cake is a lie", + "block.botania.gourmaryllis": "구어머릴러스", + "block.botania.gourmaryllis.reference": "후유카이 데스(*역자 : 일본어로 '불쾌합니다'라는 뜻)", + "block.botania.narslimmus": "나아슬리머스", + "block.botania.narslimmus.reference": "뭐야!? 모든게 끈적거리잖아!", + "block.botania.spectrolus": "스펙트럴러스", - "block.botania:flower.daybloom": "해맞이 꽃", - "block.botania:flower.daybloom.reference": "빛의 함정", - "block.botania:flower.endoflame": "불먹이 꽃", - "block.botania:flower.endoflame.reference": "샤나(*역자 : 애니 '작안의 샤나' 주인공 이름) 같은 불꽃", - "block.botania:flower.hydroangeas": "수국", - "block.botania:flower.hydroangeas.reference": "갑각류들의 친구", - "block.botania:flower.thermalily": "열백합", - "block.botania:flower.thermalily.reference": "사실 백합이 아닌 진홍색 장미", - "block.botania:flower.nightshade": "밤초롱꽃", - "block.botania:flower.nightshade.reference": "무시무시한 특징", - "block.botania:flower.arcanerose": "신비로운 장미", - "block.botania:flower.arcanerose.reference": "당신의 초록색 오브는 제껍니다.", - "block.botania:flower.munchdew": "이슬삯이", - "block.botania:flower.munchdew.reference": "미술을 가르쳐주는건 완벽해!", - "block.botania:flower.entropinnyum": "엔트로피늄", - "block.botania:flower.entropinnyum.reference": "마법소녀는 옵션이라고?", - "block.botania:flower.kekimurus": "케키머러스", - "block.botania:flower.kekimurus.reference": "The cake is a lie", - "block.botania:flower.gourmaryllis": "구어머릴러스", - "block.botania:flower.gourmaryllis.reference": "후유카이 데스(*역자 : 일본어로 '불쾌합니다'라는 뜻)", - "block.botania:flower.narslimmus": "나아슬리머스", - "block.botania:flower.narslimmus.reference": "뭐야!? 모든게 끈적거리잖아!", - "block.botania:flower.spectrolus": "스펙트럴러스", - - "block.botania:flower.bellethorn": "미인가시꽃", - "block.botania:flower.bellethorn.reference": "세계의 끝에서 부르는 여성들의 론도", - "block.botania:flower.bellethornChibi": "작은 미인가시꽃", - "block.botania:flower.bellethornChibi.reference": "세계의 끝에서 부르는 여성들의 론도", - "block.botania:flower.dreadthorn": "공포의 덤불", - "block.botania:flower.dreadthorn.reference": "플랜 C!", - "block.botania:flower.heiseiDream": "길몽초", - "block.botania:flower.heiseiDream.reference": "광란! 코왈트!(*역자:일본 락밴드 음원 뜻은 쓸쓸함,죽음,탄생)", - "block.botania:flower.tigerseye": "호랑눈꽃", - "block.botania:flower.tigerseye.reference": "뛰어 보았자 호랑이의 손바닥안", - "block.botania:flower.jadedAmaranthus": "보라색 비름", - "block.botania:flower.jadedAmaranthus.reference": "솔로천국! 커플지옥!", - "block.botania:flower.orechid": "광물난초", - "block.botania:flower.orechid.reference": "나는 당신이 무엇을 하는지 다 알고있어", - "block.botania:flower.orechidIgnem": "불타는 광물난초", - "block.botania:flower.orechidIgnem.reference": "장미색깔", - "block.botania:flower.fallenKanade": "생명의 연주자", - "block.botania:flower.fallenKanade.reference": "나는 천사가 아니야", - "block.botania:flower.exoflame": "바깥불꽃", - "block.botania:flower.exoflame.reference": "그의 검은 리본", - "block.botania:flower.agricarnation": "성장의 카네이션", - "block.botania:flower.agricarnation.reference": "5월8일에 부모님께 달아드리자", - "block.botania:flower.agricarnationChibi": "작은 성장의 카네이션", - "block.botania:flower.agricarnationChibi.reference": "5월8일에 부모님께 달아드리자", - "block.botania:flower.hopperhock": "호퍼록", - "block.botania:flower.hopperhock.reference": "모두 깔대기로", - "block.botania:flower.hopperhockChibi": "작은 호퍼록", - "block.botania:flower.hopperhockChibi.reference": "모두 깔대기로", - "block.botania:flower.tangleberrie": "탱글베리", - "block.botania:flower.tangleberrie.reference": "더 이상의 공중부양은...Naver..", - "block.botania:flower.jiyuulia": "배척의 꽃", - "block.botania:flower.jiyuulia.reference": "자유의 날개", - "block.botania:flower.rannuncarpus": "장난꾸러기꽃", - "block.botania:flower.rannuncarpus.reference": "이건 손이죠. 네.", - "block.botania:flower.rannuncarpusChibi": "작은 장난꾸러기꽃", - "block.botania:flower.rannuncarpusChibi.reference": "이건 손이죠. 네.", - "block.botania:flower.hyacidus": "하이시더스", - "block.botania:flower.hyacidus.reference": "움직이지 않는다면 사냥할 수도 없어", - "block.botania:flower.pollidisiac": "사랑나눔꽃", - "block.botania:flower.pollidisiac.reference": "( ͡° ͜ʖ ͡°)", - "block.botania:flower.clayconia": "점토코니아", - "block.botania:flower.clayconia.reference": "루피는 없습니다", - "block.botania:flower.loonium": "탐사초", - "block.botania:flower.loonium.reference": "머리 위에 있는 놈을 잡아버립시다.", - "block.botania:flower.daffomill": "풍차꽃", - "block.botania:flower.daffomill.reference": "요리사의 조수", - "block.botania:flower.vinculotus": "이동간섭꽃", - "block.botania:flower.vinculotus.reference": "엑스트라유틸리티를 위한 모드", - "block.botania:flower.medumone": "속박의 꽃", - "block.botania:flower.marimorphosis": "변성초", - "block.botania:flower.marimorphosis.reference": "믿고 쓰는 변성초", - "block.botania:flower.marimorphosisChibi": "작은 변성초", - "block.botania:flower.marimorphosisChibi.reference": "믿고 쓰는 변성초", - "block.botania:flower.bubbell": "습기제거초", - "block.botania:flower.bubbell.reference": "휘파람(BGM. 뇌내혁명걸)", - "block.botania:flower.bubbellChibi": "작은 습기제거초", - "block.botania:flower.bubbellChibi.reference": "휘파람(BGM. 뇌내혁명걸)", - "block.botania:flower.solegnolia.reference": "자석은 이걸로 만들어진다카더라 아님 말고ㅋ", + "block.botania.bellethorn": "미인가시꽃", + "block.botania.bellethorn.reference": "세계의 끝에서 부르는 여성들의 론도", + "block.botania.bellethorn_chibi": "작은 미인가시꽃", + "block.botania.bellethorn_chibi.reference": "세계의 끝에서 부르는 여성들의 론도", + "block.botania.dreadthorn": "공포의 덤불", + "block.botania.dreadthorn.reference": "플랜 C!", + "block.botania.heisei_dream": "길몽초", + "block.botania.heisei_dream.reference": "광란! 코왈트!(*역자:일본 락밴드 음원 뜻은 쓸쓸함,죽음,탄생)", + "block.botania.tigerseye": "호랑눈꽃", + "block.botania.tigerseye.reference": "뛰어 보았자 호랑이의 손바닥안", + "block.botania.jaded_amaranthus": "보라색 비름", + "block.botania.jaded_amaranthus.reference": "솔로천국! 커플지옥!", + "block.botania.orechid": "광물난초", + "block.botania.orechid.reference": "나는 당신이 무엇을 하는지 다 알고있어", + "block.botania.orechid_ignem": "불타는 광물난초", + "block.botania.orechid_ignem.reference": "장미색깔", + "block.botania.fallen_kanade": "생명의 연주자", + "block.botania.fallen_kanade.reference": "나는 천사가 아니야", + "block.botania.exoflame": "바깥불꽃", + "block.botania.exoflame.reference": "그의 검은 리본", + "block.botania.agricarnation": "성장의 카네이션", + "block.botania.agricarnation.reference": "5월8일에 부모님께 달아드리자", + "block.botania.agricarnation_chibi": "작은 성장의 카네이션", + "block.botania.agricarnation_chibi.reference": "5월8일에 부모님께 달아드리자", + "block.botania.hopperhock": "호퍼록", + "block.botania.hopperhock.reference": "모두 깔대기로", + "block.botania.hopperhock_chibi": "작은 호퍼록", + "block.botania.hopperhock_chibi.reference": "모두 깔대기로", + "block.botania.tangleberrie": "탱글베리", + "block.botania.tangleberrie.reference": "더 이상의 공중부양은...Naver..", + "block.botania.jiyuulia": "배척의 꽃", + "block.botania.jiyuulia.reference": "자유의 날개", + "block.botania.rannuncarpus": "장난꾸러기꽃", + "block.botania.rannuncarpus.reference": "이건 손이죠. 네.", + "block.botania.rannuncarpus_chibi": "작은 장난꾸러기꽃", + "block.botania.rannuncarpus_chibi.reference": "이건 손이죠. 네.", + "block.botania.hyacidus": "하이시더스", + "block.botania.hyacidus.reference": "움직이지 않는다면 사냥할 수도 없어", + "block.botania.pollidisiac": "사랑나눔꽃", + "block.botania.pollidisiac.reference": "( ͡° ͜ʖ ͡°)", + "block.botania.clayconia": "점토코니아", + "block.botania.clayconia.reference": "루피는 없습니다", + "block.botania.loonium": "탐사초", + "block.botania.loonium.reference": "머리 위에 있는 놈을 잡아버립시다.", + "block.botania.daffomill": "풍차꽃", + "block.botania.daffomill.reference": "요리사의 조수", + "block.botania.vinculotus": "이동간섭꽃", + "block.botania.vinculotus.reference": "엑스트라유틸리티를 위한 모드", + "block.botania.medumone": "속박의 꽃", + "block.botania.marimorphosis": "변성초", + "block.botania.marimorphosis.reference": "믿고 쓰는 변성초", + "block.botania.marimorphosis_chibi": "작은 변성초", + "block.botania.marimorphosis_chibi.reference": "믿고 쓰는 변성초", + "block.botania.bubbell": "습기제거초", + "block.botania.bubbell.reference": "휘파람(BGM. 뇌내혁명걸)", + "block.botania.bubbell_chibi": "작은 습기제거초", + "block.botania.bubbell_chibi.reference": "휘파람(BGM. 뇌내혁명걸)", + "block.botania.solegnolia.reference": "자석은 이걸로 만들어진다카더라 아님 말고ㅋ", "item.botania:lexicon": "보타니아 사전", "item.botania:lexicon.bevo": "보타니아 사전", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index 451df8662..d29ebb853 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -978,115 +978,112 @@ "block.botania:shimmerwoodPlanks0Stairs": "Glinsterhout Plank Trap", "block.botania:avatar": "Levenshout Avatar", - "block.botania:flower.": "Botania Bloem", - "block.botania:flower..reference": "Als je dit ziet is er iets misgegaan, svp melden", + "block.botania.pure_daisy": "Puur Madeliefje", + "block.botania.pure_daisy.reference": "Welke kleur wil je dat hij is?", + "block.botania.manastar": "Manaster", + "block.botania.manastar.reference": "Wens bij een vallende ster", - "block.botania:flower.puredaisy": "Puur Madeliefje", - "block.botania:flower.puredaisy.reference": "Welke kleur wil je dat hij is?", - "block.botania:flower.manastar": "Manaster", - "block.botania:flower.manastar.reference": "Wens bij een vallende ster", + "block.botania.daybloom": "Dagbloem", + "block.botania.daybloom.reference": "Een Steek van licht", + "block.botania.daybloomDecor": "Dagbloem Motief", + "block.botania.daybloomDecor.reference": "Een Steek van licht", + "block.botania.daybloomPrime": "Dagbloem Primus", + "block.botania.daybloomPrime.reference": "Je zou dit niet bij je moeten hebben", + "block.botania.endoflame": "Endovlam", + "block.botania.endoflame.reference": "Een endotherme reactie", + "block.botania.hydroangeas": "Hydroangea", + "block.botania.hydroangeas.reference": "Gewoon vriendelijke schaaldieren", + "block.botania.hydroangeasDecor": "Hydroangeas Motief", + "block.botania.hydroangeasDecor.reference": "Gewoon vriendelijke schaaldieren", + "block.botania.thermalily": "Thermalelie", + "block.botania.thermalily.reference": "Met oranjerode kleur", + "block.botania.nightshade": "Nachtschaduw", + "block.botania.nightshade.reference": "Onaangenaam herkenbaar", + "block.botania.nightshadePrime": "Nachtschaduw Primus", + "block.botania.nightshadePrime.reference": "Je zou dit niet bij je moeten hebben", + "block.botania.nightshadeDecor": "Nachtschaduw Motief", + "block.botania.nightshadeDecor.reference": "Onaangenaam herkenbaar", + "block.botania.rosa_arcana": "Rosa Arcana", + "block.botania.rosa_arcana.reference": "Geheimelijk opvallend", + "block.botania.munchdew": "Munchdauw", + "block.botania.munchdew.reference": "Goed binnen te houden", + "block.botania.entropinnyum": "Entropinnium", + "block.botania.entropinnyum.reference": "Netjes op een rijtje", + "block.botania.kekimurus": "Kekimurus", + "block.botania.kekimurus.reference": "Deze bloem bedriegt", + "block.botania.gourmaryllis": "Gourmarie", + "block.botania.gourmaryllis.reference": "Voor de fijnproever", + "block.botania.narslimmus": "Narslimmus", + "block.botania.narslimmus.reference": "Wat is dit? Het is zo plakkerig.", + "block.botania.spectrolus": "Spectrolus", + "block.botania.spectrolus.reference": "Profiteert van haat", + "block.botania.dandelifeon": "Dandeleven", + "block.botania.dandelifeon.reference": "Zo is het leven", + "block.botania.rafflowsia": "Rommelkruid", + "block.botania.rafflowsia.reference": "Venijnige Valkuil", - "block.botania:flower.daybloom": "Dagbloem", - "block.botania:flower.daybloom.reference": "Een Steek van licht", - "block.botania:flower.daybloomDecor": "Dagbloem Motief", - "block.botania:flower.daybloomDecor.reference": "Een Steek van licht", - "block.botania:flower.daybloomPrime": "Dagbloem Primus", - "block.botania:flower.daybloomPrime.reference": "Je zou dit niet bij je moeten hebben", - "block.botania:flower.endoflame": "Endovlam", - "block.botania:flower.endoflame.reference": "Een endotherme reactie", - "block.botania:flower.hydroangeas": "Hydroangea", - "block.botania:flower.hydroangeas.reference": "Gewoon vriendelijke schaaldieren", - "block.botania:flower.hydroangeasDecor": "Hydroangeas Motief", - "block.botania:flower.hydroangeasDecor.reference": "Gewoon vriendelijke schaaldieren", - "block.botania:flower.thermalily": "Thermalelie", - "block.botania:flower.thermalily.reference": "Met oranjerode kleur", - "block.botania:flower.nightshade": "Nachtschaduw", - "block.botania:flower.nightshade.reference": "Onaangenaam herkenbaar", - "block.botania:flower.nightshadePrime": "Nachtschaduw Primus", - "block.botania:flower.nightshadePrime.reference": "Je zou dit niet bij je moeten hebben", - "block.botania:flower.nightshadeDecor": "Nachtschaduw Motief", - "block.botania:flower.nightshadeDecor.reference": "Onaangenaam herkenbaar", - "block.botania:flower.arcanerose": "Rosa Arcana", - "block.botania:flower.arcanerose.reference": "Geheimelijk opvallend", - "block.botania:flower.munchdew": "Munchdauw", - "block.botania:flower.munchdew.reference": "Goed binnen te houden", - "block.botania:flower.entropinnyum": "Entropinnium", - "block.botania:flower.entropinnyum.reference": "Netjes op een rijtje", - "block.botania:flower.kekimurus": "Kekimurus", - "block.botania:flower.kekimurus.reference": "Deze bloem bedriegt", - "block.botania:flower.gourmaryllis": "Gourmarie", - "block.botania:flower.gourmaryllis.reference": "Voor de fijnproever", - "block.botania:flower.narslimmus": "Narslimmus", - "block.botania:flower.narslimmus.reference": "Wat is dit? Het is zo plakkerig.", - "block.botania:flower.spectrolus": "Spectrolus", - "block.botania:flower.spectrolus.reference": "Profiteert van haat", - "block.botania:flower.dandelifeon": "Dandeleven", - "block.botania:flower.dandelifeon.reference": "Zo is het leven", - "block.botania:flower.rafflowsia": "Rommelkruid", - "block.botania:flower.rafflowsia.reference": "Venijnige Valkuil", - - "block.botania:flower.bellethorn": "Bellendoorn", - "block.botania:flower.bellethorn.reference": "Prik je niet", - "block.botania:flower.bellethornChibi": "Bellendoorn Petite", - "block.botania:flower.bellethornChibi.reference": "Het einde van de wereld?", - "block.botania:flower.dreadthorn": "Schrikkeldoorn", - "block.botania:flower.dreadthorn.reference": "Plan C", - "block.botania:flower.heiseiDream": "Droomdoorn", - "block.botania:flower.heiseiDream.reference": "Blijf dromen", - "block.botania:flower.tigerseye": "Tijgersoog", - "block.botania:flower.tigerseye.reference": "Je eigen tijger", - "block.botania:flower.jadedAmaranthus": "Jaded Amaranthus", - "block.botania:flower.jadedAmaranthus.reference": "Wat je hebben wilt", - "block.botania:flower.orechid": "Ertsidee", - "block.botania:flower.orechid.reference": "Je oogst wat je zaait", - "block.botania:flower.orechidIgnem": "Nertsidee", - "block.botania:flower.orechidIgnem.reference": "Als rode rozen", - "block.botania:flower.fallenKanade": "Gevallen Engel", - "block.botania:flower.fallenKanade.reference": "Hemels", - "block.botania:flower.exoflame": "Exovlam", - "block.botania:flower.exoflame.reference": "Een exotherme reactie", - "block.botania:flower.agricarnation": "Agranietje", - "block.botania:flower.agricarnation.reference": "Wat de boer niet kent", - "block.botania:flower.agricarnationChibi": "Agraniet Petite", - "block.botania:flower.agricarnationChibi.reference": "Dragen deze bloem", - "block.botania:flower.hopperhock": "Trechterkruid", - "block.botania:flower.hopperhock.reference": "Het gaat er allemaal in", - "block.botania:flower.hopperhockChibi": "Kleint Trechterkruid", - "block.botania:flower.hopperhockChibi.reference": "Het trechtert erin", - "block.botania:flower.tangleberrie": "Tangelbes", - "block.botania:flower.tangleberrie.reference": "Niet opbakken", - "block.botania:flower.jiyuulia": "Spreukbes", - "block.botania:flower.jiyuulia.reference": "Vleugel der vrijheid", - "block.botania:flower.rannuncarpus": "Rannakruid", - "block.botania:flower.rannuncarpus.reference": "Altijd handig", - "block.botania:flower.rannuncarpusChibi": "Klein Rannakruid", - "block.botania:flower.rannuncarpusChibi.reference": "Da's handig", - "block.botania:flower.hyacidus": "Hyacint", - "block.botania:flower.hyacidus.reference": "Gewoon niet doorheen lopen", - "block.botania:flower.pollidisiac": "Pollidesie", - "block.botania:flower.pollidisiac.reference": "Bloemen en bijen", - "block.botania:flower.clayconia": "Kleiconia", - "block.botania:flower.clayconia.reference": "Kleigoed", - "block.botania:flower.loonium": "Loonium", - "block.botania:flower.loonium.reference": "Hou hem boven je hoofd", - "block.botania:flower.daffomill": "Daffolelie", - "block.botania:flower.daffomill.reference": "Assistent Chef", - "block.botania:flower.vinculotus": "Vinculotus", - "block.botania:flower.vinculotus.reference": "Samen sterker", - "block.botania:flower.spectranthemum": "Spectranthemie", - "block.botania:flower.spectranthemum.reference": "In een notendop", - "block.botania:flower.medumone": "Medumeen", - "block.botania:flower.medumone.reference": "Hij gaat je pakken", - "block.botania:flower.marimorphosis": "Mariemorfose", - "block.botania:flower.marimorphosis.reference": "Stevig als een rots", - "block.botania:flower.marimorphosisChibi": "Mariemorfose Petite", - "block.botania:flower.marimorphosisChibi.reference": "Stevig als een rots", - "block.botania:flower.bubbell": "Bubbelbes", - "block.botania:flower.bubbell.reference": "En fluiten", - "block.botania:flower.bubbellChibi": "Kleine Bubbelbes", - "block.botania:flower.bubbellChibi.reference": "En fluiten", - "block.botania:flower.solegnolia": "Solegnolie", - "block.botania:flower.solegnolia.reference": "Anti-magneet", + "block.botania.bellethorn": "Bellendoorn", + "block.botania.bellethorn.reference": "Prik je niet", + "block.botania.bellethorn_chibi": "Bellendoorn Petite", + "block.botania.bellethorn_chibi.reference": "Het einde van de wereld?", + "block.botania.dreadthorn": "Schrikkeldoorn", + "block.botania.dreadthorn.reference": "Plan C", + "block.botania.heisei_dream": "Droomdoorn", + "block.botania.heisei_dream.reference": "Blijf dromen", + "block.botania.tigerseye": "Tijgersoog", + "block.botania.tigerseye.reference": "Je eigen tijger", + "block.botania.jaded_amaranthus": "Jaded Amaranthus", + "block.botania.jaded_amaranthus.reference": "Wat je hebben wilt", + "block.botania.orechid": "Ertsidee", + "block.botania.orechid.reference": "Je oogst wat je zaait", + "block.botania.orechid_ignem": "Nertsidee", + "block.botania.orechid_ignem.reference": "Als rode rozen", + "block.botania.fallen_kanade": "Gevallen Engel", + "block.botania.fallen_kanade.reference": "Hemels", + "block.botania.exoflame": "Exovlam", + "block.botania.exoflame.reference": "Een exotherme reactie", + "block.botania.agricarnation": "Agranietje", + "block.botania.agricarnation.reference": "Wat de boer niet kent", + "block.botania.agricarnation_chibi": "Agraniet Petite", + "block.botania.agricarnation_chibi.reference": "Dragen deze bloem", + "block.botania.hopperhock": "Trechterkruid", + "block.botania.hopperhock.reference": "Het gaat er allemaal in", + "block.botania.hopperhock_chibi": "Kleint Trechterkruid", + "block.botania.hopperhock_chibi.reference": "Het trechtert erin", + "block.botania.tangleberrie": "Tangelbes", + "block.botania.tangleberrie.reference": "Niet opbakken", + "block.botania.jiyuulia": "Spreukbes", + "block.botania.jiyuulia.reference": "Vleugel der vrijheid", + "block.botania.rannuncarpus": "Rannakruid", + "block.botania.rannuncarpus.reference": "Altijd handig", + "block.botania.rannuncarpus_chibi": "Klein Rannakruid", + "block.botania.rannuncarpus_chibi.reference": "Da's handig", + "block.botania.hyacidus": "Hyacint", + "block.botania.hyacidus.reference": "Gewoon niet doorheen lopen", + "block.botania.pollidisiac": "Pollidesie", + "block.botania.pollidisiac.reference": "Bloemen en bijen", + "block.botania.clayconia": "Kleiconia", + "block.botania.clayconia.reference": "Kleigoed", + "block.botania.loonium": "Loonium", + "block.botania.loonium.reference": "Hou hem boven je hoofd", + "block.botania.daffomill": "Daffolelie", + "block.botania.daffomill.reference": "Assistent Chef", + "block.botania.vinculotus": "Vinculotus", + "block.botania.vinculotus.reference": "Samen sterker", + "block.botania.spectranthemum": "Spectranthemie", + "block.botania.spectranthemum.reference": "In een notendop", + "block.botania.medumone": "Medumeen", + "block.botania.medumone.reference": "Hij gaat je pakken", + "block.botania.marimorphosis": "Mariemorfose", + "block.botania.marimorphosis.reference": "Stevig als een rots", + "block.botania.marimorphosis_chibi": "Mariemorfose Petite", + "block.botania.marimorphosis_chibi.reference": "Stevig als een rots", + "block.botania.bubbell": "Bubbelbes", + "block.botania.bubbell.reference": "En fluiten", + "block.botania.bubbell_chibi": "Kleine Bubbelbes", + "block.botania.bubbell_chibi.reference": "En fluiten", + "block.botania.solegnolia": "Solegnolie", + "block.botania.solegnolia.reference": "Anti-magneet", "item.botania:lexicon": "Lexica Botania", "item.botania:lexicon.bevo": "Lexica Botana", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 0b94972cd..6e4ab088d 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -1056,107 +1056,104 @@ "block.botania:mutated_grass": "Grama Mutante", "block.botania:animatedTorch": "Tocha Animada", - "block.botania:flower.": "Flor do Botania", - "block.botania:flower..reference": "Se você tem isso, algo de errado aconteceu", + "block.botania.pure_daisy": "Margarida Pura", + "block.botania.pure_daisy.reference": "De que cor você quer?", + "block.botania.manastar": "Manastar", + "block.botania.manastar.reference": "Faça um desejo", - "block.botania:flower.puredaisy": "Margarida Pura", - "block.botania:flower.puredaisy.reference": "De que cor você quer?", - "block.botania:flower.manastar": "Manastar", - "block.botania:flower.manastar.reference": "Faça um desejo", + "block.botania.endoflame": "Endoflame", + "block.botania.endoflame.reference": "Reagindo endotermicamente", + "block.botania.hydroangeas": "Hydroangeas", + "block.botania.hydroangeas.reference": "Crustáceos amigáveis", + "block.botania.thermalily": "Thermalily", + "block.botania.thermalily.reference": "Não recomendada para Magos do Sangue", + "block.botania.rosa_arcana": "Rosa Arcana", + "block.botania.rosa_arcana.reference": "Dez orbes azuis no canto", + "block.botania.munchdew": "Munchdew", + "block.botania.munchdew.reference": "Isso conta como canibalismo?", + "block.botania.entropinnyum": "Entropinnyum", + "block.botania.entropinnyum.reference": "Manusear com cuidado", + "block.botania.kekimurus": "Kekimurus", + "block.botania.kekimurus.reference": "Essa flor é uma mentira", + "block.botania.gourmaryllis": "Gourmaryllis", + "block.botania.gourmaryllis.reference": "Que desagradável", + "block.botania.narslimmus": "Narslimmus", + "block.botania.narslimmus.reference": "O que é isso? É grudento", + "block.botania.spectrolus": "Spectrolus", + "block.botania.spectrolus.reference": "Lucrando com o Ódio", + "block.botania.dandelifeon": "Dandelifeon", + "block.botania.dandelifeon.reference": "C'est la vie", + "block.botania.rafflowsia": "Rafflowsia", + "block.botania.rafflowsia.reference": "Pesadelos com Trap Hole", - "block.botania:flower.endoflame": "Endoflame", - "block.botania:flower.endoflame.reference": "Reagindo endotermicamente", - "block.botania:flower.hydroangeas": "Hydroangeas", - "block.botania:flower.hydroangeas.reference": "Crustáceos amigáveis", - "block.botania:flower.thermalily": "Thermalily", - "block.botania:flower.thermalily.reference": "Não recomendada para Magos do Sangue", - "block.botania:flower.arcanerose": "Rosa Arcana", - "block.botania:flower.arcanerose.reference": "Dez orbes azuis no canto", - "block.botania:flower.munchdew": "Munchdew", - "block.botania:flower.munchdew.reference": "Isso conta como canibalismo?", - "block.botania:flower.entropinnyum": "Entropinnyum", - "block.botania:flower.entropinnyum.reference": "Manusear com cuidado", - "block.botania:flower.kekimurus": "Kekimurus", - "block.botania:flower.kekimurus.reference": "Essa flor é uma mentira", - "block.botania:flower.gourmaryllis": "Gourmaryllis", - "block.botania:flower.gourmaryllis.reference": "Que desagradável", - "block.botania:flower.narslimmus": "Narslimmus", - "block.botania:flower.narslimmus.reference": "O que é isso? É grudento", - "block.botania:flower.spectrolus": "Spectrolus", - "block.botania:flower.spectrolus.reference": "Lucrando com o Ódio", - "block.botania:flower.dandelifeon": "Dandelifeon", - "block.botania:flower.dandelifeon.reference": "C'est la vie", - "block.botania:flower.rafflowsia": "Rafflowsia", - "block.botania:flower.rafflowsia.reference": "Pesadelos com Trap Hole", - - "block.botania:flower.bellethorn": "Bellethorne", - "block.botania:flower.bellethorn.reference": "O beijo da rosa", - "block.botania:flower.bellethornChibi": "Bellethorne Petite", - "block.botania:flower.bellethornChibi.reference": "O beijo da rosa", - "block.botania:flower.dreadthorn": "Dreadthorne", - "block.botania:flower.dreadthorn.reference": "Apenas uma espetada", - "block.botania:flower.heiseiDream": "Heisei Dream", - "block.botania:flower.heiseiDream.reference": "Heisei heisei", - "block.botania:flower.tigerseye": "Tigerseye", - "block.botania:flower.tigerseye.reference": "O tigre portátil", - "block.botania:flower.jadedAmaranthus": "Jaded Amaranthus", - "block.botania:flower.jadedAmaranthus.reference": "Alguns morreram por isso", - "block.botania:flower.orechid": "Orechid", - "block.botania:flower.orechid.reference": "Eu vi o que você plantou", - "block.botania:flower.orechidIgnem": "Orechid Ignem", - "block.botania:flower.orechidIgnem.reference": "Vermelha como rosas", - "block.botania:flower.fallenKanade": "Fallen Kanade", - "block.botania:flower.fallenKanade.reference": "Não sou um anjo", - "block.botania:flower.exoflame": "Exoflame", - "block.botania:flower.exoflame.reference": "Reagindo exotermicamente", - "block.botania:flower.agricarnation": "Agricarnation", - "block.botania:flower.agricarnation.reference": "Viva o 25 de abril", - "block.botania:flower.agricarnationChibi": "Agricarnation Petite", - "block.botania:flower.agricarnationChibi.reference": "Viva o 25 de Abril", - "block.botania:flower.hopperhock": "Hopperhock", - "block.botania:flower.hopperhock.reference": "Tudo cai aqui", - "block.botania:flower.hopperhockChibi": "Hopperhock Petite", - "block.botania:flower.hopperhockChibi.reference": "Tudo cai aqui", - "block.botania:flower.tangleberrie": "Tangleberrie", - "block.botania:flower.tangleberrie.reference": "Proibido o uso de frigideiras", - "block.botania:flower.jiyuulia": "Jiyuulia", - "block.botania:flower.jiyuulia.reference": "Flügel der Freiheit", - "block.botania:flower.rannuncarpus": "Rannuncarpus", - "block.botania:flower.rannuncarpus.reference": "Uma mão na roda", - "block.botania:flower.rannuncarpusChibi": "Rannuncarpus Petite", - "block.botania:flower.rannuncarpusChibi.reference": "Uma mão na roda", - "block.botania:flower.hyacidus": "Hyacidus", - "block.botania:flower.hyacidus.reference": "Se você não andar, não machuca", - "block.botania:flower.pollidisiac": "Pollidisiac", - "block.botania:flower.pollidisiac.reference": "Pássaros e abelhas", - "block.botania:flower.clayconia": "Clayconia", - "block.botania:flower.clayconia.reference": "Rupees não incluídas", - "block.botania:flower.clayconiaChibi": "Clayconia", - "block.botania:flower.clayconiaChibi.reference": "Rupees não incluídas", - "block.botania:flower.loonium": "Loonium", - "block.botania:flower.loonium.reference": "Segure acima de sua cabeça", - "block.botania:flower.daffomill": "Daffomill", - "block.botania:flower.daffomill.reference": "Cook's Assistant", - "block.botania:flower.vinculotus": "Vinculotus", - "block.botania:flower.vinculotus.reference": "Uma imitação do Extra Utilities", - "block.botania:flower.spectranthemum": "Spectranthemum", - "block.botania:flower.spectranthemum.reference": "In the shell", - "block.botania:flower.medumone": "Medumone", - "block.botania:flower.medumone.reference": "Sólida como pedra", - "block.botania:flower.marimorphosis": "Marimorphosis", - "block.botania:flower.marimorphosis.reference": "U-M-U", - "block.botania:flower.marimorphosisChibi": "Marimorphosis Petite", - "block.botania:flower.marimorphosisChibi.reference": "U-M-R", - "block.botania:flower.bubbell": "Bubbell", - "block.botania:flower.bubbell.reference": "And whistle", - "block.botania:flower.bubbellChibi": "Bubbell Petite", - "block.botania:flower.bubbellChibi.reference": "And whistle", - "block.botania:flower.solegnolia": "Solegnolia", - "block.botania:flower.solegnolia.reference": "All your magnets are belong to us", - "block.botania:flower.solegnoliaChibi": "Solegnolia", - "block.botania:flower.solegnoliaChibi.reference": "All your magnets are belong to us", - "block.botania:flower.bergamute": "Bergamute", - "block.botania:flower.bergamute.reference": "Minha boca é um túmulo", + "block.botania.bellethorn": "Bellethorne", + "block.botania.bellethorn.reference": "O beijo da rosa", + "block.botania.bellethorn_chibi": "Bellethorne Petite", + "block.botania.bellethorn_chibi.reference": "O beijo da rosa", + "block.botania.dreadthorn": "Dreadthorne", + "block.botania.dreadthorn.reference": "Apenas uma espetada", + "block.botania.heisei_dream": "Heisei Dream", + "block.botania.heisei_dream.reference": "Heisei heisei", + "block.botania.tigerseye": "Tigerseye", + "block.botania.tigerseye.reference": "O tigre portátil", + "block.botania.jaded_amaranthus": "Jaded Amaranthus", + "block.botania.jaded_amaranthus.reference": "Alguns morreram por isso", + "block.botania.orechid": "Orechid", + "block.botania.orechid.reference": "Eu vi o que você plantou", + "block.botania.orechid_ignem": "Orechid Ignem", + "block.botania.orechid_ignem.reference": "Vermelha como rosas", + "block.botania.fallen_kanade": "Fallen Kanade", + "block.botania.fallen_kanade.reference": "Não sou um anjo", + "block.botania.exoflame": "Exoflame", + "block.botania.exoflame.reference": "Reagindo exotermicamente", + "block.botania.agricarnation": "Agricarnation", + "block.botania.agricarnation.reference": "Viva o 25 de abril", + "block.botania.agricarnation_chibi": "Agricarnation Petite", + "block.botania.agricarnation_chibi.reference": "Viva o 25 de Abril", + "block.botania.hopperhock": "Hopperhock", + "block.botania.hopperhock.reference": "Tudo cai aqui", + "block.botania.hopperhock_chibi": "Hopperhock Petite", + "block.botania.hopperhock_chibi.reference": "Tudo cai aqui", + "block.botania.tangleberrie": "Tangleberrie", + "block.botania.tangleberrie.reference": "Proibido o uso de frigideiras", + "block.botania.jiyuulia": "Jiyuulia", + "block.botania.jiyuulia.reference": "Flügel der Freiheit", + "block.botania.rannuncarpus": "Rannuncarpus", + "block.botania.rannuncarpus.reference": "Uma mão na roda", + "block.botania.rannuncarpus_chibi": "Rannuncarpus Petite", + "block.botania.rannuncarpus_chibi.reference": "Uma mão na roda", + "block.botania.hyacidus": "Hyacidus", + "block.botania.hyacidus.reference": "Se você não andar, não machuca", + "block.botania.pollidisiac": "Pollidisiac", + "block.botania.pollidisiac.reference": "Pássaros e abelhas", + "block.botania.clayconia": "Clayconia", + "block.botania.clayconia.reference": "Rupees não incluídas", + "block.botania.clayconia_chibi": "Clayconia", + "block.botania.clayconia_chibi.reference": "Rupees não incluídas", + "block.botania.loonium": "Loonium", + "block.botania.loonium.reference": "Segure acima de sua cabeça", + "block.botania.daffomill": "Daffomill", + "block.botania.daffomill.reference": "Cook's Assistant", + "block.botania.vinculotus": "Vinculotus", + "block.botania.vinculotus.reference": "Uma imitação do Extra Utilities", + "block.botania.spectranthemum": "Spectranthemum", + "block.botania.spectranthemum.reference": "In the shell", + "block.botania.medumone": "Medumone", + "block.botania.medumone.reference": "Sólida como pedra", + "block.botania.marimorphosis": "Marimorphosis", + "block.botania.marimorphosis.reference": "U-M-U", + "block.botania.marimorphosis_chibi": "Marimorphosis Petite", + "block.botania.marimorphosis_chibi.reference": "U-M-R", + "block.botania.bubbell": "Bubbell", + "block.botania.bubbell.reference": "And whistle", + "block.botania.bubbell_chibi": "Bubbell Petite", + "block.botania.bubbell_chibi.reference": "And whistle", + "block.botania.solegnolia": "Solegnolia", + "block.botania.solegnolia.reference": "All your magnets are belong to us", + "block.botania.solegnolia_chibi": "Solegnolia", + "block.botania.solegnolia_chibi.reference": "All your magnets are belong to us", + "block.botania.bergamute": "Bergamute", + "block.botania.bergamute.reference": "Minha boca é um túmulo", "item.botania:lexicon": "Lexica Botania", "item.botania:lexicon.bevo": "Lexica Botana", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index 86a92dd0d..d85f61992 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -1144,109 +1144,106 @@ "block.botania:altGrass5": "Мутировавшая Трава", "block.botania:animatedTorch": "Оживлённый факел", - "block.botania:flower.": "Цветок Botania", - "block.botania:flower..reference": "Если Вы видите это - значит что-то пошло не так, Вы должны сообщить об этом", + "block.botania.pure_daisy": "Чистая маргаритка", + "block.botania.pure_daisy.reference": "Каким цветом Вы хотите быть?", + "block.botania.manastar": "Звезда маны", + "block.botania.manastar.reference": "Загадай желание", - "block.botania:flower.puredaisy": "Чистая маргаритка", - "block.botania:flower.puredaisy.reference": "Каким цветом Вы хотите быть?", - "block.botania:flower.manastar": "Звезда маны", - "block.botania:flower.manastar.reference": "Загадай желание", + "block.botania.endoflame": "Пламя Края", + "block.botania.endoflame.reference": "Эндотермически реактивный", + "block.botania.hydroangeas": "Водогортензия", + "block.botania.hydroangeas.reference": "Просто дружелюбные ракообразные", + "block.botania.thermalily": "Теплолилия", + "block.botania.thermalily.reference": "Не рекомендуется для магов крови", + "block.botania.rosa_arcana": "Тайная роза", + "block.botania.rosa_arcana.reference": "Десять синих шаров в углу", + "block.botania.munchdew": "Жевательная роса", + "block.botania.munchdew.reference": "Это считается каннибализмом?", + "block.botania.entropinnyum": "Энтропиннум", + "block.botania.entropinnyum.reference": "Обращаться осторожно", + "block.botania.kekimurus": "Кикиморус", + "block.botania.kekimurus.reference": "Этот цветок - ложь", + "block.botania.gourmaryllis": "Гурмарилис", + "block.botania.gourmaryllis.reference": "Как неприятно", + "block.botania.narslimmus": "Слизевик", + "block.botania.narslimmus.reference": "Что это? Это всё липкое", + "block.botania.spectrolus": "Cпектролис", + "block.botania.spectrolus.reference": "Прибыль от ненависти", + "block.botania.dandelifeon": "Жизнеодуванчик", + "block.botania.dandelifeon.reference": "Такова жизнь", + "block.botania.rafflowsia": "Рафловзия", + "block.botania.rafflowsia.reference": "Ловушка для кошмара", + "block.botania.shulk_me_not": "Shulk Me Not", + "block.botania.shulk_me_not.reference": "Действительно чувствую это", - "block.botania:flower.endoflame": "Пламя Края", - "block.botania:flower.endoflame.reference": "Эндотермически реактивный", - "block.botania:flower.hydroangeas": "Водогортензия", - "block.botania:flower.hydroangeas.reference": "Просто дружелюбные ракообразные", - "block.botania:flower.thermalily": "Теплолилия", - "block.botania:flower.thermalily.reference": "Не рекомендуется для магов крови", - "block.botania:flower.arcanerose": "Тайная роза", - "block.botania:flower.arcanerose.reference": "Десять синих шаров в углу", - "block.botania:flower.munchdew": "Жевательная роса", - "block.botania:flower.munchdew.reference": "Это считается каннибализмом?", - "block.botania:flower.entropinnyum": "Энтропиннум", - "block.botania:flower.entropinnyum.reference": "Обращаться осторожно", - "block.botania:flower.kekimurus": "Кикиморус", - "block.botania:flower.kekimurus.reference": "Этот цветок - ложь", - "block.botania:flower.gourmaryllis": "Гурмарилис", - "block.botania:flower.gourmaryllis.reference": "Как неприятно", - "block.botania:flower.narslimmus": "Слизевик", - "block.botania:flower.narslimmus.reference": "Что это? Это всё липкое", - "block.botania:flower.spectrolus": "Cпектролис", - "block.botania:flower.spectrolus.reference": "Прибыль от ненависти", - "block.botania:flower.dandelifeon": "Жизнеодуванчик", - "block.botania:flower.dandelifeon.reference": "Такова жизнь", - "block.botania:flower.rafflowsia": "Рафловзия", - "block.botania:flower.rafflowsia.reference": "Ловушка для кошмара", - "block.botania:flower.shulk_me_not": "Shulk Me Not", - "block.botania:flower.shulk_me_not.reference": "Действительно чувствую это", - - "block.botania:flower.bellethorn": "Звоношип", - "block.botania:flower.bellethorn.reference": "Поцелуй розы", - "block.botania:flower.bellethornChibi": "Маленький Звоношип", - "block.botania:flower.bellethornChibi.reference": "Поцелуй розы", - "block.botania:flower.dreadthorn": "Страшношип", - "block.botania:flower.dreadthorn.reference": "Просто укол", - "block.botania:flower.heiseiDream": "Мечта Хэйсэй", - "block.botania:flower.heiseiDream.reference": "Безмятежность безмятежности", - "block.botania:flower.tigerseye": "Тигроглаз", - "block.botania:flower.tigerseye.reference": "Пиратский тигр", - "block.botania:flower.jadedAmaranthus": "Измученный амарант", - "block.botania:flower.jadedAmaranthus.reference": "Некоторые умерли из-за него", - "block.botania:flower.orechid": "Рудноцвет", - "block.botania:flower.orechid.reference": "Я вижу, что ты сделал", - "block.botania:flower.orechidIgnem": "Огненный рудноцвет", - "block.botania:flower.orechidIgnem.reference": "Красный, как розы", - "block.botania:flower.fallenKanade": "Павший Канадэ", - "block.botania:flower.fallenKanade.reference": "Я не Ангел", - "block.botania:flower.exoflame": "Экзопламя", - "block.botania:flower.exoflame.reference": "Экзотермически реактивный", - "block.botania:flower.agricarnation": "Агрогвоздика", - "block.botania:flower.agricarnation.reference": "Надевается на 25-е апреля", - "block.botania:flower.agricarnationChibi": "Маленькая Агрогвоздика", - "block.botania:flower.agricarnationChibi.reference": "Надевается на 25-е апреля", - "block.botania:flower.hopperhock": "Вороток", - "block.botania:flower.hopperhock.reference": "Всё падает в него", - "block.botania:flower.hopperhockChibi": "Маленький Вороток", - "block.botania:flower.hopperhockChibi.reference": "Всё падает в него", - "block.botania:flower.tangleberrie": "Путоягода", - "block.botania:flower.tangleberrie.reference": "Не разрешено сковородами", - "block.botania:flower.jiyuulia": "Джиулия", - "block.botania:flower.jiyuulia.reference": "Крылья свободы", - "block.botania:flower.rannuncarpus": "Раннункарпус", - "block.botania:flower.rannuncarpus.reference": "Это удобно", - "block.botania:flower.rannuncarpusChibi": "Маленький Раннункарпус", - "block.botania:flower.rannuncarpusChibi.reference": "Это удобно", - "block.botania:flower.hyacidus": "Гаяцидус", - "block.botania:flower.hyacidus.reference": "Если вы не ходите, он не повредит", - "block.botania:flower.pollidisiac": "Поллидизиак", - "block.botania:flower.pollidisiac.reference": "Птички и пчёлки", - "block.botania:flower.clayconia": "Глинарцисс", - "block.botania:flower.clayconia.reference": "Rupees not included", - "block.botania:flower.clayconiaChibi": "Clayconia Petite", - "block.botania:flower.clayconiaChibi.reference": "Рупии не включены", - "block.botania:flower.loonium": "Лутюльпан", - "block.botania:flower.loonium.reference": "Держите его над своей головой", - "block.botania:flower.daffomill": "Тупомельник", - "block.botania:flower.daffomill.reference": "Помощник повара", - "block.botania:flower.vinculotus": "Винолотос", - "block.botania:flower.vinculotus.reference": "Полный грабёж ExtraUtils", - "block.botania:flower.spectranthemum": "Спектрантимум", - "block.botania:flower.spectranthemum.reference": "В оболочке", - "block.botania:flower.medumone": "Медумон", - "block.botania:flower.medumone.reference": "Твердый как камень", - "block.botania:flower.marimorphosis": "Мариморфозис", - "block.botania:flower.marimorphosis.reference": "U-M-R", - "block.botania:flower.marimorphosisChibi": "Маленький Мариморфозис", - "block.botania:flower.marimorphosisChibi.reference": "U-M-R", - "block.botania:flower.bubbell": "Бубл", - "block.botania:flower.bubbell.reference": "И свисток", - "block.botania:flower.bubbellChibi": "Маленький Бубл", - "block.botania:flower.bubbellChibi.reference": "И свисток", - "block.botania:flower.solegnolia": "Солегнолия", - "block.botania:flower.solegnolia.reference": "Все ваши магниты принадлежат нам", - "block.botania:flower.solegnoliaChibi": "Маленькая Солегнолия", - "block.botania:flower.solegnoliaChibi.reference": "Все ваши магниты принадлежат нам", - "block.botania:flower.bergamute": "Bergamute", - "block.botania:flower.bergamute.reference": "Мои губы запечатаны", + "block.botania.bellethorn": "Звоношип", + "block.botania.bellethorn.reference": "Поцелуй розы", + "block.botania.bellethorn_chibi": "Маленький Звоношип", + "block.botania.bellethorn_chibi.reference": "Поцелуй розы", + "block.botania.dreadthorn": "Страшношип", + "block.botania.dreadthorn.reference": "Просто укол", + "block.botania.heisei_dream": "Мечта Хэйсэй", + "block.botania.heisei_dream.reference": "Безмятежность безмятежности", + "block.botania.tigerseye": "Тигроглаз", + "block.botania.tigerseye.reference": "Пиратский тигр", + "block.botania.jaded_amaranthus": "Измученный амарант", + "block.botania.jaded_amaranthus.reference": "Некоторые умерли из-за него", + "block.botania.orechid": "Рудноцвет", + "block.botania.orechid.reference": "Я вижу, что ты сделал", + "block.botania.orechid_ignem": "Огненный рудноцвет", + "block.botania.orechid_ignem.reference": "Красный, как розы", + "block.botania.fallen_kanade": "Павший Канадэ", + "block.botania.fallen_kanade.reference": "Я не Ангел", + "block.botania.exoflame": "Экзопламя", + "block.botania.exoflame.reference": "Экзотермически реактивный", + "block.botania.agricarnation": "Агрогвоздика", + "block.botania.agricarnation.reference": "Надевается на 25-е апреля", + "block.botania.agricarnation_chibi": "Маленькая Агрогвоздика", + "block.botania.agricarnation_chibi.reference": "Надевается на 25-е апреля", + "block.botania.hopperhock": "Вороток", + "block.botania.hopperhock.reference": "Всё падает в него", + "block.botania.hopperhock_chibi": "Маленький Вороток", + "block.botania.hopperhock_chibi.reference": "Всё падает в него", + "block.botania.tangleberrie": "Путоягода", + "block.botania.tangleberrie.reference": "Не разрешено сковородами", + "block.botania.jiyuulia": "Джиулия", + "block.botania.jiyuulia.reference": "Крылья свободы", + "block.botania.rannuncarpus": "Раннункарпус", + "block.botania.rannuncarpus.reference": "Это удобно", + "block.botania.rannuncarpus_chibi": "Маленький Раннункарпус", + "block.botania.rannuncarpus_chibi.reference": "Это удобно", + "block.botania.hyacidus": "Гаяцидус", + "block.botania.hyacidus.reference": "Если вы не ходите, он не повредит", + "block.botania.pollidisiac": "Поллидизиак", + "block.botania.pollidisiac.reference": "Птички и пчёлки", + "block.botania.clayconia": "Глинарцисс", + "block.botania.clayconia.reference": "Rupees not included", + "block.botania.clayconia_chibi": "Clayconia Petite", + "block.botania.clayconia_chibi.reference": "Рупии не включены", + "block.botania.loonium": "Лутюльпан", + "block.botania.loonium.reference": "Держите его над своей головой", + "block.botania.daffomill": "Тупомельник", + "block.botania.daffomill.reference": "Помощник повара", + "block.botania.vinculotus": "Винолотос", + "block.botania.vinculotus.reference": "Полный грабёж ExtraUtils", + "block.botania.spectranthemum": "Спектрантимум", + "block.botania.spectranthemum.reference": "В оболочке", + "block.botania.medumone": "Медумон", + "block.botania.medumone.reference": "Твердый как камень", + "block.botania.marimorphosis": "Мариморфозис", + "block.botania.marimorphosis.reference": "U-M-R", + "block.botania.marimorphosis_chibi": "Маленький Мариморфозис", + "block.botania.marimorphosis_chibi.reference": "U-M-R", + "block.botania.bubbell": "Бубл", + "block.botania.bubbell.reference": "И свисток", + "block.botania.bubbell_chibi": "Маленький Бубл", + "block.botania.bubbell_chibi.reference": "И свисток", + "block.botania.solegnolia": "Солегнолия", + "block.botania.solegnolia.reference": "Все ваши магниты принадлежат нам", + "block.botania.solegnolia_chibi": "Маленькая Солегнолия", + "block.botania.solegnolia_chibi.reference": "Все ваши магниты принадлежат нам", + "block.botania.bergamute": "Bergamute", + "block.botania.bergamute.reference": "Мои губы запечатаны", "item.botania:lexicon": "Лексика Botania", "item.botania:lexicon.bevo": "Лексика Botania", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index 0a593a2b4..b4b218708 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -1085,109 +1085,106 @@ "block.botania:mutated_grass": "异变草地", "block.botania:animatedTorch": "活化红石火把", - "block.botania:flower.": "植物魔法花", - "block.botania:flower..reference": "如果你看到这个,说明有什么出错了,你应该报告这个错误", + "block.botania.pure_daisy": "白雏菊", + "block.botania.pure_daisy.reference": "你想变成什么颜色?", + "block.botania.manastar": "魔力星", + "block.botania.manastar.reference": "繁星下许愿", - "block.botania:flower.puredaisy": "白雏菊", - "block.botania:flower.puredaisy.reference": "你想变成什么颜色?", - "block.botania:flower.manastar": "魔力星", - "block.botania:flower.manastar.reference": "繁星下许愿", + "block.botania.endoflame": "火红莲", + "block.botania.endoflame.reference": "吸热反应", + "block.botania.hydroangeas": "水绣球", + "block.botania.hydroangeas.reference": "友好的甲壳类动物", + "block.botania.thermalily": "炽玫瑰", + "block.botania.thermalily.reference": "不适合血法", + "block.botania.rosa_arcana": "阿卡纳蔷薇", + "block.botania.rosa_arcana.reference": "角落里的经验球", + "block.botania.munchdew": "咀叶花", + "block.botania.munchdew.reference": "这也算自相残杀?", + "block.botania.entropinnyum": "热爆花", + "block.botania.entropinnyum.reference": "小心轻放", + "block.botania.kekimurus": "贪食花", + "block.botania.kekimurus.reference": "这朵花是个谎言", + "block.botania.gourmaryllis": "彼方兰", + "block.botania.gourmaryllis.reference": "不愉快です", + "block.botania.narslimmus": "粘球草", + "block.botania.narslimmus.reference": "这是什么? 粘粘的", + "block.botania.spectrolus": "斑斓花", + "block.botania.spectrolus.reference": "挑剔的家伙", + "block.botania.dandelifeon": "启命英", + "block.botania.dandelifeon.reference": "这就是生活", + "block.botania.rafflowsia": "噬草花", + "block.botania.rafflowsia.reference": "陷阱噩梦", + "block.botania.shulk_me_not": "Shulk Me Not", + "block.botania.shulk_me_not.reference": "哦,这感觉...", - "block.botania:flower.endoflame": "火红莲", - "block.botania:flower.endoflame.reference": "吸热反应", - "block.botania:flower.hydroangeas": "水绣球", - "block.botania:flower.hydroangeas.reference": "友好的甲壳类动物", - "block.botania:flower.thermalily": "炽玫瑰", - "block.botania:flower.thermalily.reference": "不适合血法", - "block.botania:flower.arcanerose": "阿卡纳蔷薇", - "block.botania:flower.arcanerose.reference": "角落里的经验球", - "block.botania:flower.munchdew": "咀叶花", - "block.botania:flower.munchdew.reference": "这也算自相残杀?", - "block.botania:flower.entropinnyum": "热爆花", - "block.botania:flower.entropinnyum.reference": "小心轻放", - "block.botania:flower.kekimurus": "贪食花", - "block.botania:flower.kekimurus.reference": "这朵花是个谎言", - "block.botania:flower.gourmaryllis": "彼方兰", - "block.botania:flower.gourmaryllis.reference": "不愉快です", - "block.botania:flower.narslimmus": "粘球草", - "block.botania:flower.narslimmus.reference": "这是什么? 粘粘的", - "block.botania:flower.spectrolus": "斑斓花", - "block.botania:flower.spectrolus.reference": "挑剔的家伙", - "block.botania:flower.dandelifeon": "启命英", - "block.botania:flower.dandelifeon.reference": "这就是生活", - "block.botania:flower.rafflowsia": "噬草花", - "block.botania:flower.rafflowsia.reference": "陷阱噩梦", - "block.botania:flower.shulk_me_not": "Shulk Me Not", - "block.botania:flower.shulk_me_not.reference": "哦,这感觉...", - - "block.botania:flower.bellethorn": "娇媚之刺", - "block.botania:flower.bellethorn.reference": "世界的尽头,少女的回旋曲", - "block.botania:flower.bellethornChibi": "小娇媚之刺", - "block.botania:flower.bellethornChibi.reference": "世界的尽头,少女的回旋曲", - "block.botania:flower.dreadthorn": "恐惧之刺", - "block.botania:flower.dreadthorn.reference": "C计划", - "block.botania:flower.heiseiDream": "平成之梦", - "block.botania:flower.heiseiDream.reference": "平成,平成,崩坏...", - "block.botania:flower.tigerseye": "虎之眼", - "block.botania:flower.tigerseye.reference": "掌上老虎", - "block.botania:flower.jadedAmaranthus": "翡翠苋", - "block.botania:flower.jadedAmaranthus.reference": "一对情侣因此而死", - "block.botania:flower.orechid": "凝矿兰", - "block.botania:flower.orechid.reference": "你挖了什么我就种了什么", - "block.botania:flower.orechidIgnem": "炎矿兰", - "block.botania:flower.orechidIgnem.reference": "如玫瑰般红", - "block.botania:flower.fallenKanade": "天降之奏", - "block.botania:flower.fallenKanade.reference": "我不是天使", - "block.botania:flower.exoflame": "冶炼火", - "block.botania:flower.exoflame.reference": "系上她的黑丝带", - "block.botania:flower.agricarnation": "田园康乃馨", - "block.botania:flower.agricarnation.reference": "又到了四月二十五日", - "block.botania:flower.agricarnationChibi": "小田园康乃馨", - "block.botania:flower.agricarnationChibi.reference": "又到了四月二十五日", - "block.botania:flower.hopperhock": "漏斗花", - "block.botania:flower.hopperhock.reference": "它完全就是个漏斗", - "block.botania:flower.hopperhockChibi": "小漏斗花", - "block.botania:flower.hopperhockChibi.reference": "它完全就是个漏斗", - "block.botania:flower.tangleberrie": "束缚莓", - "block.botania:flower.tangleberrie.reference": "禁止使用煎锅", - "block.botania:flower.jiyuulia": "自由之翼", - "block.botania:flower.jiyuulia.reference": "自由之翼", - "block.botania:flower.rannuncarpus": "手掌花", - "block.botania:flower.rannuncarpus.reference": "十分便利", - "block.botania:flower.rannuncarpusChibi": "小手掌花", - "block.botania:flower.rannuncarpusChibi.reference": "十分便利", - "block.botania:flower.hyacidus": "毒风信", - "block.botania:flower.hyacidus.reference": "你不跑的话,就不会受伤", - "block.botania:flower.pollidisiac": "畜牧花", - "block.botania:flower.pollidisiac.reference": "鸟与蜜蜂", - "block.botania:flower.clayconia": "粘土花", - "block.botania:flower.clayconia.reference": "不包括卢比", - "block.botania:flower.clayconiaChibi": "小粘土花", - "block.botania:flower.clayconiaChibi.reference": "不包括卢比", - "block.botania:flower.loonium": "聚宝花", - "block.botania:flower.loonium.reference": "好好珍惜它", - "block.botania:flower.daffomill": "扇水仙", - "block.botania:flower.daffomill.reference": "厨师的好帮手", - "block.botania:flower.vinculotus": "诱引莲", - "block.botania:flower.vinculotus.reference": "完全就是抄袭更多实用设备", - "block.botania:flower.spectranthemum": "凌空蓟", - "block.botania:flower.spectranthemum.reference": "装弹发射", - "block.botania:flower.medumone": "石化草", - "block.botania:flower.medumone.reference": "自始至终潜伏于此", - "block.botania:flower.marimorphosis": "异构花", - "block.botania:flower.marimorphosis.reference": "像岩石般坚硬", - "block.botania:flower.marimorphosisChibi": "小异构花", - "block.botania:flower.marimorphosisChibi.reference": "像岩石般坚硬", - "block.botania:flower.bubbell": "气泡铃", - "block.botania:flower.bubbell.reference": "吐出泡泡", - "block.botania:flower.bubbellChibi": "小气泡铃", - "block.botania:flower.bubbellChibi.reference": "吐出泡泡", - "block.botania:flower.solegnolia": "弱磁兰", - "block.botania:flower.solegnolia.reference": "你的磁力都归我们了", - "block.botania:flower.solegnoliaChibi": "小弱磁兰", - "block.botania:flower.solegnoliaChibi.reference": "你的磁力都归我们了", - "block.botania:flower.bergamute": "消音柑", - "block.botania:flower.bergamute.reference": "啊咧嘴被堵上了", + "block.botania.bellethorn": "娇媚之刺", + "block.botania.bellethorn.reference": "世界的尽头,少女的回旋曲", + "block.botania.bellethorn_chibi": "小娇媚之刺", + "block.botania.bellethorn_chibi.reference": "世界的尽头,少女的回旋曲", + "block.botania.dreadthorn": "恐惧之刺", + "block.botania.dreadthorn.reference": "C计划", + "block.botania.heisei_dream": "平成之梦", + "block.botania.heisei_dream.reference": "平成,平成,崩坏...", + "block.botania.tigerseye": "虎之眼", + "block.botania.tigerseye.reference": "掌上老虎", + "block.botania.jaded_amaranthus": "翡翠苋", + "block.botania.jaded_amaranthus.reference": "一对情侣因此而死", + "block.botania.orechid": "凝矿兰", + "block.botania.orechid.reference": "你挖了什么我就种了什么", + "block.botania.orechid_ignem": "炎矿兰", + "block.botania.orechid_ignem.reference": "如玫瑰般红", + "block.botania.fallen_kanade": "天降之奏", + "block.botania.fallen_kanade.reference": "我不是天使", + "block.botania.exoflame": "冶炼火", + "block.botania.exoflame.reference": "系上她的黑丝带", + "block.botania.agricarnation": "田园康乃馨", + "block.botania.agricarnation.reference": "又到了四月二十五日", + "block.botania.agricarnation_chibi": "小田园康乃馨", + "block.botania.agricarnation_chibi.reference": "又到了四月二十五日", + "block.botania.hopperhock": "漏斗花", + "block.botania.hopperhock.reference": "它完全就是个漏斗", + "block.botania.hopperhock_chibi": "小漏斗花", + "block.botania.hopperhock_chibi.reference": "它完全就是个漏斗", + "block.botania.tangleberrie": "束缚莓", + "block.botania.tangleberrie.reference": "禁止使用煎锅", + "block.botania.jiyuulia": "自由之翼", + "block.botania.jiyuulia.reference": "自由之翼", + "block.botania.rannuncarpus": "手掌花", + "block.botania.rannuncarpus.reference": "十分便利", + "block.botania.rannuncarpus_chibi": "小手掌花", + "block.botania.rannuncarpus_chibi.reference": "十分便利", + "block.botania.hyacidus": "毒风信", + "block.botania.hyacidus.reference": "你不跑的话,就不会受伤", + "block.botania.pollidisiac": "畜牧花", + "block.botania.pollidisiac.reference": "鸟与蜜蜂", + "block.botania.clayconia": "粘土花", + "block.botania.clayconia.reference": "不包括卢比", + "block.botania.clayconia_chibi": "小粘土花", + "block.botania.clayconia_chibi.reference": "不包括卢比", + "block.botania.loonium": "聚宝花", + "block.botania.loonium.reference": "好好珍惜它", + "block.botania.daffomill": "扇水仙", + "block.botania.daffomill.reference": "厨师的好帮手", + "block.botania.vinculotus": "诱引莲", + "block.botania.vinculotus.reference": "完全就是抄袭更多实用设备", + "block.botania.spectranthemum": "凌空蓟", + "block.botania.spectranthemum.reference": "装弹发射", + "block.botania.medumone": "石化草", + "block.botania.medumone.reference": "自始至终潜伏于此", + "block.botania.marimorphosis": "异构花", + "block.botania.marimorphosis.reference": "像岩石般坚硬", + "block.botania.marimorphosis_chibi": "小异构花", + "block.botania.marimorphosis_chibi.reference": "像岩石般坚硬", + "block.botania.bubbell": "气泡铃", + "block.botania.bubbell.reference": "吐出泡泡", + "block.botania.bubbell_chibi": "小气泡铃", + "block.botania.bubbell_chibi.reference": "吐出泡泡", + "block.botania.solegnolia": "弱磁兰", + "block.botania.solegnolia.reference": "你的磁力都归我们了", + "block.botania.solegnolia_chibi": "小弱磁兰", + "block.botania.solegnolia_chibi.reference": "你的磁力都归我们了", + "block.botania.bergamute": "消音柑", + "block.botania.bergamute.reference": "啊咧嘴被堵上了", "item.botania:lexicon": "植物魔法辞典", "item.botania:lexicon.bevo": "植物魔法辞典", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index c2d627033..a3024ccfb 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -1086,119 +1086,116 @@ "block.botania:infused_grass": "注魔草地", "block.botania:mutated_grass": "異變草地", - "block.botania:flower.": "植物魔法花", - "block.botania:flower..reference": "如果你看到這個,說明有什麼出錯了,你應該回報這個錯誤", + "block.botania.pure_daisy": "白雛菊", + "block.botania.pure_daisy.reference": "你想變成什麼顏色?", + "block.botania.manastar": "瑪那星", + "block.botania.manastar.reference": "繁星下許願", - "block.botania:flower.puredaisy": "白雛菊", - "block.botania:flower.puredaisy.reference": "你想變成什麼顏色?", - "block.botania:flower.manastar": "瑪那星", - "block.botania:flower.manastar.reference": "繁星下許願", + "block.botania.daybloom": "太陽花", + "block.botania.daybloom.reference": "刺眼的光", + "block.botania.daybloomDecor": "小太陽花", + "block.botania.daybloomDecor.reference": "刺眼的光", + "block.botania.daybloomPrime": "始祖太陽花", + "block.botania.daybloomPrime.reference": "你不應該擁有這個", + "block.botania.endoflame": "火紅蓮", + "block.botania.endoflame.reference": "延遲發射", + "block.botania.hydroangeas": "水繡球", + "block.botania.hydroangeas.reference": "友好的甲殼類動物", + "block.botania.hydroangeasDecor": "水繡球", + "block.botania.hydroangeasDecor.reference": "友好的甲殼類動物", + "block.botania.thermalily": "熾玫瑰", + "block.botania.thermalily.reference": "如此鮮紅的玫瑰", + "block.botania.nightshade": "夜顛茄", + "block.botania.nightshade.reference": "可怕的樣子", + "block.botania.nightshadePrime": "始祖夜顛茄", + "block.botania.nightshadePrime.reference": "你不應該擁有這個", + "block.botania.nightshadeDecor": "夜顛茄", + "block.botania.nightshadeDecor.reference": "可怕的樣子", + "block.botania.rosa_arcana": "阿卡納薔薇", + "block.botania.rosa_arcana.reference": "角落裡的經驗球", + "block.botania.munchdew": "咀葉花", + "block.botania.munchdew.reference": "噥噥的美術老師", + "block.botania.entropinnyum": "熵花", + "block.botania.entropinnyum.reference": "你可以選擇成為魔法少女", + "block.botania.kekimurus": "貪食花", + "block.botania.kekimurus.reference": "這朵花是個謊言", + "block.botania.gourmaryllis": "彼方蘭", + "block.botania.gourmaryllis.reference": "不愉快です", + "block.botania.narslimmus": "黏球草", + "block.botania.narslimmus.reference": "這是什麼? 黏黏的", + "block.botania.spectrolus": "斑斕花", + "block.botania.spectrolus.reference": "挑剔的傢伙", + "block.botania.dandelifeon": "啟命英", + "block.botania.dandelifeon.reference": "這就是生活", + "block.botania.rafflowsia": "噬草花", + "block.botania.rafflowsia.reference": "陷阱噩夢", - "block.botania:flower.daybloom": "太陽花", - "block.botania:flower.daybloom.reference": "刺眼的光", - "block.botania:flower.daybloomDecor": "小太陽花", - "block.botania:flower.daybloomDecor.reference": "刺眼的光", - "block.botania:flower.daybloomPrime": "始祖太陽花", - "block.botania:flower.daybloomPrime.reference": "你不應該擁有這個", - "block.botania:flower.endoflame": "火紅蓮", - "block.botania:flower.endoflame.reference": "延遲發射", - "block.botania:flower.hydroangeas": "水繡球", - "block.botania:flower.hydroangeas.reference": "友好的甲殼類動物", - "block.botania:flower.hydroangeasDecor": "水繡球", - "block.botania:flower.hydroangeasDecor.reference": "友好的甲殼類動物", - "block.botania:flower.thermalily": "熾玫瑰", - "block.botania:flower.thermalily.reference": "如此鮮紅的玫瑰", - "block.botania:flower.nightshade": "夜顛茄", - "block.botania:flower.nightshade.reference": "可怕的樣子", - "block.botania:flower.nightshadePrime": "始祖夜顛茄", - "block.botania:flower.nightshadePrime.reference": "你不應該擁有這個", - "block.botania:flower.nightshadeDecor": "夜顛茄", - "block.botania:flower.nightshadeDecor.reference": "可怕的樣子", - "block.botania:flower.arcanerose": "阿卡納薔薇", - "block.botania:flower.arcanerose.reference": "角落裡的經驗球", - "block.botania:flower.munchdew": "咀葉花", - "block.botania:flower.munchdew.reference": "噥噥的美術老師", - "block.botania:flower.entropinnyum": "熵花", - "block.botania:flower.entropinnyum.reference": "你可以選擇成為魔法少女", - "block.botania:flower.kekimurus": "貪食花", - "block.botania:flower.kekimurus.reference": "這朵花是個謊言", - "block.botania:flower.gourmaryllis": "彼方蘭", - "block.botania:flower.gourmaryllis.reference": "不愉快です", - "block.botania:flower.narslimmus": "黏球草", - "block.botania:flower.narslimmus.reference": "這是什麼? 黏黏的", - "block.botania:flower.spectrolus": "斑斕花", - "block.botania:flower.spectrolus.reference": "挑剔的傢伙", - "block.botania:flower.dandelifeon": "啟命英", - "block.botania:flower.dandelifeon.reference": "這就是生活", - "block.botania:flower.rafflowsia": "噬草花", - "block.botania:flower.rafflowsia.reference": "陷阱噩夢", - - "block.botania:flower.bellethorn": "嬌媚之刺", - "block.botania:flower.bellethorn.reference": "世界的盡頭,少女的迴旋曲", - "block.botania:flower.bellethornChibi": "小嬌媚之刺", - "block.botania:flower.bellethornChibi.reference": "世界的盡頭,少女的迴旋曲", - "block.botania:flower.dreadthorn": "恐懼之刺", - "block.botania:flower.dreadthorn.reference": "C計劃", - "block.botania:flower.heiseiDream": "平成之夢", - "block.botania:flower.heiseiDream.reference": "平成,平成,崩壞...", - "block.botania:flower.tigerseye": "虎之眼", - "block.botania:flower.tigerseye.reference": "掌中老虎", - "block.botania:flower.jadedAmaranthus": "翡翠莧", - "block.botania:flower.jadedAmaranthus.reference": "一對情侶因此而死", - "block.botania:flower.orechid": "凝礦蘭", - "block.botania:flower.orechid.reference": "你挖了什麼我就種了什麼", - "block.botania:flower.orechidIgnem": "炎礦蘭", - "block.botania:flower.orechidIgnem.reference": "如玫瑰般紅", - "block.botania:flower.fallenKanade": "天降之奏", - "block.botania:flower.fallenKanade.reference": "我不是天使", - "block.botania:flower.exoflame": "冶煉火", - "block.botania:flower.exoflame.reference": "繫上她的黑絲帶", - "block.botania:flower.agricarnation": "田園康乃馨", - "block.botania:flower.agricarnation.reference": "又到了四月二十五日", - "block.botania:flower.agricarnationChibi": "小田園康乃馨", - "block.botania:flower.agricarnationChibi.reference": "又到了四月二十五日", - "block.botania:flower.hopperhock": "漏斗花", - "block.botania:flower.hopperhock.reference": "它完全就是個漏斗", - "block.botania:flower.hopperhockChibi": "小漏斗花", - "block.botania:flower.hopperhockChibi.reference": "它完全就是個漏斗", - "block.botania:flower.tangleberrie": "束縛莓", - "block.botania:flower.tangleberrie.reference": "禁止使用煎鍋", - "block.botania:flower.jiyuulia": "自由之翼", - "block.botania:flower.jiyuulia.reference": "自由之翼", - "block.botania:flower.rannuncarpus": "手掌花", - "block.botania:flower.rannuncarpus.reference": "十分便利", - "block.botania:flower.rannuncarpusChibi": "小手掌花", - "block.botania:flower.rannuncarpusChibi.reference": "十分便利", - "block.botania:flower.hyacidus": "毒風信", - "block.botania:flower.hyacidus.reference": "你不跑的話,就不會受傷", - "block.botania:flower.pollidisiac": "畜牧花", - "block.botania:flower.pollidisiac.reference": "鳥與蜜蜂", - "block.botania:flower.clayconia": "黏土花", - "block.botania:flower.clayconia.reference": "不包括盧比", - "block.botania:flower.clayconiaChibi": "小黏土花", - "block.botania:flower.clayconiaChibi.reference": "不包括盧比", - "block.botania:flower.loonium": "聚寶花", - "block.botania:flower.loonium.reference": "好好珍惜它", - "block.botania:flower.daffomill": "扇水仙", - "block.botania:flower.daffomill.reference": "廚師的好幫手", - "block.botania:flower.vinculotus": "誘引蓮", - "block.botania:flower.vinculotus.reference": "完全就是抄襲更多實用設備", - "block.botania:flower.spectranthemum": "凌空薊", - "block.botania:flower.spectranthemum.reference": "裝彈發射", - "block.botania:flower.medumone": "石化草", - "block.botania:flower.medumone.reference": "自始至終潛伏於此", - "block.botania:flower.marimorphosis": "異構花", - "block.botania:flower.marimorphosis.reference": "像岩石般堅硬", - "block.botania:flower.marimorphosisChibi": "小異構花", - "block.botania:flower.marimorphosisChibi.reference": "像岩石般堅硬", - "block.botania:flower.bubbell": "氣泡鈴", - "block.botania:flower.bubbell.reference": "吐出泡泡", - "block.botania:flower.bubbellChibi": "小氣泡鈴", - "block.botania:flower.bubbellChibi.reference": "吐出泡泡", - "block.botania:flower.solegnolia": "弱磁蘭", - "block.botania:flower.solegnolia.reference": "你的磁力都歸我們了", - "block.botania:flower.solegnoliaChibi": "小弱磁蘭", - "block.botania:flower.solegnoliaChibi.reference": "你的磁力都歸我們了", + "block.botania.bellethorn": "嬌媚之刺", + "block.botania.bellethorn.reference": "世界的盡頭,少女的迴旋曲", + "block.botania.bellethorn_chibi": "小嬌媚之刺", + "block.botania.bellethorn_chibi.reference": "世界的盡頭,少女的迴旋曲", + "block.botania.dreadthorn": "恐懼之刺", + "block.botania.dreadthorn.reference": "C計劃", + "block.botania.heisei_dream": "平成之夢", + "block.botania.heisei_dream.reference": "平成,平成,崩壞...", + "block.botania.tigerseye": "虎之眼", + "block.botania.tigerseye.reference": "掌中老虎", + "block.botania.jaded_amaranthus": "翡翠莧", + "block.botania.jaded_amaranthus.reference": "一對情侶因此而死", + "block.botania.orechid": "凝礦蘭", + "block.botania.orechid.reference": "你挖了什麼我就種了什麼", + "block.botania.orechid_ignem": "炎礦蘭", + "block.botania.orechid_ignem.reference": "如玫瑰般紅", + "block.botania.fallen_kanade": "天降之奏", + "block.botania.fallen_kanade.reference": "我不是天使", + "block.botania.exoflame": "冶煉火", + "block.botania.exoflame.reference": "繫上她的黑絲帶", + "block.botania.agricarnation": "田園康乃馨", + "block.botania.agricarnation.reference": "又到了四月二十五日", + "block.botania.agricarnation_chibi": "小田園康乃馨", + "block.botania.agricarnation_chibi.reference": "又到了四月二十五日", + "block.botania.hopperhock": "漏斗花", + "block.botania.hopperhock.reference": "它完全就是個漏斗", + "block.botania.hopperhock_chibi": "小漏斗花", + "block.botania.hopperhock_chibi.reference": "它完全就是個漏斗", + "block.botania.tangleberrie": "束縛莓", + "block.botania.tangleberrie.reference": "禁止使用煎鍋", + "block.botania.jiyuulia": "自由之翼", + "block.botania.jiyuulia.reference": "自由之翼", + "block.botania.rannuncarpus": "手掌花", + "block.botania.rannuncarpus.reference": "十分便利", + "block.botania.rannuncarpus_chibi": "小手掌花", + "block.botania.rannuncarpus_chibi.reference": "十分便利", + "block.botania.hyacidus": "毒風信", + "block.botania.hyacidus.reference": "你不跑的話,就不會受傷", + "block.botania.pollidisiac": "畜牧花", + "block.botania.pollidisiac.reference": "鳥與蜜蜂", + "block.botania.clayconia": "黏土花", + "block.botania.clayconia.reference": "不包括盧比", + "block.botania.clayconia_chibi": "小黏土花", + "block.botania.clayconia_chibi.reference": "不包括盧比", + "block.botania.loonium": "聚寶花", + "block.botania.loonium.reference": "好好珍惜它", + "block.botania.daffomill": "扇水仙", + "block.botania.daffomill.reference": "廚師的好幫手", + "block.botania.vinculotus": "誘引蓮", + "block.botania.vinculotus.reference": "完全就是抄襲更多實用設備", + "block.botania.spectranthemum": "凌空薊", + "block.botania.spectranthemum.reference": "裝彈發射", + "block.botania.medumone": "石化草", + "block.botania.medumone.reference": "自始至終潛伏於此", + "block.botania.marimorphosis": "異構花", + "block.botania.marimorphosis.reference": "像岩石般堅硬", + "block.botania.marimorphosis_chibi": "小異構花", + "block.botania.marimorphosis_chibi.reference": "像岩石般堅硬", + "block.botania.bubbell": "氣泡鈴", + "block.botania.bubbell.reference": "吐出泡泡", + "block.botania.bubbell_chibi": "小氣泡鈴", + "block.botania.bubbell_chibi.reference": "吐出泡泡", + "block.botania.solegnolia": "弱磁蘭", + "block.botania.solegnolia.reference": "你的磁力都歸我們了", + "block.botania.solegnolia_chibi": "小弱磁蘭", + "block.botania.solegnolia_chibi.reference": "你的磁力都歸我們了", "item.botania:lexicon": "植物魔法辭典", "item.botania:lexicon.bevo": "植物魔法辭典", diff --git a/src/main/resources/assets/botania/models/block/agricarnation.json b/src/main/resources/assets/botania/models/block/agricarnation.json new file mode 100644 index 000000000..deb9f375a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/agricarnation.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_agricarnation" + } +} diff --git a/src/main/resources/assets/botania/models/block/agricarnation_chibi.json b/src/main/resources/assets/botania/models/block/agricarnation_chibi.json new file mode 100644 index 000000000..bd31b6936 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/agricarnation_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_agricarnation_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/bellethorn.json b/src/main/resources/assets/botania/models/block/bellethorn.json new file mode 100644 index 000000000..2c555a23b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bellethorn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_bellethorne" + } +} diff --git a/src/main/resources/assets/botania/models/block/bellethorn_chibi.json b/src/main/resources/assets/botania/models/block/bellethorn_chibi.json new file mode 100644 index 000000000..78084d3b7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bellethorn_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_bellethorne_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/bergamute.json b/src/main/resources/assets/botania/models/block/bergamute.json new file mode 100644 index 000000000..1a56599dd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bergamute.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_bergamute" + } +} diff --git a/src/main/resources/assets/botania/models/block/bubbell.json b/src/main/resources/assets/botania/models/block/bubbell.json new file mode 100644 index 000000000..5a9536b9b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bubbell.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_bubbell" + } +} diff --git a/src/main/resources/assets/botania/models/block/bubbell_chibi.json b/src/main/resources/assets/botania/models/block/bubbell_chibi.json new file mode 100644 index 000000000..8dcc2af9a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bubbell_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_bubbell_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/clayconia.json b/src/main/resources/assets/botania/models/block/clayconia.json new file mode 100644 index 000000000..a53f14e2d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/clayconia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_clayconia" + } +} diff --git a/src/main/resources/assets/botania/models/block/clayconia_chibi.json b/src/main/resources/assets/botania/models/block/clayconia_chibi.json new file mode 100644 index 000000000..c88b7ebd7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/clayconia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_clayconia_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/daffomill.json b/src/main/resources/assets/botania/models/block/daffomill.json new file mode 100644 index 000000000..cd2607175 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/daffomill.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_daffomill" + } +} diff --git a/src/main/resources/assets/botania/models/block/dandelifeon.json b/src/main/resources/assets/botania/models/block/dandelifeon.json new file mode 100644 index 000000000..1d4c3de99 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dandelifeon.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_dandelifeon" + } +} diff --git a/src/main/resources/assets/botania/models/block/dreadthorn.json b/src/main/resources/assets/botania/models/block/dreadthorn.json new file mode 100644 index 000000000..4aa8d075a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreadthorn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_dreadthorne" + } +} diff --git a/src/main/resources/assets/botania/models/block/endoflame.json b/src/main/resources/assets/botania/models/block/endoflame.json new file mode 100644 index 000000000..e0ba09462 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/endoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_endoflame" + } +} diff --git a/src/main/resources/assets/botania/models/block/entropinnyum.json b/src/main/resources/assets/botania/models/block/entropinnyum.json new file mode 100644 index 000000000..944c0be2b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/entropinnyum.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_entropinnyum" + } +} diff --git a/src/main/resources/assets/botania/models/block/exoflame.json b/src/main/resources/assets/botania/models/block/exoflame.json new file mode 100644 index 000000000..18377c71b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/exoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_exoflame" + } +} diff --git a/src/main/resources/assets/botania/models/block/fallen_kanade.json b/src/main/resources/assets/botania/models/block/fallen_kanade.json new file mode 100644 index 000000000..52dde2119 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fallen_kanade.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_fallen_kanade" + } +} diff --git a/src/main/resources/assets/botania/models/block/gourmaryllis.json b/src/main/resources/assets/botania/models/block/gourmaryllis.json new file mode 100644 index 000000000..049c76151 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/gourmaryllis.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_gourmaryllis" + } +} diff --git a/src/main/resources/assets/botania/models/block/heisei_dream.json b/src/main/resources/assets/botania/models/block/heisei_dream.json new file mode 100644 index 000000000..81f925f0d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/heisei_dream.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_heisei_dream" + } +} diff --git a/src/main/resources/assets/botania/models/block/hopperhock.json b/src/main/resources/assets/botania/models/block/hopperhock.json new file mode 100644 index 000000000..4b26ee161 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/hopperhock.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_hopperhock" + } +} diff --git a/src/main/resources/assets/botania/models/block/hopperhock_chibi.json b/src/main/resources/assets/botania/models/block/hopperhock_chibi.json new file mode 100644 index 000000000..e4431a2e9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/hopperhock_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_hopperhock_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/hyacidus.json b/src/main/resources/assets/botania/models/block/hyacidus.json new file mode 100644 index 000000000..3fef5f84c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/hyacidus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_hyacidus" + } +} diff --git a/src/main/resources/assets/botania/models/block/hydroangeas.json b/src/main/resources/assets/botania/models/block/hydroangeas.json new file mode 100644 index 000000000..330e41454 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/hydroangeas.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_hydroangeas" + } +} diff --git a/src/main/resources/assets/botania/models/block/jaded_amaranthus.json b/src/main/resources/assets/botania/models/block/jaded_amaranthus.json new file mode 100644 index 000000000..cf78e1e1a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/jaded_amaranthus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_jaded_amaranthus" + } +} diff --git a/src/main/resources/assets/botania/models/block/jiyuulia.json b/src/main/resources/assets/botania/models/block/jiyuulia.json new file mode 100644 index 000000000..304a176d6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/jiyuulia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_jiyuulia" + } +} diff --git a/src/main/resources/assets/botania/models/block/kekimurus.json b/src/main/resources/assets/botania/models/block/kekimurus.json new file mode 100644 index 000000000..060d7dce3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/kekimurus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_kekimurus" + } +} diff --git a/src/main/resources/assets/botania/models/block/loonium.json b/src/main/resources/assets/botania/models/block/loonium.json new file mode 100644 index 000000000..d59f3131b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/loonium.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_loonium" + } +} diff --git a/src/main/resources/assets/botania/models/block/manastar.json b/src/main/resources/assets/botania/models/block/manastar.json new file mode 100644 index 000000000..f73003ff1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manastar.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_misc_manastar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/marimorphosis.json b/src/main/resources/assets/botania/models/block/marimorphosis.json new file mode 100644 index 000000000..ae4f0f804 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/marimorphosis.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_marimorphosis" + } +} diff --git a/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json b/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json new file mode 100644 index 000000000..59550ca2a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_marimorphosis_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/medumone.json b/src/main/resources/assets/botania/models/block/medumone.json new file mode 100644 index 000000000..88f936f28 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/medumone.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_medumone" + } +} diff --git a/src/main/resources/assets/botania/models/block/munchdew.json b/src/main/resources/assets/botania/models/block/munchdew.json new file mode 100644 index 000000000..621a3ec30 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/munchdew.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_munchdew" + } +} diff --git a/src/main/resources/assets/botania/models/block/narslimmus.json b/src/main/resources/assets/botania/models/block/narslimmus.json new file mode 100644 index 000000000..465ea7c71 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/narslimmus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_narslimmus" + } +} diff --git a/src/main/resources/assets/botania/models/block/orechid.json b/src/main/resources/assets/botania/models/block/orechid.json new file mode 100644 index 000000000..13e5a729f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/orechid.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_orechid" + } +} diff --git a/src/main/resources/assets/botania/models/block/orechid_ignem.json b/src/main/resources/assets/botania/models/block/orechid_ignem.json new file mode 100644 index 000000000..8aaccdde8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/orechid_ignem.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_orechid_ignem" + } +} diff --git a/src/main/resources/assets/botania/models/block/pollidisiac.json b/src/main/resources/assets/botania/models/block/pollidisiac.json new file mode 100644 index 000000000..e9beff4c4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pollidisiac.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_pollidisiac" + } +} diff --git a/src/main/resources/assets/botania/models/block/pure_daisy.json b/src/main/resources/assets/botania/models/block/pure_daisy.json new file mode 100644 index 000000000..a5bf965f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pure_daisy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_misc_pure_daisy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/rafflowsia.json b/src/main/resources/assets/botania/models/block/rafflowsia.json new file mode 100644 index 000000000..ed76ffa19 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/rafflowsia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_rafflowsia" + } +} diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus.json b/src/main/resources/assets/botania/models/block/rannuncarpus.json new file mode 100644 index 000000000..c5e46f34e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/rannuncarpus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_rannuncarpus" + } +} diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json b/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json new file mode 100644 index 000000000..bc641b879 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_rannuncarpus_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/rosa_arcana.json b/src/main/resources/assets/botania/models/block/rosa_arcana.json new file mode 100644 index 000000000..0220144ef --- /dev/null +++ b/src/main/resources/assets/botania/models/block/rosa_arcana.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_arcane_rose" + } +} diff --git a/src/main/resources/assets/botania/models/block/shulk_me_not.json b/src/main/resources/assets/botania/models/block/shulk_me_not.json new file mode 100644 index 000000000..f2935031b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shulk_me_not.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_shulk_me_not" + } +} diff --git a/src/main/resources/assets/botania/models/block/solegnolia.json b/src/main/resources/assets/botania/models/block/solegnolia.json new file mode 100644 index 000000000..b4f107f21 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/solegnolia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_solegnolia" + } +} diff --git a/src/main/resources/assets/botania/models/block/solegnolia_chibi.json b/src/main/resources/assets/botania/models/block/solegnolia_chibi.json new file mode 100644 index 000000000..0368ca6c8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/solegnolia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_solegnolia_chibi" + } +} diff --git a/src/main/resources/assets/botania/models/block/spectranthemum.json b/src/main/resources/assets/botania/models/block/spectranthemum.json new file mode 100644 index 000000000..16eea08a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/spectranthemum.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_spectranthemum" + } +} diff --git a/src/main/resources/assets/botania/models/block/spectrolus.json b/src/main/resources/assets/botania/models/block/spectrolus.json new file mode 100644 index 000000000..cdbbb3694 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/spectrolus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_spectrolus" + } +} diff --git a/src/main/resources/assets/botania/models/block/tangleberrie.json b/src/main/resources/assets/botania/models/block/tangleberrie.json new file mode 100644 index 000000000..72b22868e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/tangleberrie.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_tangleberrie" + } +} diff --git a/src/main/resources/assets/botania/models/block/template.json b/src/main/resources/assets/botania/models/block/template.json deleted file mode 100644 index 270327332..000000000 --- a/src/main/resources/assets/botania/models/block/template.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/metamorphic/PARENT" -} diff --git a/src/main/resources/assets/botania/models/block/thermalily.json b/src/main/resources/assets/botania/models/block/thermalily.json new file mode 100644 index 000000000..3c94c82ee --- /dev/null +++ b/src/main/resources/assets/botania/models/block/thermalily.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_gen_thermalily" + } +} diff --git a/src/main/resources/assets/botania/models/block/tigerseye.json b/src/main/resources/assets/botania/models/block/tigerseye.json new file mode 100644 index 000000000..7c41a4f34 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/tigerseye.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_tigerseye" + } +} diff --git a/src/main/resources/assets/botania/models/block/vinculotus.json b/src/main/resources/assets/botania/models/block/vinculotus.json new file mode 100644 index 000000000..3d410ebfb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/vinculotus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/flower_func_vinculotus" + } +} diff --git a/src/main/resources/assets/botania/models/item/agricarnation.json b/src/main/resources/assets/botania/models/item/agricarnation.json new file mode 100644 index 000000000..4cf223a3f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/agricarnation.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_agricarnation" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/agricarnation_chibi.json b/src/main/resources/assets/botania/models/item/agricarnation_chibi.json new file mode 100644 index 000000000..7d2cc11fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/agricarnation_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_agricarnation_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bellethorn.json b/src/main/resources/assets/botania/models/item/bellethorn.json new file mode 100644 index 000000000..51adc01ae --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bellethorn.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_bellethorne" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bellethorn_chibi.json b/src/main/resources/assets/botania/models/item/bellethorn_chibi.json new file mode 100644 index 000000000..4063ab1cf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bellethorn_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_bellethorne_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bergamute.json b/src/main/resources/assets/botania/models/item/bergamute.json new file mode 100644 index 000000000..5e282e174 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bergamute.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_bergamute" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bubbell.json b/src/main/resources/assets/botania/models/item/bubbell.json new file mode 100644 index 000000000..0af6f3440 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bubbell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_bubbell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bubbell_chibi.json b/src/main/resources/assets/botania/models/item/bubbell_chibi.json new file mode 100644 index 000000000..f73006055 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bubbell_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_bubbell_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/clayconia.json b/src/main/resources/assets/botania/models/item/clayconia.json new file mode 100644 index 000000000..b03335198 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/clayconia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_clayconia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/clayconia_chibi.json b/src/main/resources/assets/botania/models/item/clayconia_chibi.json new file mode 100644 index 000000000..a13894c81 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/clayconia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_clayconia_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/daffomill.json b/src/main/resources/assets/botania/models/item/daffomill.json new file mode 100644 index 000000000..43df239b7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/daffomill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_daffomill" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dandelifeon.json b/src/main/resources/assets/botania/models/item/dandelifeon.json new file mode 100644 index 000000000..095ed5848 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dandelifeon.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_dandelifeon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreadthorn.json b/src/main/resources/assets/botania/models/item/dreadthorn.json new file mode 100644 index 000000000..d8acda9fb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreadthorn.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_dreadthorne" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/endoflame.json b/src/main/resources/assets/botania/models/item/endoflame.json new file mode 100644 index 000000000..3668aa608 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/endoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_endoflame" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/entropinnyum.json b/src/main/resources/assets/botania/models/item/entropinnyum.json new file mode 100644 index 000000000..6ed68197b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/entropinnyum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_entropinnyum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/exoflame.json b/src/main/resources/assets/botania/models/item/exoflame.json new file mode 100644 index 000000000..1f930b987 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/exoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_exoflame" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fallen_kanade.json b/src/main/resources/assets/botania/models/item/fallen_kanade.json new file mode 100644 index 000000000..fe98b3f14 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fallen_kanade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_fallen_kanade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gourmaryllis.json b/src/main/resources/assets/botania/models/item/gourmaryllis.json new file mode 100644 index 000000000..08e71e49e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gourmaryllis.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_gourmaryllis" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/heisei_dream.json b/src/main/resources/assets/botania/models/item/heisei_dream.json new file mode 100644 index 000000000..1ffa9e038 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/heisei_dream.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_heisei_dream" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hopperhock.json b/src/main/resources/assets/botania/models/item/hopperhock.json new file mode 100644 index 000000000..14d760315 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/hopperhock.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_hopperhock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hopperhock_chibi.json b/src/main/resources/assets/botania/models/item/hopperhock_chibi.json new file mode 100644 index 000000000..49ad16977 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/hopperhock_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_hopperhock_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hyacidus.json b/src/main/resources/assets/botania/models/item/hyacidus.json new file mode 100644 index 000000000..350ea760b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/hyacidus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_hyacidus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hydroangeas.json b/src/main/resources/assets/botania/models/item/hydroangeas.json new file mode 100644 index 000000000..d7f158d20 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/hydroangeas.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_hydroangeas" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/jaded_amaranthus.json b/src/main/resources/assets/botania/models/item/jaded_amaranthus.json new file mode 100644 index 000000000..5dd762677 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/jaded_amaranthus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_jaded_amaranthus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/jiyuulia.json b/src/main/resources/assets/botania/models/item/jiyuulia.json new file mode 100644 index 000000000..fe4500079 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/jiyuulia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_jiyuulia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/kekimurus.json b/src/main/resources/assets/botania/models/item/kekimurus.json new file mode 100644 index 000000000..0405b0f9f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/kekimurus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_kekimurus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/loonium.json b/src/main/resources/assets/botania/models/item/loonium.json new file mode 100644 index 000000000..ef31e496e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/loonium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_loonium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manastar.json b/src/main/resources/assets/botania/models/item/manastar.json new file mode 100644 index 000000000..c55acad51 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manastar.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_misc_manastar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/marimorphosis.json b/src/main/resources/assets/botania/models/item/marimorphosis.json new file mode 100644 index 000000000..3833ec56d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/marimorphosis.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_marimorphosis" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/marimorphosis_chibi.json b/src/main/resources/assets/botania/models/item/marimorphosis_chibi.json new file mode 100644 index 000000000..99ec0019d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/marimorphosis_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_marimorphosis_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/medumone.json b/src/main/resources/assets/botania/models/item/medumone.json new file mode 100644 index 000000000..a8c6e8d9b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/medumone.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_medumone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/munchdew.json b/src/main/resources/assets/botania/models/item/munchdew.json new file mode 100644 index 000000000..aa2031533 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/munchdew.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_munchdew" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/narslimmus.json b/src/main/resources/assets/botania/models/item/narslimmus.json new file mode 100644 index 000000000..723fa8c09 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/narslimmus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_narslimmus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orechid.json b/src/main/resources/assets/botania/models/item/orechid.json new file mode 100644 index 000000000..a807eef8f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orechid.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_orechid" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orechid_ignem.json b/src/main/resources/assets/botania/models/item/orechid_ignem.json new file mode 100644 index 000000000..9eae985ef --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orechid_ignem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_orechid_ignem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pollidisiac.json b/src/main/resources/assets/botania/models/item/pollidisiac.json new file mode 100644 index 000000000..9760c1e08 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pollidisiac.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_pollidisiac" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pure_daisy.json b/src/main/resources/assets/botania/models/item/pure_daisy.json new file mode 100644 index 000000000..04d939902 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pure_daisy.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_misc_pure_daisy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rafflowsia.json b/src/main/resources/assets/botania/models/item/rafflowsia.json new file mode 100644 index 000000000..246119fdf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rafflowsia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_rafflowsia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rannuncarpus.json b/src/main/resources/assets/botania/models/item/rannuncarpus.json new file mode 100644 index 000000000..3c5bbdb37 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rannuncarpus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_rannuncarpus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json b/src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json new file mode 100644 index 000000000..88791564a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_rannuncarpus_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rosa_arcana.json b/src/main/resources/assets/botania/models/item/rosa_arcana.json new file mode 100644 index 000000000..4533cda18 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rosa_arcana.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_arcane_rose" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shulk_me_not.json b/src/main/resources/assets/botania/models/item/shulk_me_not.json new file mode 100644 index 000000000..30bac6d4e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/shulk_me_not.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_shulk_me_not" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/solegnolia.json b/src/main/resources/assets/botania/models/item/solegnolia.json new file mode 100644 index 000000000..34d77188d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/solegnolia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_solegnolia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/solegnolia_chibi.json b/src/main/resources/assets/botania/models/item/solegnolia_chibi.json new file mode 100644 index 000000000..5686846f2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/solegnolia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_solegnolia_chibi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spectranthemum.json b/src/main/resources/assets/botania/models/item/spectranthemum.json new file mode 100644 index 000000000..37d41d7e4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spectranthemum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_spectranthemum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spectrolus.json b/src/main/resources/assets/botania/models/item/spectrolus.json new file mode 100644 index 000000000..98e43eee2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spectrolus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_spectrolus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tangleberrie.json b/src/main/resources/assets/botania/models/item/tangleberrie.json new file mode 100644 index 000000000..9c0d492c1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tangleberrie.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_tangleberrie" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thermalily.json b/src/main/resources/assets/botania/models/item/thermalily.json new file mode 100644 index 000000000..ccbaac2f8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thermalily.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_gen_thermalily" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tigerseye.json b/src/main/resources/assets/botania/models/item/tigerseye.json new file mode 100644 index 000000000..43a6d51b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tigerseye.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_tigerseye" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vinculotus.json b/src/main/resources/assets/botania/models/item/vinculotus.json new file mode 100644 index 000000000..fa3cd2d41 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vinculotus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/flower_func_vinculotus" + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/advancements/challenge/null_flower.json b/src/main/resources/data/botania/advancements/challenge/null_flower.json deleted file mode 100644 index f72ae5e0c..000000000 --- a/src/main/resources/data/botania/advancements/challenge/null_flower.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "display": { - "icon": { - "item": "botania:special_flower" - }, - "title": { - "translate": "advancement.botania:nullFlower" - }, - "description": { - "translate": "advancement.botania:nullFlower.desc" - }, - "frame": "challenge" - }, - "parent": "botania:challenge/root", - "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", - "criteria": { - "code_triggered": { - "trigger": "minecraft:impossible" - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/advancements/main/bubbell_pickup.json b/src/main/resources/data/botania/advancements/main/bubbell_pickup.json index a0776c87a..d625a1dd6 100644 --- a/src/main/resources/data/botania/advancements/main/bubbell_pickup.json +++ b/src/main/resources/data/botania/advancements/main/bubbell_pickup.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:special_flower", - "nbt": "{\"type\": \"bubbell\"}" + "item": "botania:bubbell" }, "title": { "translate": "advancement.botania:bubbellPickup" @@ -18,8 +17,7 @@ "conditions": { "items": [ { - "item": "botania:special_flower", - "nbt": "{\"type\": \"bubbell\"}" + "item": "botania:bubbell" } ] } diff --git a/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json b/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json index 914006b03..b9694c9a3 100644 --- a/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json +++ b/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:special_flower", - "nbt": "{\"type\": \"dandelifeon\"}" + "item": "botania:dandelifeon" }, "title": { "translate": "advancement.botania:dandelifeonPickup" @@ -18,8 +17,7 @@ "conditions": { "items": [ { - "item": "botania:special_flower", - "nbt": "{\"type\": \"dandelifeon\"}" + "item": "botania:dandelifeon" } ] } diff --git a/src/main/resources/data/botania/advancements/main/functional_flower.json b/src/main/resources/data/botania/advancements/main/functional_flower.json index 369640afd..943e8e4c8 100644 --- a/src/main/resources/data/botania/advancements/main/functional_flower.json +++ b/src/main/resources/data/botania/advancements/main/functional_flower.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:special_flower", - "nbt": "{\"type\": \"bellethorn\"}" + "item": "botania:bellethorn" }, "title": { "translate": "advancement.botania:functionalFlower" @@ -12,10 +11,16 @@ } }, "parent": "botania:main/mana_pool_pickup", - "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", "criteria": { - "code_triggered": { - "trigger": "minecraft:impossible" + "flower": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "botania:functional_special_flowers" + } + ] + } } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/advancements/main/generating_flower.json b/src/main/resources/data/botania/advancements/main/generating_flower.json index cbb794498..c09c1ec56 100644 --- a/src/main/resources/data/botania/advancements/main/generating_flower.json +++ b/src/main/resources/data/botania/advancements/main/generating_flower.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:special_flower", - "nbt": "{\"type\": \"endoflame\"}" + "item": "botania:endoflame" }, "title": { "translate": "advancement.botania:generatingFlower" @@ -12,10 +11,16 @@ } }, "parent": "botania:main/lexicon_use", - "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", "criteria": { - "code_triggered": { - "trigger": "minecraft:impossible" + "flower": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "botania:generating_special_flowers" + } + ] + } } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json b/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json index 777c9dadc..fd74194cd 100644 --- a/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json +++ b/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:special_flower", - "nbt": "{\"type\": \"heiseiDream\"}" + "item": "botania:heisei_dream" }, "title": { "translate": "advancement.botania:heiseiDreamPickup" @@ -18,8 +17,7 @@ "conditions": { "items": [ { - "item": "botania:special_flower", - "nbt": "{\"type\": \"heiseiDream\"}" + "item": "botania:heisei_dream" } ] } diff --git a/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json b/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json index eb5d7ba2a..eaa11f429 100644 --- a/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json +++ b/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:special_flower", - "nbt": "{\"type\": \"kekimurus\"}" + "item": "botania:kekimurus" }, "title": { "translate": "advancement.botania:kekimurusPickup" @@ -18,8 +17,7 @@ "conditions": { "items": [ { - "item": "botania:special_flower", - "nbt": "{\"type\": \"kekimurus\"}" + "item": "botania:kekimurus" } ] } diff --git a/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json b/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json index 00aeac5d8..dd845dd2a 100644 --- a/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json +++ b/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:special_flower", - "nbt": "{\"type\": \"pollidisiac\"}" + "item": "botania:pollidisiac" }, "title": { "translate": "advancement.botania:pollidisiacPickup" @@ -18,8 +17,7 @@ "conditions": { "items": [ { - "item": "botania:special_flower", - "nbt": "{\"type\": \"pollidisiac\"}" + "item": "botania:pollidisiac" } ] } diff --git a/src/main/resources/data/botania/recipes/floating_agricarnation.json b/src/main/resources/data/botania/recipes/floating_agricarnation.json new file mode 100644 index 000000000..a82e70934 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_agricarnation.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_agricarnation" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:agricarnation" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_agricarnation_chibi.json b/src/main/resources/data/botania/recipes/floating_agricarnation_chibi.json new file mode 100644 index 000000000..c29f2d445 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_agricarnation_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_agricarnation_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:agricarnation_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_bellethorn.json b/src/main/resources/data/botania/recipes/floating_bellethorn.json new file mode 100644 index 000000000..22a73cd0f --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_bellethorn.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_bellethorn" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:bellethorn" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_bellethorn_chibi.json b/src/main/resources/data/botania/recipes/floating_bellethorn_chibi.json new file mode 100644 index 000000000..7f37530d5 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_bellethorn_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_bellethorn_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:bellethorn_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_bergamute.json b/src/main/resources/data/botania/recipes/floating_bergamute.json new file mode 100644 index 000000000..aa97e2b28 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_bergamute.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_bergamute" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:bergamute" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_bubbell.json b/src/main/resources/data/botania/recipes/floating_bubbell.json new file mode 100644 index 000000000..09af3f2a2 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_bubbell.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_bubbell" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:bubbell" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_bubbell_chibi.json b/src/main/resources/data/botania/recipes/floating_bubbell_chibi.json new file mode 100644 index 000000000..950829e78 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_bubbell_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_bubbell_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:bubbell_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_clayconia.json b/src/main/resources/data/botania/recipes/floating_clayconia.json new file mode 100644 index 000000000..803551f56 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_clayconia.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_clayconia" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:clayconia" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_clayconia_chibi.json b/src/main/resources/data/botania/recipes/floating_clayconia_chibi.json new file mode 100644 index 000000000..06653ddca --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_clayconia_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_clayconia_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:clayconia_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_daffomill.json b/src/main/resources/data/botania/recipes/floating_daffomill.json new file mode 100644 index 000000000..69ae01196 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_daffomill.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_daffomill" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:daffomill" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_dandelifeon.json b/src/main/resources/data/botania/recipes/floating_dandelifeon.json new file mode 100644 index 000000000..a80017675 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_dandelifeon.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_dandelifeon" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:dandelifeon" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_dreadthorn.json b/src/main/resources/data/botania/recipes/floating_dreadthorn.json new file mode 100644 index 000000000..f42f7feb5 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_dreadthorn.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_dreadthorn" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:dreadthorn" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_entropinnyum.json b/src/main/resources/data/botania/recipes/floating_entropinnyum.json new file mode 100644 index 000000000..e427e5156 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_entropinnyum.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_entropinnyum" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:entropinnyum" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_exoflame.json b/src/main/resources/data/botania/recipes/floating_exoflame.json new file mode 100644 index 000000000..3abfb063b --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_exoflame.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_exoflame" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:exoflame" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_fallen_kanade.json b/src/main/resources/data/botania/recipes/floating_fallen_kanade.json new file mode 100644 index 000000000..693ea2b30 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_fallen_kanade.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_fallen_kanade" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:fallen_kanade" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_gourmaryllis.json b/src/main/resources/data/botania/recipes/floating_gourmaryllis.json new file mode 100644 index 000000000..f12ed4ce4 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_gourmaryllis.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_gourmaryllis" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:gourmaryllis" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_heisei_dream.json b/src/main/resources/data/botania/recipes/floating_heisei_dream.json new file mode 100644 index 000000000..72497177d --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_heisei_dream.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_heisei_dream" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:heisei_dream" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_hopperhock.json b/src/main/resources/data/botania/recipes/floating_hopperhock.json new file mode 100644 index 000000000..c43976a89 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_hopperhock.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_hopperhock" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:hopperhock" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_hopperhock_chibi.json b/src/main/resources/data/botania/recipes/floating_hopperhock_chibi.json new file mode 100644 index 000000000..c9100fb08 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_hopperhock_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_hopperhock_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:hopperhock_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_hyacidus.json b/src/main/resources/data/botania/recipes/floating_hyacidus.json new file mode 100644 index 000000000..32938225e --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_hyacidus.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_hyacidus" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:hyacidus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_hydroangeas.json b/src/main/resources/data/botania/recipes/floating_hydroangeas.json new file mode 100644 index 000000000..11cd16144 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_hydroangeas.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_hydroangeas" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:hydroangeas" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_jaded_amaranthus.json b/src/main/resources/data/botania/recipes/floating_jaded_amaranthus.json new file mode 100644 index 000000000..4320ba1b0 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_jaded_amaranthus.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_jaded_amaranthus" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:jaded_amaranthus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_jiyuulia.json b/src/main/resources/data/botania/recipes/floating_jiyuulia.json new file mode 100644 index 000000000..84b8311f5 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_jiyuulia.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_jiyuulia" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:jiyuulia" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_kekimurus.json b/src/main/resources/data/botania/recipes/floating_kekimurus.json new file mode 100644 index 000000000..b63ac6b6a --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_kekimurus.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_kekimurus" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:kekimurus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_loonium.json b/src/main/resources/data/botania/recipes/floating_loonium.json new file mode 100644 index 000000000..2ee0dc9a9 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_loonium.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_loonium" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:loonium" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_manastar.json b/src/main/resources/data/botania/recipes/floating_manastar.json new file mode 100644 index 000000000..092db2760 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_manastar.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_manastar" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:manastar" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_marimorphosis.json b/src/main/resources/data/botania/recipes/floating_marimorphosis.json new file mode 100644 index 000000000..282864ee1 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_marimorphosis.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_marimorphosis" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:marimorphosis" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_marimorphosis_chibi.json b/src/main/resources/data/botania/recipes/floating_marimorphosis_chibi.json new file mode 100644 index 000000000..fe2c319be --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_marimorphosis_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_marimorphosis_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:marimorphosis_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_medumone.json b/src/main/resources/data/botania/recipes/floating_medumone.json new file mode 100644 index 000000000..2f98fac48 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_medumone.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_medumone" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:medumone" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_munchdew.json b/src/main/resources/data/botania/recipes/floating_munchdew.json new file mode 100644 index 000000000..92e6d6d62 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_munchdew.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_munchdew" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:munchdew" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_narslimmus.json b/src/main/resources/data/botania/recipes/floating_narslimmus.json new file mode 100644 index 000000000..bd57338e6 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_narslimmus.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_narslimmus" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:narslimmus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_orechid.json b/src/main/resources/data/botania/recipes/floating_orechid.json new file mode 100644 index 000000000..814f0092f --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_orechid.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_orechid" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:orechid" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_orechid_ignem.json b/src/main/resources/data/botania/recipes/floating_orechid_ignem.json new file mode 100644 index 000000000..8be804da0 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_orechid_ignem.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_orechid_ignem" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:orechid_ignem" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_pollidisiac.json b/src/main/resources/data/botania/recipes/floating_pollidisiac.json new file mode 100644 index 000000000..e70a176af --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_pollidisiac.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_pollidisiac" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:pollidisiac" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_pure_daisy.json b/src/main/resources/data/botania/recipes/floating_pure_daisy.json new file mode 100644 index 000000000..22a30aa84 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_pure_daisy.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_pure_daisy" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:pure_daisy" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_rafflowsia.json b/src/main/resources/data/botania/recipes/floating_rafflowsia.json new file mode 100644 index 000000000..7866d71cd --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_rafflowsia.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_rafflowsia" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:rafflowsia" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_rannuncarpus.json b/src/main/resources/data/botania/recipes/floating_rannuncarpus.json new file mode 100644 index 000000000..0fc7a160b --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_rannuncarpus.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_rannuncarpus" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:rannuncarpus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_rannuncarpus_chibi.json b/src/main/resources/data/botania/recipes/floating_rannuncarpus_chibi.json new file mode 100644 index 000000000..8569bb010 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_rannuncarpus_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_rannuncarpus_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:rannuncarpus_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_rosa_arcana.json b/src/main/resources/data/botania/recipes/floating_rosa_arcana.json new file mode 100644 index 000000000..d50b4f7a5 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_rosa_arcana.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_rosa_arcana" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:rosa_arcana" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_shulk_me_not.json b/src/main/resources/data/botania/recipes/floating_shulk_me_not.json new file mode 100644 index 000000000..c2d1f517a --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_shulk_me_not.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_shulk_me_not" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:shulk_me_not" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_solegnolia.json b/src/main/resources/data/botania/recipes/floating_solegnolia.json new file mode 100644 index 000000000..5902a82e3 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_solegnolia.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_solegnolia" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:solegnolia" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_solegnolia_chibi.json b/src/main/resources/data/botania/recipes/floating_solegnolia_chibi.json new file mode 100644 index 000000000..6c41d04a0 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_solegnolia_chibi.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_solegnolia_chibi" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:solegnolia_chibi" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_spectranthemum.json b/src/main/resources/data/botania/recipes/floating_spectranthemum.json new file mode 100644 index 000000000..ecab844e7 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_spectranthemum.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_spectranthemum" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:spectranthemum" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_spectrolus.json b/src/main/resources/data/botania/recipes/floating_spectrolus.json new file mode 100644 index 000000000..94ab55a5c --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_spectrolus.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_spectrolus" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:spectrolus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_tangleberrie.json b/src/main/resources/data/botania/recipes/floating_tangleberrie.json new file mode 100644 index 000000000..915bbdbc6 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_tangleberrie.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_tangleberrie" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:tangleberrie" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_thermalily.json b/src/main/resources/data/botania/recipes/floating_thermalily.json new file mode 100644 index 000000000..9287d4761 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_thermalily.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_thermalily" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:thermalily" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_tigerseye.json b/src/main/resources/data/botania/recipes/floating_tigerseye.json new file mode 100644 index 000000000..674c2b199 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_tigerseye.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_tigerseye" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:tigerseye" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/floating_vinculotus.json b/src/main/resources/data/botania/recipes/floating_vinculotus.json new file mode 100644 index 000000000..a6d304d19 --- /dev/null +++ b/src/main/resources/data/botania/recipes/floating_vinculotus.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "result": { + "item": "botania:floating_vinculotus" + }, + "ingredients": [ + { + "tag": "botania:floating_flowers" + }, + { + "item": "botania:vinculotus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/floating_flowers.json b/src/main/resources/data/botania/tags/blocks/floating_flowers.json new file mode 100644 index 000000000..3a3a08c3e --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/floating_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#botania:mundane_floating_flowers", + "#botania:special_floating_flowers" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/functional_special_flowers.json b/src/main/resources/data/botania/tags/blocks/functional_special_flowers.json new file mode 100644 index 000000000..0b9ea9463 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/functional_special_flowers.json @@ -0,0 +1,39 @@ +{ + "replace": false, + "values": [ + "botania:agricarnation", + "botania:agricarnation_chibi", + "botania:bellethorn", + "botania:bellethorn_chibi", + "botania:bergamute", + "botania:bubbell", + "botania:bubbell_chibi", + "botania:clayconia", + "botania:clayconia_chibi", + "botania:daffomill", + "botania:dreadthorn", + "botania:exoflame", + "botania:fallen_kanade", + "botania:heisei_dream", + "botania:hopperhock", + "botania:hopperhock_chibi", + "botania:hyacidus", + "botania:jaded_amaranthus", + "botania:jiyuulia", + "botania:loonium", + "botania:marimorphosis", + "botania:marimorphosis_chibi", + "botania:medumone", + "botania:orechid", + "botania:orechid_ignem", + "botania:pollidisiac", + "botania:rannuncarpus", + "botania:rannuncarpus_chibi", + "botania:solegnolia", + "botania:solegnolia_chibi", + "botania:spectranthemum", + "botania:tangleberrie", + "botania:tigerseye", + "botania:vinculotus" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/generating_special_flowers.json b/src/main/resources/data/botania/tags/blocks/generating_special_flowers.json new file mode 100644 index 000000000..c6ff178ed --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/generating_special_flowers.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "botania:endoflame", + "botania:hydroangeas", + "botania:thermalily", + "botania:rosa_arcana", + "botania:munchdew", + "botania:entropinnyum", + "botania:kekimurus", + "botania:gourmaryllis", + "botania:narslimmus", + "botania:spectrolus", + "botania:dandelifeon", + "botania:rafflowsia", + "botania:shulk_me_not" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/misc_special_flowers.json b/src/main/resources/data/botania/tags/blocks/misc_special_flowers.json new file mode 100644 index 000000000..ed1e046a4 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/misc_special_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:pure_daisy", + "botania:manastar" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/mundane_floating_flowers.json b/src/main/resources/data/botania/tags/blocks/mundane_floating_flowers.json new file mode 100644 index 000000000..1786a38a6 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/mundane_floating_flowers.json @@ -0,0 +1,22 @@ +{ + "__comment": "Values in this tag count as regular (non-magical) floating flowers", + "replace": false, + "values": [ + "botania:white_floating_flower", + "botania:orange_floating_flower", + "botania:magenta_floating_flower", + "botania:light_blue_floating_flower", + "botania:yellow_floating_flower", + "botania:lime_floating_flower", + "botania:pink_floating_flower", + "botania:gray_floating_flower", + "botania:light_gray_floating_flower", + "botania:cyan_floating_flower", + "botania:purple_floating_flower", + "botania:blue_floating_flower", + "botania:brown_floating_flower", + "botania:green_floating_flower", + "botania:red_floating_flower", + "botania:black_floating_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/special_floating_flowers.json b/src/main/resources/data/botania/tags/blocks/special_floating_flowers.json new file mode 100644 index 000000000..15de48eb5 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/special_floating_flowers.json @@ -0,0 +1,55 @@ +{ + "__comment": "Values in this tag count as magical floating flowers", + "replace": false, + "values": [ + "botania:floating_pure_daisy", + "botania:floating_manastar", + "botania:floating_endoflame", + "botania:floating_hydroangeas", + "botania:floating_thermalily", + "botania:floating_rosa_arcana", + "botania:floating_munchdew", + "botania:floating_entropinnyum", + "botania:floating_kekimurus", + "botania:floating_gourmaryllis", + "botania:floating_narslimmus", + "botania:floating_spectrolus", + "botania:floating_dandelifeon", + "botania:floating_rafflowsia", + "botania:floating_shulk_me_not", + "botania:floating_bellethorn", + "botania:floating_bellethorn_chibi", + "botania:floating_bergamute", + "botania:floating_dreadthorn", + "botania:floating_heisei_dream", + "botania:floating_tigerseye", + "botania:floating_jaded_amaranthus", + "botania:floating_orechid", + "botania:floating_fallen_kanade", + "botania:floating_exoflame", + "botania:floating_agricarnation", + "botania:floating_agricarnation_chibi", + "botania:floating_hopperhock", + "botania:floating_hopperhock_chibi", + "botania:floating_tangleberrie", + "botania:floating_jiyuulia", + "botania:floating_rannuncarpus", + "botania:floating_rannuncarpus_chibi", + "botania:floating_hyacidus", + "botania:floating_pollidisiac", + "botania:floating_clayconia", + "botania:floating_clayconia_chibi", + "botania:floating_loonium", + "botania:floating_daffomill", + "botania:floating_vinculotus", + "botania:floating_spectranthemum", + "botania:floating_medumone", + "botania:floating_marimorphosis", + "botania:floating_marimorphosis_chibi", + "botania:floating_bubbell", + "botania:floating_bubbell_chibi", + "botania:floating_solegnolia", + "botania:floating_solegnolia_chibi", + "botania:floating_orechid_ignem" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/special_flowers.json b/src/main/resources/data/botania/tags/blocks/special_flowers.json new file mode 100644 index 000000000..94e1109be --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/special_flowers.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#botania:misc_special_flowers", + "#botania:generating_special_flowers", + "#botania:functional_special_flowers" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/floating_flowers.json b/src/main/resources/data/botania/tags/items/floating_flowers.json new file mode 100644 index 000000000..3a3a08c3e --- /dev/null +++ b/src/main/resources/data/botania/tags/items/floating_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#botania:mundane_floating_flowers", + "#botania:special_floating_flowers" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/functional_special_flowers.json b/src/main/resources/data/botania/tags/items/functional_special_flowers.json new file mode 100644 index 000000000..0b9ea9463 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/functional_special_flowers.json @@ -0,0 +1,39 @@ +{ + "replace": false, + "values": [ + "botania:agricarnation", + "botania:agricarnation_chibi", + "botania:bellethorn", + "botania:bellethorn_chibi", + "botania:bergamute", + "botania:bubbell", + "botania:bubbell_chibi", + "botania:clayconia", + "botania:clayconia_chibi", + "botania:daffomill", + "botania:dreadthorn", + "botania:exoflame", + "botania:fallen_kanade", + "botania:heisei_dream", + "botania:hopperhock", + "botania:hopperhock_chibi", + "botania:hyacidus", + "botania:jaded_amaranthus", + "botania:jiyuulia", + "botania:loonium", + "botania:marimorphosis", + "botania:marimorphosis_chibi", + "botania:medumone", + "botania:orechid", + "botania:orechid_ignem", + "botania:pollidisiac", + "botania:rannuncarpus", + "botania:rannuncarpus_chibi", + "botania:solegnolia", + "botania:solegnolia_chibi", + "botania:spectranthemum", + "botania:tangleberrie", + "botania:tigerseye", + "botania:vinculotus" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/generating_special_flowers.json b/src/main/resources/data/botania/tags/items/generating_special_flowers.json new file mode 100644 index 000000000..c6ff178ed --- /dev/null +++ b/src/main/resources/data/botania/tags/items/generating_special_flowers.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "botania:endoflame", + "botania:hydroangeas", + "botania:thermalily", + "botania:rosa_arcana", + "botania:munchdew", + "botania:entropinnyum", + "botania:kekimurus", + "botania:gourmaryllis", + "botania:narslimmus", + "botania:spectrolus", + "botania:dandelifeon", + "botania:rafflowsia", + "botania:shulk_me_not" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/misc_special_flowers.json b/src/main/resources/data/botania/tags/items/misc_special_flowers.json new file mode 100644 index 000000000..ed1e046a4 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/misc_special_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:pure_daisy", + "botania:manastar" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/mundane_floating_flowers.json b/src/main/resources/data/botania/tags/items/mundane_floating_flowers.json new file mode 100644 index 000000000..1786a38a6 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/mundane_floating_flowers.json @@ -0,0 +1,22 @@ +{ + "__comment": "Values in this tag count as regular (non-magical) floating flowers", + "replace": false, + "values": [ + "botania:white_floating_flower", + "botania:orange_floating_flower", + "botania:magenta_floating_flower", + "botania:light_blue_floating_flower", + "botania:yellow_floating_flower", + "botania:lime_floating_flower", + "botania:pink_floating_flower", + "botania:gray_floating_flower", + "botania:light_gray_floating_flower", + "botania:cyan_floating_flower", + "botania:purple_floating_flower", + "botania:blue_floating_flower", + "botania:brown_floating_flower", + "botania:green_floating_flower", + "botania:red_floating_flower", + "botania:black_floating_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/special_floating_flowers.json b/src/main/resources/data/botania/tags/items/special_floating_flowers.json new file mode 100644 index 000000000..15de48eb5 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/special_floating_flowers.json @@ -0,0 +1,55 @@ +{ + "__comment": "Values in this tag count as magical floating flowers", + "replace": false, + "values": [ + "botania:floating_pure_daisy", + "botania:floating_manastar", + "botania:floating_endoflame", + "botania:floating_hydroangeas", + "botania:floating_thermalily", + "botania:floating_rosa_arcana", + "botania:floating_munchdew", + "botania:floating_entropinnyum", + "botania:floating_kekimurus", + "botania:floating_gourmaryllis", + "botania:floating_narslimmus", + "botania:floating_spectrolus", + "botania:floating_dandelifeon", + "botania:floating_rafflowsia", + "botania:floating_shulk_me_not", + "botania:floating_bellethorn", + "botania:floating_bellethorn_chibi", + "botania:floating_bergamute", + "botania:floating_dreadthorn", + "botania:floating_heisei_dream", + "botania:floating_tigerseye", + "botania:floating_jaded_amaranthus", + "botania:floating_orechid", + "botania:floating_fallen_kanade", + "botania:floating_exoflame", + "botania:floating_agricarnation", + "botania:floating_agricarnation_chibi", + "botania:floating_hopperhock", + "botania:floating_hopperhock_chibi", + "botania:floating_tangleberrie", + "botania:floating_jiyuulia", + "botania:floating_rannuncarpus", + "botania:floating_rannuncarpus_chibi", + "botania:floating_hyacidus", + "botania:floating_pollidisiac", + "botania:floating_clayconia", + "botania:floating_clayconia_chibi", + "botania:floating_loonium", + "botania:floating_daffomill", + "botania:floating_vinculotus", + "botania:floating_spectranthemum", + "botania:floating_medumone", + "botania:floating_marimorphosis", + "botania:floating_marimorphosis_chibi", + "botania:floating_bubbell", + "botania:floating_bubbell_chibi", + "botania:floating_solegnolia", + "botania:floating_solegnolia_chibi", + "botania:floating_orechid_ignem" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/special_flowers.json b/src/main/resources/data/botania/tags/items/special_flowers.json new file mode 100644 index 000000000..94e1109be --- /dev/null +++ b/src/main/resources/data/botania/tags/items/special_flowers.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#botania:misc_special_flowers", + "#botania:generating_special_flowers", + "#botania:functional_special_flowers" + ] +} \ No newline at end of file