From 91b9c2e0c8ae44861cb86cb216cd39237d740847 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 6 Mar 2018 11:17:52 -0600 Subject: [PATCH] Flatten pools --- block_flattening_notes.txt | 14 ++++- .../botania/api/state/BotaniaStateProps.java | 4 -- .../botania/api/state/enums/PoolVariant.java | 26 ---------- .../client/challenge/ModChallenges.java | 2 +- .../client/core/handler/ColorHandler.java | 8 +-- .../integration/jei/JEIBotaniaPlugin.java | 8 +-- .../jei/manapool/ManaPoolRecipeCategory.java | 2 +- .../render/entity/RenderPoolMinecart.java | 4 +- .../client/render/tile/RenderTilePool.java | 25 ++++++--- .../botania/common/block/ModBlocks.java | 15 ++++-- .../botania/common/block/mana/BlockPool.java | 52 +++++++------------ .../common/block/tile/TileAlfPortal.java | 6 +-- .../botania/common/block/tile/TilePylon.java | 3 +- .../common/block/tile/mana/TilePool.java | 19 +++---- .../common/core/BotaniaCreativeTab.java | 5 +- .../core/handler/InternalMethodHandler.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 6 +-- .../common/entity/EntityPoolMinecart.java | 4 +- .../botania/common/fixers/FlattenItems.java | 9 ++++ .../common/item/block/ItemBlockPool.java | 12 ++--- .../botania/common/lexicon/LexiconData.java | 2 +- .../lexicon/page/PageManaInfusionRecipe.java | 3 +- .../botania/common/lib/LibBlockNames.java | 1 + .../advancements/main/mana_pool_pickup.json | 41 +++++++++++++-- .../assets/botania/blockstates/pool.json | 8 --- .../botania/blockstates/pool_creative.json | 5 ++ .../botania/blockstates/pool_default.json | 5 ++ .../botania/blockstates/pool_diluted.json | 5 ++ .../botania/blockstates/pool_fabulous.json | 5 ++ .../resources/assets/botania/lang/de_de.lang | 4 +- .../resources/assets/botania/lang/en_us.lang | 8 +-- .../resources/assets/botania/lang/es_ar.lang | 6 +-- .../resources/assets/botania/lang/es_es.lang | 6 +-- .../resources/assets/botania/lang/fr_fr.lang | 6 +-- .../resources/assets/botania/lang/ja_jp.lang | 8 +-- .../resources/assets/botania/lang/ko_kr.lang | 6 +-- .../resources/assets/botania/lang/nl_nl.lang | 6 +-- .../resources/assets/botania/lang/pt_br.lang | 8 +-- .../resources/assets/botania/lang/ru_ru.lang | 6 +-- .../resources/assets/botania/lang/zh_cn.lang | 8 +-- .../resources/assets/botania/lang/zh_tw.lang | 8 +-- .../{pool_0.json => pool_default.json} | 3 +- .../{pool_2.json => pool_diluted.json} | 3 +- .../{pool_3.json => pool_fabulous.json} | 3 +- .../assets/botania/recipes/poolminecart.json | 3 +- 45 files changed, 214 insertions(+), 179 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/PoolVariant.java delete mode 100644 src/main/resources/assets/botania/blockstates/pool.json create mode 100644 src/main/resources/assets/botania/blockstates/pool_creative.json create mode 100644 src/main/resources/assets/botania/blockstates/pool_default.json create mode 100644 src/main/resources/assets/botania/blockstates/pool_diluted.json create mode 100644 src/main/resources/assets/botania/blockstates/pool_fabulous.json rename src/main/resources/assets/botania/recipes/{pool_0.json => pool_default.json} (78%) rename src/main/resources/assets/botania/recipes/{pool_2.json => pool_diluted.json} (81%) rename src/main/resources/assets/botania/recipes/{pool_3.json => pool_fabulous.json} (80%) diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index 984b66fdb..21b51d9a7 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -5,6 +5,7 @@ botania:altgrass[variant={dry, golden, vivid, scorched, infused, mutated}] => botania:scorched_grass => botania:infused_grass => botania:mutated_grass +reason: each is a different variant botania:storage[variant={manasteel, terrasteel, elementium, mana_diamond, terrasteel}] => botania:manasteel_block @@ -12,14 +13,25 @@ botania:storage[variant={manasteel, terrasteel, elementium, mana_diamond, terras => botania:elementium_block => botania:mana_diamond_block => botania:terrasteel_block +reason: each is a different variant botania:forestdrum[variant={wild, gathering, canopy}] => botania:drum_wild => botania:drum_gathering => botania:drum_canopy +reason: each is a different variant botania:custombrick[variant={azulejo_0, ..., azulejo_15}] => botania:azulejo_0 => ... => botania:azulejo_15 -(ordered 0, 13, 14, 15, then 1-12, due to legacy reasons) \ No newline at end of file +(ordered 0, 13, 14, 15, then 1-12, due to legacy reasons) +reason: each is a different variant + +botania:pool[variant={default, creative, diluted, fabulous}, color={16 colors}] +=> botania:mana_pool[color={16 colors}] +=> botania:creative_pool[color={16 colors}] +=> botania:diluted_pool[color={16 colors}] +=> botania:fabulous_pool[color={16 colors}] +reason: each is a different variant, but changing the color only can be done by using an item on a existing pool, so no need to flatten the colors out + diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 268963c7c..1c7e09795 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -31,7 +31,6 @@ import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.PlatformVariant; -import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.api.state.enums.SpreaderVariant; @@ -151,9 +150,6 @@ public final class BotaniaStateProps { // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); - // BlockPool - public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); - // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java deleted file mode 100644 index fe2a2e702..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.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 - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum PoolVariant implements IStringSerializable { - DEFAULT, - CREATIVE, - DILUTED, - FABULOUS; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index 3ba325fb8..83c0274e0 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -38,7 +38,7 @@ public final class ModChallenges { addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Items.REEDS)); addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.COBBLESTONE)); addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); - addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.pool)); + addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.manaPool)); addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.altar)); addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.SAPLING)); diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index ba23b841a..9ada89c2c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -19,11 +19,11 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityManaBurst; @@ -53,14 +53,14 @@ public final class ColorHandler { // Pool blocks.registerBlockColorHandler( (state, world, pos, tintIndex) -> { - if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { + if (((BlockPool) state.getBlock()).variant == BlockPool.Variant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); } else { return state.getValue(BotaniaStateProps.COLOR).getColorValue(); } }, - ModBlocks.pool + ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool ); // Spreader @@ -117,7 +117,7 @@ public final class ColorHandler { items.registerItemColorHandler(handler, petals); items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t), - ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader); + ModBlocks.petalBlock, ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.spreader); items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, (float) ((ItemManaMirror) ModItems.manaMirror).getMana(s) / (float) TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror); diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 1c44fbd91..a27d5de0f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -24,7 +24,6 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.state.enums.AltarVariant; -import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeWrapper; @@ -87,9 +86,10 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipeCatalyst(new ItemStack(ModBlocks.brewery), BreweryRecipeCategory.UID); registry.addRecipeCatalyst(new ItemStack(ModBlocks.alfPortal), ElvenTradeRecipeCategory.UID); - for(PoolVariant v : PoolVariant.values()) { - registry.addRecipeCatalyst(new ItemStack(ModBlocks.pool, 1, v.ordinal()), ManaPoolRecipeCategory.UID); - } + registry.addRecipeCatalyst(new ItemStack(ModBlocks.manaPool), ManaPoolRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.creativePool), ManaPoolRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.dilutedPool), ManaPoolRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.fabulousPool), ManaPoolRecipeCategory.UID); for(AltarVariant v : AltarVariant.values()) { if(v == AltarVariant.MOSSY) continue; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index fda764fc6..78a6f0509 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -34,7 +34,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { private final IDrawable background; private final String localizedName; private final IDrawable overlay; - private final ItemStack renderStack = new ItemStack(ModBlocks.pool); + private final ItemStack renderStack = new ItemStack(ModBlocks.manaPool); public ManaPoolRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index 3838e5aba..1a12e291e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -14,9 +14,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.render.tile.RenderTilePool; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityPoolMinecart; @@ -30,7 +30,7 @@ public class RenderPoolMinecart extends RenderMinecart { @Override protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull IBlockState state) { - RenderTilePool.forceVariant = PoolVariant.DEFAULT; + RenderTilePool.forceVariant = BlockPool.Variant.DEFAULT; RenderTilePool.forceManaNumber = poolCart.getMana(); TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1, 0); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index c90b672f1..083e1817d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -21,13 +22,13 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; import javax.annotation.Nonnull; @@ -37,13 +38,13 @@ import java.util.Random; public class RenderTilePool extends TileEntitySpecialRenderer { // Overrides for when we call this TESR without an actual pool - public static PoolVariant forceVariant = PoolVariant.DEFAULT; + public static BlockPool.Variant forceVariant = BlockPool.Variant.DEFAULT; public static int forceManaNumber = -1; @Override public void render(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) { if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false) - || pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool)) + || !(pool.getBlockType() instanceof BlockPool))) return; GlStateManager.pushMatrix(); @@ -59,7 +60,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); } - boolean fab = pool == null ? forceVariant == PoolVariant.FABULOUS : pool.getWorld().getBlockState(pool.getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS; + boolean fab = pool == null ? forceVariant == BlockPool.Variant.FABULOUS : ((BlockPool) pool.getBlockType()).variant == BlockPool.Variant.FABULOUS; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); int color = 0xFFFFFF; @@ -75,7 +76,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { int red = (color & 0xFF0000) >> 16; int green = (color & 0xFF00) >> 8; int blue = color & 0xFF; - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? poolForVariant(forceVariant) : pool.getWorld().getBlockState(pool.getPos())); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); } @@ -138,11 +139,11 @@ public class RenderTilePool extends TileEntitySpecialRenderer { } GlStateManager.popMatrix(); - forceVariant = PoolVariant.DEFAULT; + forceVariant = BlockPool.Variant.DEFAULT; forceManaNumber = -1; } - public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { + private void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP); tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex(); @@ -152,4 +153,14 @@ public class RenderTilePool extends TileEntitySpecialRenderer { tessellator.draw(); } + private IBlockState poolForVariant(BlockPool.Variant v) { + switch (v) { + default: + case DEFAULT: return ModBlocks.manaPool.getDefaultState(); + case CREATIVE: return ModBlocks.creativePool.getDefaultState(); + case DILUTED: return ModBlocks.dilutedPool.getDefaultState(); + case FABULOUS: return ModBlocks.fabulousPool.getDefaultState(); + } + } + } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index f3aeb0cc0..32e6d730d 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -132,7 +132,10 @@ public final class ModBlocks { public static final Block livingwood = new BlockLivingwood(); public static final Block specialFlower = new BlockSpecialFlower(); public static final Block spreader = new BlockSpreader(); - public static final Block pool = new BlockPool(); + public static final Block manaPool = new BlockPool(BlockPool.Variant.DEFAULT); + public static final Block creativePool = new BlockPool(BlockPool.Variant.CREATIVE); + public static final Block dilutedPool = new BlockPool(BlockPool.Variant.DILUTED); + public static final Block fabulousPool = new BlockPool(BlockPool.Variant.FABULOUS); public static final Block runeAltar = new BlockRuneAltar(); public static final Block pylon = new BlockPylon(); public static final Block pistonRelay = new BlockPistonRelay(); @@ -246,7 +249,10 @@ public final class ModBlocks { r.register(livingwood); r.register(specialFlower); r.register(spreader); - r.register(pool); + r.register(manaPool); + r.register(creativePool); + r.register(dilutedPool); + r.register(fabulousPool); r.register(runeAltar); r.register(pylon); r.register(pistonRelay); @@ -363,7 +369,10 @@ public final class ModBlocks { r.register(new ItemBlockWithMetadataAndName(livingwood).setRegistryName(livingwood.getRegistryName())); r.register(new ItemBlockSpecialFlower(specialFlower).setRegistryName(specialFlower.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(spreader).setRegistryName(spreader.getRegistryName())); - r.register(new ItemBlockPool(pool).setRegistryName(pool.getRegistryName())); + r.register(new ItemBlockPool(manaPool).setRegistryName(manaPool.getRegistryName())); + r.register(new ItemBlockPool(creativePool).setRegistryName(creativePool.getRegistryName())); + r.register(new ItemBlockPool(dilutedPool).setRegistryName(dilutedPool.getRegistryName())); + r.register(new ItemBlockPool(fabulousPool).setRegistryName(fabulousPool.getRegistryName())); r.register(new ItemBlockMod(runeAltar).setRegistryName(runeAltar.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(pylon).setRegistryName(pylon.getRegistryName())); r.register(new ItemBlockMod(pistonRelay).setRegistryName(pistonRelay.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 8683fd4fe..fedb19ce6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -18,7 +18,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; @@ -42,10 +40,8 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.lexicon.LexiconData; @@ -54,39 +50,40 @@ import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; +import java.util.Locale; public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1); - public BlockPool() { - super(Material.ROCK, LibBlockNames.POOL); + public enum Variant { + DEFAULT, + CREATIVE, + DILUTED, + FABULOUS + } + + public final Variant variant; + + public BlockPool(Variant v) { + super(Material.ROCK, LibBlockNames.POOL_PREFIX + v.name().toLowerCase(Locale.ROOT)); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT) .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + this.variant = v; } @Nonnull @Override public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT, BotaniaStateProps.COLOR); + return new BlockStateContainer(this, BotaniaStateProps.COLOR); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta > PoolVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); + return 0; } @Nonnull @@ -106,11 +103,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return AABB; } - @Override - public int damageDropped(IBlockState state) { - return state.getBlock().getMetaFromState(state); - } - // If harvesting, delay setting block to air so getDrops can read the TE @Override public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { @@ -134,14 +126,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon world.setBlockToAir(pos); } - @Override - public void getSubBlocks(CreativeTabs par2, NonNullList par3) { - par3.add(new ItemStack(this, 1, 0)); - par3.add(new ItemStack(this, 1, 2)); - par3.add(new ItemStack(this, 1, 3)); - par3.add(new ItemStack(this, 1, 1)); - } - @Override public boolean hasTileEntity(IBlockState state) { return true; @@ -196,7 +180,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { - if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) + if (variant == Variant.FABULOUS) return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; else return EnumBlockRenderType.MODEL; } @@ -225,14 +209,14 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return world.getBlockState(pos).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool; + return variant == Variant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool; } @SideOnly(Side.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); - ModelHandler.registerBlockToState(this, PoolVariant.values().length); + super.registerModels(); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 6fe7fa41c..b1d336488 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -34,6 +34,7 @@ import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; @@ -313,17 +314,16 @@ public class TileAlfPortal extends TileMod implements ITickable { } public List locatePylons() { - List list = new ArrayList(); + List list = new ArrayList<>(); int range = 5; IBlockState pylonState = ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA); - IBlockState poolState = ModBlocks.pool.getDefaultState(); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) { BlockPos pos = new BlockPos(i, j, k); - if(checkPosition(pos, pylonState, false) && checkPosition(pos.down(), poolState, true)) + if(checkPosition(pos, pylonState, false) && world.getBlockState(pos.down()).getBlock() instanceof BlockPool) list.add(pos); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 0636f5134..6e3b07e42 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -19,6 +19,7 @@ import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; @@ -41,7 +42,7 @@ public class TilePylon extends TileEntity implements ITickable { if(activated && world.isRemote) { if(world.getBlockState(centerPos).getBlock() != getBlockForMeta() - || variant == PylonVariant.NATURA && (portalOff() || world.getBlockState(getPos().down()).getBlock() != ModBlocks.pool)) { + || variant == PylonVariant.NATURA && (portalOff() || !(world.getBlockState(getPos().down()).getBlock() instanceof BlockPool))) { activated = false; return; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 73f646fe9..5448627f6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -47,12 +47,12 @@ import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; @@ -60,8 +60,6 @@ import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.network.PacketBotaniaEffect; -import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; import java.awt.Color; @@ -111,9 +109,9 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; - if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + if(!(oldState.getBlock() instanceof BlockPool) || !(newState.getBlock() instanceof BlockPool)) return true; - return oldState.getValue(BotaniaStateProps.POOL_VARIANT) != newState.getValue(BotaniaStateProps.POOL_VARIANT); + return false; } @Override @@ -249,7 +247,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public void update() { if(manaCap == -1) - manaCap = world.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; + manaCap = ((BlockPool) getBlockType()).variant == BlockPool.Variant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; if(!ManaNetworkHandler.instance.isPoolIn(this) && !isInvalid()) ManaNetworkEvent.addPool(this); @@ -394,7 +392,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { - ItemStack pool = new ItemStack(ModBlocks.pool, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); + ItemStack pool = new ItemStack(getBlockType()); String name = I18n.format(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); @@ -436,12 +434,9 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public int getCurrentMana() { - if(world != null) { - IBlockState state = world.getBlockState(getPos()); - if(state.getProperties().containsKey(BotaniaStateProps.POOL_VARIANT)) - return state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.CREATIVE ? MAX_MANA : mana; + if (getBlockType() instanceof BlockPool) { + return ((BlockPool) getBlockType()).variant == BlockPool.Variant.CREATIVE ? MAX_MANA : mana; } - return 0; } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 95e37d086..1b53363ab 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -333,7 +333,10 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manaTablet); addItem(ModItems.manaMirror); addItem(ModItems.manaBottle); - addBlock(ModBlocks.pool); + addBlock(ModBlocks.manaPool); + addBlock(ModBlocks.creativePool); + addBlock(ModBlocks.dilutedPool); + addBlock(ModBlocks.fabulousPool); addBlock(ModBlocks.alchemyCatalyst); addBlock(ModBlocks.conjurationCatalyst); addBlock(ModBlocks.distributor); 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 079dc96b1..fd73bb46c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -202,7 +202,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { - return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.spreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.pool) : new ItemStack(ModItems.twigWand); + return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.spreader) : e instanceof SubTileFunctional ? 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 ddde72eff..48dda80a3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -441,9 +441,9 @@ public final class ModCraftingRecipes { recipesSpreader = allOfGroup(ModBlocks.spreader.getRegistryName()); - recipePool = path("pool_0"); - recipePoolDiluted = path("pool_2"); - recipePoolFabulous = path("pool_3"); + recipePool = ModBlocks.manaPool.getRegistryName(); + recipePoolDiluted = ModBlocks.dilutedPool.getRegistryName(); + recipePoolFabulous = ModBlocks.fabulousPool.getRegistryName(); recipeCobweb = path("web"); recipeSpark = ModItems.spark.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 742245b5c..2c8ba7a86 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -61,7 +61,7 @@ public class EntityPoolMinecart extends EntityMinecart { @Nonnull @Override public IBlockState getDisplayTile() { - return ModBlocks.pool.getDefaultState(); + return ModBlocks.manaPool.getDefaultState(); } @Nonnull @@ -100,7 +100,7 @@ public class EntityPoolMinecart extends EntityMinecart { @Override public void killMinecart(DamageSource source) { super.killMinecart(source); - dropItemWithOffset(Item.getItemFromBlock(ModBlocks.pool), 1, 0.0F); + dropItemWithOffset(Item.getItemFromBlock(ModBlocks.manaPool), 1, 0.0F); } @Override diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 62a9d41e9..afd594c33 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -165,6 +165,15 @@ public class FlattenItems implements IFixableData { return LibMisc.MOD_ID + ":" + LibBlockNames.AZULEJO_PREFIX + new_variant; }); + LOOKUP.put("botania:pool", i -> { + switch (i) { + default: + case 0: return ModBlocks.manaPool.getRegistryName().toString(); + case 1: return ModBlocks.creativePool.getRegistryName().toString(); + case 2: return ModBlocks.dilutedPool.getRegistryName().toString(); + case 3: return ModBlocks.fabulousPool.getRegistryName().toString(); + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index d761f9d9e..c7d71319c 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -18,18 +18,18 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.state.enums.PoolVariant; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public class ItemBlockPool extends ItemBlockWithMetadataAndName { +public class ItemBlockPool extends ItemBlockMod { - public ItemBlockPool(Block par2Block) { - super(par2Block); + public ItemBlockPool(Block block) { + super(block); addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), (stack, worldIn, entityIn) -> { - boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull"); + boolean renderFull = ((BlockPool) block).variant == BlockPool.Variant.CREATIVE || stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull"); return renderFull ? 1F : 0F; }); } @@ -37,7 +37,7 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { @SideOnly(Side.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { - if(par1ItemStack.getItemDamage() == 1) + if(((BlockPool) block).variant == BlockPool.Variant.CREATIVE) for(int i = 0; i < 2; i++) stacks.add(I18n.format("botaniamisc.creativePool" + i)); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 304ef0dfa..43155223e 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -435,7 +435,7 @@ public final class LexiconData { new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)) - .setIcon(new ItemStack(ModBlocks.pool)); + .setIcon(new ItemStack(ModBlocks.manaPool)); sparks = new BasicLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index fcf73e223..53cf51d5a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -54,7 +54,7 @@ public class PageManaInfusionRecipe extends PageRecipe { public PageManaInfusionRecipe(String unlocalizedName, List recipes) { super(unlocalizedName); this.recipes = recipes; - renderStack = new ItemStack(ModBlocks.pool, 1, 0); + renderStack = new ItemStack(ModBlocks.manaPool); ItemNBTHelper.setBoolean(renderStack, "RenderFull", true); } @@ -81,7 +81,6 @@ public class PageManaInfusionRecipe extends PageRecipe { renderItemAtGridPos(gui, 1, 1, (ItemStack) input, false); - renderStack.setItemDamage(recipe.getOutput().getItem() == Item.getItemFromBlock(ModBlocks.pool) ? 2 : 0); renderItemAtGridPos(gui, 2, 1, renderStack, false); renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index c63129b4d..dd8c5e8c6 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -19,6 +19,7 @@ public final class LibBlockNames { public static final String LIVING_WOOD = "livingwood"; public static final String SPREADER = "spreader"; public static final String POOL = "pool"; + public static final String POOL_PREFIX = POOL + "_"; public static final String RUNE_ALTAR = "runeAltar"; public static final String PYLON = "pylon"; public static final String PISTON_RELAY = "pistonRelay"; diff --git a/src/main/resources/assets/botania/advancements/main/mana_pool_pickup.json b/src/main/resources/assets/botania/advancements/main/mana_pool_pickup.json index dbdff3422..51777bbb1 100644 --- a/src/main/resources/assets/botania/advancements/main/mana_pool_pickup.json +++ b/src/main/resources/assets/botania/advancements/main/mana_pool_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:pool" + "item": "botania:pool_default" }, "title": { "translate": "advancement.botania:manaPoolPickup" @@ -12,15 +12,48 @@ }, "parent": "botania:main/generating_flower", "criteria": { - "pool": { + "default": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "botania:pool" + "item": "botania:pool_default" + } + ] + } + }, + "creative": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:pool_creative" + } + ] + } + }, + "diluted": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:pool_diluted" + } + ] + } + }, + "fabulous": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:pool_fabulous" } ] } } - } + }, + "requirements": [ + [ "default", "creative", "diluted", "fabulous" ] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json deleted file mode 100644 index 90b2e26d9..000000000 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "variant=default": { "model": "botania:pool_default" }, - "variant=diluted": { "model": "botania:pool_diluted" }, - "variant=creative": { "model": "botania:pool_creative" }, - "variant=fabulous": { "model": "botania:pool_fabulous" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool_creative.json b/src/main/resources/assets/botania/blockstates/pool_creative.json new file mode 100644 index 000000000..e1df7c320 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pool_creative.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:pool_creative" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool_default.json b/src/main/resources/assets/botania/blockstates/pool_default.json new file mode 100644 index 000000000..3a550368e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pool_default.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:pool_default" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool_diluted.json b/src/main/resources/assets/botania/blockstates/pool_diluted.json new file mode 100644 index 000000000..22d7e6cfc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pool_diluted.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:pool_diluted" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool_fabulous.json b/src/main/resources/assets/botania/blockstates/pool_fabulous.json new file mode 100644 index 000000000..429f666d3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pool_fabulous.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:pool_fabulous" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/de_de.lang b/src/main/resources/assets/botania/lang/de_de.lang index 278b291ce..15dd54e5a 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -117,8 +117,8 @@ tile.botania:livingwood4.name=Schnittgerahmtes Lebeholz tile.botania:livingwood5.name=Schimmerndes Lebeholz tile.botania:spreader0.name=Manaverbreiter tile.botania:spreader1.name=Redstone-Manaverbreiter -tile.botania:pool0.name=Manabecken -tile.botania:pool1.name=Das immerwährende Becken der Schuld +tile.botania:pool_default.name=Manabecken +tile.botania:pool_creative.name=Das immerwährende Becken der Schuld tile.botania:runeAltar.name=Runenaltar tile.botania:unstableBlock0.name=Weißer Instabiler Würfel tile.botania:unstableBlock1.name=Oranger Instabiler Würfel diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index dda1f1fb6..3bf162e87 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -664,10 +664,10 @@ tile.botania:spreader0.name=Mana Spreader tile.botania:spreader1.name=Pulse Mana Spreader tile.botania:spreader2.name=Elven Mana Spreader tile.botania:spreader3.name=Gaia Mana Spreader -tile.botania:pool0.name=Mana Pool -tile.botania:pool1.name=The Everlasting Guilty Pool -tile.botania:pool2.name=Diluted Mana Pool -tile.botania:pool3.name=Fabulous Mana Pool +tile.botania:pool_default.name=Mana Pool +tile.botania:pool_creative.name=The Everlasting Guilty Pool +tile.botania:pool_diluted.name=Diluted Mana Pool +tile.botania:pool_fabulous.name=Fabulous Mana Pool tile.botania:runeAltar.name=Runic Altar tile.botania:unstableBlock0.name=White Unstable Cube tile.botania:unstableBlock1.name=Orange Unstable Cube diff --git a/src/main/resources/assets/botania/lang/es_ar.lang b/src/main/resources/assets/botania/lang/es_ar.lang index 0c2feb189..ce753c547 100644 --- a/src/main/resources/assets/botania/lang/es_ar.lang +++ b/src/main/resources/assets/botania/lang/es_ar.lang @@ -177,9 +177,9 @@ tile.botania:spreader0.name=Esparcidor de Maná tile.botania:spreader1.name=Esparcidor de Maná de Redstone tile.botania:spreader2.name=Esparcidor de Maná Élfico tile.botania:spreader3.name=Esparcidor de Maná de Gaia -tile.botania:pool0.name=Pileta de Maná -tile.botania:pool1.name=La Pileta de Culpa Eterna -tile.botania:pool2.name=Pileta de Maná Diluido +tile.botania:pool_default.name=Pileta de Maná +tile.botania:pool_creative.name=La Pileta de Culpa Eterna +tile.botania:pool_diluted.name=Pileta de Maná Diluido tile.botania:runeAltar.name=Altar Rúnico tile.botania:unstableBlock0.name=Cubo Inestable Blanco tile.botania:unstableBlock1.name=Cubo Inestable Naranja diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 2b0986aa6..8d6c86ecd 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -525,9 +525,9 @@ tile.botania:spreader0.name=Esparcidor de maná tile.botania:spreader1.name=Esparcidor de maná de redstone tile.botania:spreader2.name=Esparcidor de maná élfico tile.botania:spreader3.name=Esparcidor de maná de Gaia -tile.botania:pool0.name=Pila de maná -tile.botania:pool1.name=Pila de culpa perpetua -tile.botania:pool2.name=Pila de maná diluida +tile.botania:pool_default.name=Pila de maná +tile.botania:pool_creative.name=Pila de culpa perpetua +tile.botania:pool_diluted.name=Pila de maná diluida tile.botania:runeAltar.name=Altar rúnico tile.botania:unstableBlock0.name=Cubo inestable blanco tile.botania:unstableBlock1.name=Cubo inestable naranja diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 3e79206d8..eab878b86 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -451,9 +451,9 @@ tile.botania:spreader0.name=Diffuseur de mana tile.botania:spreader1.name=Diffuseur de mana redstone tile.botania:spreader2.name=Diffuseur de mana elfique tile.botania:spreader3.name=Diffuseur de mana de Gaïa -tile.botania:pool0.name=Bassin de mana -tile.botania:pool1.name=Le bassin coupable éternelle -tile.botania:pool2.name=Bassin de mana dilué +tile.botania:pool_default.name=Bassin de mana +tile.botania:pool_creative.name=Le bassin coupable éternelle +tile.botania:pool_diluted.name=Bassin de mana dilué tile.botania:runeAltar.name=Autel runique tile.botania:unstableBlock0.name=Cube instable blanc tile.botania:unstableBlock1.name=Cube instable orange diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index c7ce50a22..e0845a456 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -441,10 +441,10 @@ tile.botania:spreader0.name=マナ送信機 tile.botania:spreader1.name=パルスマナ送信機 tile.botania:spreader2.name=エルヴェンマナ送信機 tile.botania:spreader3.name=ガイアマナ送信機 -tile.botania:pool0.name=マナプール -tile.botania:pool1.name=永遠のギルティプール -tile.botania:pool2.name=弱いマナプール -tile.botania:pool3.name=すばらしいマナプール +tile.botania:pool_default.name=マナプール +tile.botania:pool_creative.name=永遠のギルティプール +tile.botania:pool_diluted.name=弱いマナプール +tile.botania:pool_fabulous.name=すばらしいマナプール tile.botania:runeAltar.name=ルーンの祭壇 tile.botania:unstableBlock0.name=白色の不安定キューブ tile.botania:unstableBlock1.name=橙色の不安定キューブ diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index c1ef22ef0..90e5e09a6 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -490,9 +490,9 @@ tile.botania:spreader0.name=마나 공급기 tile.botania:spreader1.name=레드스톤 마나 공급기 tile.botania:spreader2.name=요정의 마나 공급기 tile.botania:spreader3.name=대지의 마나 공급기 -tile.botania:pool0.name=마나 웅덩이 -tile.botania:pool1.name=영원한 속죄의 웅덩이 -tile.botania:pool2.name=희박한 마나 웅덩이 +tile.botania:pool_default.name=마나 웅덩이 +tile.botania:pool_creative.name=영원한 속죄의 웅덩이 +tile.botania:pool_diluted.name=희박한 마나 웅덩이 tile.botania:runeAltar.name=신비로운 제단 tile.botania:unstableBlock0.name=하얀색 불안정한 큐브 tile.botania:unstableBlock1.name=주황색 불안정한 큐브 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 7007f45a5..9034938ae 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -515,9 +515,9 @@ tile.botania:spreader0.name=Mana Verspreider tile.botania:spreader1.name=Redstone Mana Verspreider tile.botania:spreader2.name=Elven Mana Verspreider tile.botania:spreader3.name=Gaia Mana Verspreider -tile.botania:pool0.name=Mana Voorraad -tile.botania:pool1.name=De Eeuwige Schuld Voorraad -tile.botania:pool2.name=Verdunde Mana Voorraad +tile.botania:pool_default.name=Mana Voorraad +tile.botania:pool_creative.name=De Eeuwige Schuld Voorraad +tile.botania:pool_diluted.name=Verdunde Mana Voorraad tile.botania:runeAltar.name=Runen Altaar tile.botania:unstableBlock0.name=Wit Instabiel Blok tile.botania:unstableBlock1.name=Oranje Instabiel Blok diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 575e8d478..c30a6c111 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -657,10 +657,10 @@ tile.botania:spreader0.name=Dispersor de Mana tile.botania:spreader1.name=Dispersor de Mana por Redstone tile.botania:spreader2.name=Dispersor de Mana Élfico tile.botania:spreader3.name=Dispersor de Mana de Gaia -tile.botania:pool0.name=Poço de Mana -tile.botania:pool1.name=O Eterno Poço da Culpa -tile.botania:pool2.name=Poço de Mana diluído -tile.botania:pool3.name=Poço de Mana Fabuloso +tile.botania:pool_default.name=Poço de Mana +tile.botania:pool_creative.name=O Eterno Poço da Culpa +tile.botania:pool_diluted.name=Poço de Mana diluído +tile.botania:pool_fabulous.name=Poço de Mana Fabuloso tile.botania:runeAltar.name=Altar Rúnico tile.botania:unstableBlock0.name=Cubo Instável Branco tile.botania:unstableBlock1.name=Cubo Instável Laranja diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 61c0d5554..7a1ae3280 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -268,9 +268,9 @@ tile.botania:spreader0.name=Распространитель маны tile.botania:spreader1.name=Красный распространитель маны tile.botania:spreader2.name=Эльфийский распространитель маны tile.botania:spreader3.name=Распространитель маны Гайи -tile.botania:pool0.name=Бассейн маны -tile.botania:pool1.name=Вечно наполненный бассейн -tile.botania:pool2.name=Бассейн разбавленной маны +tile.botania:pool_default.name=Бассейн маны +tile.botania:pool_creative.name=Вечно наполненный бассейн +tile.botania:pool_diluted.name=Бассейн разбавленной маны tile.botania:runeAltar.name=Рунический алтарь tile.botania:unstableBlock0.name=Белый нестабильный куб tile.botania:unstableBlock1.name=Оранжевый нестабильный куб diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 4f95e2b3c..35557bbf6 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -664,10 +664,10 @@ tile.botania:spreader0.name=魔力发射器 tile.botania:spreader1.name=魔力发射器(红石) tile.botania:spreader2.name=精灵魔力发射器 tile.botania:spreader3.name=盖亚魔力发射器 -tile.botania:pool0.name=魔力池 -tile.botania:pool1.name=永恒魔力池 -tile.botania:pool2.name=稀释魔力池 -tile.botania:pool3.name=神话魔力池 +tile.botania:pool_default.name=魔力池 +tile.botania:pool_creative.name=永恒魔力池 +tile.botania:pool_diluted.name=稀释魔力池 +tile.botania:pool_fabulous.name=神话魔力池 tile.botania:runeAltar.name=符文祭坛 tile.botania:unstableBlock0.name=白色不稳定立方 tile.botania:unstableBlock1.name=橙色不稳定立方 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 3f0f652f0..2a24a2630 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -621,10 +621,10 @@ tile.botania:spreader0.name=瑪那發射器 tile.botania:spreader1.name=瑪那發射器(紅石) tile.botania:spreader2.name=精靈瑪那發射器 tile.botania:spreader3.name=蓋亞瑪那發射器 -tile.botania:pool0.name=瑪那池 -tile.botania:pool1.name=永恆瑪那池 -tile.botania:pool2.name=稀釋瑪那池 -tile.botania:pool3.name=神話瑪那池 +tile.botania:pool_default.name=瑪那池 +tile.botania:pool_creative.name=永恆瑪那池 +tile.botania:pool_diluted.name=稀釋瑪那池 +tile.botania:pool_fabulous.name=神話瑪那池 tile.botania:runeAltar.name=符文祭壇 tile.botania:unstableBlock0.name=白色不穩定立方 tile.botania:unstableBlock1.name=橘色不穩定立方 diff --git a/src/main/resources/assets/botania/recipes/pool_0.json b/src/main/resources/assets/botania/recipes/pool_default.json similarity index 78% rename from src/main/resources/assets/botania/recipes/pool_0.json rename to src/main/resources/assets/botania/recipes/pool_default.json index f7ba75121..2a0d68fd8 100644 --- a/src/main/resources/assets/botania/recipes/pool_0.json +++ b/src/main/resources/assets/botania/recipes/pool_default.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pool", - "data": 0 + "item": "botania:pool_default" }, "pattern": [ "R R", diff --git a/src/main/resources/assets/botania/recipes/pool_2.json b/src/main/resources/assets/botania/recipes/pool_diluted.json similarity index 81% rename from src/main/resources/assets/botania/recipes/pool_2.json rename to src/main/resources/assets/botania/recipes/pool_diluted.json index 5a5ec1c4d..ed6dec0c4 100644 --- a/src/main/resources/assets/botania/recipes/pool_2.json +++ b/src/main/resources/assets/botania/recipes/pool_diluted.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pool", - "data": 2 + "item": "botania:pool_diluted" }, "pattern": [ "R R", diff --git a/src/main/resources/assets/botania/recipes/pool_3.json b/src/main/resources/assets/botania/recipes/pool_fabulous.json similarity index 80% rename from src/main/resources/assets/botania/recipes/pool_3.json rename to src/main/resources/assets/botania/recipes/pool_fabulous.json index 179317b2c..df51d5780 100644 --- a/src/main/resources/assets/botania/recipes/pool_3.json +++ b/src/main/resources/assets/botania/recipes/pool_fabulous.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pool", - "data": 3 + "item": "botania:pool_fabulous" }, "pattern": [ "R R", diff --git a/src/main/resources/assets/botania/recipes/poolminecart.json b/src/main/resources/assets/botania/recipes/poolminecart.json index 92ff70176..291e29994 100644 --- a/src/main/resources/assets/botania/recipes/poolminecart.json +++ b/src/main/resources/assets/botania/recipes/poolminecart.json @@ -7,8 +7,7 @@ "item": "minecraft:minecart" }, { - "item": "botania:pool", - "data": 0 + "item": "botania:pool_default" } ], "type": "minecraft:crafting_shapeless"