From 3f9993d7621b38ef82363ac120086d509bddb160 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 6 Mar 2018 11:56:20 -0600 Subject: [PATCH] Flatten pylons --- block_flattening_notes.txt | 4 ++ .../botania/api/state/BotaniaStateProps.java | 4 -- .../botania/api/state/enums/PylonVariant.java | 25 -------- .../client/core/handler/ModelHandler.java | 1 - .../client/core/proxy/ClientProxy.java | 4 +- .../botania/client/model/ModelPylonMana.java | 1 - .../client/render/tile/RenderTilePylon.java | 20 +++---- .../botania/common/block/BlockPylon.java | 57 +++++-------------- .../botania/common/block/ModBlocks.java | 12 +++- .../common/block/tile/TileAlfPortal.java | 5 +- .../common/block/tile/TileEnchanter.java | 4 +- .../botania/common/block/tile/TilePylon.java | 14 ++--- .../common/core/BotaniaCreativeTab.java | 4 +- .../common/crafting/ModCraftingRecipes.java | 6 +- .../common/entity/EntityDoppleganger.java | 5 +- .../botania/common/fixers/FlattenItems.java | 8 +++ .../botania/common/lib/LibBlockNames.java | 1 + .../assets/botania/blockstates/pylon.json | 25 -------- .../botania/blockstates/pylon_gaia.json | 12 ++++ .../botania/blockstates/pylon_mana.json | 12 ++++ .../botania/blockstates/pylon_natura.json | 12 ++++ .../resources/assets/botania/lang/en_us.lang | 6 +- .../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 | 6 +- .../resources/assets/botania/lang/ko_kr.lang | 6 +- .../resources/assets/botania/lang/nl_nl.lang | 6 +- .../resources/assets/botania/lang/pt_br.lang | 6 +- .../resources/assets/botania/lang/ru_ru.lang | 6 +- .../resources/assets/botania/lang/zh_cn.lang | 6 +- .../resources/assets/botania/lang/zh_tw.lang | 6 +- .../item/{itemblock => }/pylon_gaia.json | 0 .../item/{itemblock => }/pylon_mana.json | 0 .../item/{itemblock => }/pylon_natura.json | 0 .../recipes/{pylon_2.json => pylon_gaia.json} | 6 +- .../recipes/{pylon_0.json => pylon_mana.json} | 3 +- .../{pylon_1.json => pylon_natura.json} | 6 +- 38 files changed, 142 insertions(+), 175 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/PylonVariant.java delete mode 100644 src/main/resources/assets/botania/blockstates/pylon.json create mode 100644 src/main/resources/assets/botania/blockstates/pylon_gaia.json create mode 100644 src/main/resources/assets/botania/blockstates/pylon_mana.json create mode 100644 src/main/resources/assets/botania/blockstates/pylon_natura.json rename src/main/resources/assets/botania/models/item/{itemblock => }/pylon_gaia.json (100%) rename src/main/resources/assets/botania/models/item/{itemblock => }/pylon_mana.json (100%) rename src/main/resources/assets/botania/models/item/{itemblock => }/pylon_natura.json (100%) rename src/main/resources/assets/botania/recipes/{pylon_2.json => pylon_gaia.json} (72%) rename src/main/resources/assets/botania/recipes/{pylon_0.json => pylon_mana.json} (85%) rename src/main/resources/assets/botania/recipes/{pylon_1.json => pylon_natura.json} (72%) diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index 21b51d9a7..6aaa02058 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -35,3 +35,7 @@ botania:pool[variant={default, creative, diluted, fabulous}, 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 +botania:pylon[variant={mana, natura, gaia}] +=> botania:mana_pylon +=> botania:natura_pylon +=> botania:gaia_pylon diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 1c7e09795..95ac9ed9d 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.PylonVariant; import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.api.state.enums.SpreaderVariant; @@ -153,9 +152,6 @@ public final class BotaniaStateProps { // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); - // BlockPylon - public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); - // BlockSpreader public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java deleted file mode 100644 index 3a4ed9f09..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java +++ /dev/null @@ -1,25 +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 PylonVariant implements IStringSerializable { - MANA, - NATURA, - GAIA; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 56339af54..cba241c7a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -55,7 +55,6 @@ public final class ModelHandler { @SubscribeEvent public static void registerModels(ModelRegistryEvent evt) { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); - OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); registerSubtiles(); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 98e12f328..96b658be5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -225,7 +225,9 @@ public class ClientProxy implements IProxy { ShaderHelper.initShaders(); - IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, renderTilePylon); + IMultiblockRenderHook.renderHooks.put(ModBlocks.manaPylon, renderTilePylon); + IMultiblockRenderHook.renderHooks.put(ModBlocks.naturaPylon, renderTilePylon); + IMultiblockRenderHook.renderHooks.put(ModBlocks.gaiaPylon, renderTilePylon); } private void initAuxiliaryRender() { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonMana.java b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java index bdba0a1b7..b84d33d15 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonMana.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java @@ -12,7 +12,6 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import vazkii.botania.api.state.enums.PylonVariant; public class ModelPylonMana extends ModelBase implements IPylonModel { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index c4000f87d..b47d3acf8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -14,6 +14,7 @@ import java.util.Random; import javax.annotation.Nonnull; +import net.minecraft.block.Block; import org.lwjgl.opengl.GL11; import net.minecraft.block.state.IBlockState; @@ -30,8 +31,6 @@ import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -40,6 +39,7 @@ import vazkii.botania.client.model.IPylonModel; import vazkii.botania.client.model.ModelPylonGaia; import vazkii.botania.client.model.ModelPylonMana; import vazkii.botania.client.model.ModelPylonNatura; +import vazkii.botania.common.block.BlockPylon; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; @@ -54,20 +54,20 @@ public class RenderTilePylon extends TileEntitySpecialRenderer implem private final ModelPylonGaia gaiaModel = new ModelPylonGaia(); // Overrides for when we call this TESR without an actual pylon - private static PylonVariant forceVariant = PylonVariant.MANA; + private static BlockPylon.Variant forceVariant = BlockPylon.Variant.MANA; @Override public void render(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) { boolean renderingItem = pylon == ForwardingTEISR.DUMMY; - if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon)) + if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || !(pylon.getBlockType() instanceof BlockPylon))) return; renderPylon(pylon, d0, d1, d2, pticks, renderingItem); } private void renderPylon(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, boolean renderingItem) { - PylonVariant type = renderingItem ? forceVariant : ModBlocks.pylon.getStateFromMeta(pylon.getBlockMetadata()).getValue(BotaniaStateProps.PYLON_VARIANT); + BlockPylon.Variant type = renderingItem ? forceVariant : ((BlockPylon) pylon.getBlockType()).variant; IPylonModel model; switch(type) { default: @@ -138,7 +138,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer implem GlStateManager.popMatrix(); } - // Dirty hack to make the TEISR aware of the stack metas + // Dirty hack to make the TESR know which variant of pylon it's rendering public static class ForwardingTEISR extends TileEntityItemStackRenderer { private static final TilePylon DUMMY = new TilePylon(); @@ -150,8 +150,8 @@ public class RenderTilePylon extends TileEntitySpecialRenderer implem @Override public void renderByItem(ItemStack stack, float partialTicks) { - if(stack.getItem() == Item.getItemFromBlock(ModBlocks.pylon)) { - RenderTilePylon.forceVariant = PylonVariant.values()[MathHelper.clamp(stack.getItemDamage(), 0, PylonVariant.values().length)]; + if(Block.getBlockFromItem(stack.getItem()) instanceof BlockPylon) { + RenderTilePylon.forceVariant = ((BlockPylon) Block.getBlockFromItem(stack.getItem())).variant; TileEntityRendererDispatcher.instance.render(DUMMY, 0, 0, 0, partialTicks); } else { compose.renderByItem(stack, partialTicks); @@ -161,10 +161,10 @@ public class RenderTilePylon extends TileEntitySpecialRenderer implem @Override public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) { - forceVariant = state.getValue(BotaniaStateProps.PYLON_VARIANT); + forceVariant = ((BlockPylon) state.getBlock()).variant; GlStateManager.translate(-0.5, -0.25, -0.5); renderPylon((TilePylon) comp.getTileEntity(), 0, 0, 0, 0, true); - forceVariant = PylonVariant.MANA; + forceVariant = BlockPylon.Variant.MANA; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 6ef94e53f..0be2ce272 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -34,8 +34,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; @@ -43,18 +41,25 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; +import java.util.Locale; @Optional.Interface(modid = "thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { - private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 21.0/16, 0.875); - public BlockPylon() { - super(Material.IRON, LibBlockNames.PYLON); + public enum Variant { + MANA, + NATURA, + GAIA + } + + public final Variant variant; + public BlockPylon(Variant v) { + super(Material.IRON, LibBlockNames.PYLON_PREFIX + v.name().toLowerCase(Locale.ROOT)); setHardness(5.5F); setSoundType(SoundType.METAL); setLightLevel(0.5F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); + this.variant = v; } @Nonnull @@ -63,37 +68,6 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return AABB; } - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.PYLON_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta > PylonVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.values()[meta]); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void getSubBlocks(CreativeTabs par2, NonNullList par3) { - for(int i = 0; i < PylonVariant.values().length; i++) - par3.add(new ItemStack(this, 1, i)); - } - @Override public boolean isOpaqueCube(IBlockState state) { return false; @@ -112,8 +86,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi @Override public float getEnchantPowerBonus(World world, BlockPos pos) { - IBlockState state = world.getBlockState(pos); - if (state.getBlock() != this || state.getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA) { + if (variant == Variant.MANA) { return 8; } else { return 15; @@ -133,8 +106,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - PylonVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT); - return variant == PylonVariant.MANA ? LexiconData.pylon : variant == PylonVariant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; + return variant == Variant.MANA ? LexiconData.pylon : variant == Variant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } @Override @@ -145,8 +117,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi @SideOnly(Side.CLIENT) @Override public void registerModels() { - String[] names = { "mana", "natura", "gaia" }; - ModelHandler.registerCustomItemblock(this, names.length, i -> "pylon_" + names[i]); + ModelHandler.registerInventoryVariant(this); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 32e6d730d..4b9a8b5b1 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -137,7 +137,9 @@ public final class ModBlocks { 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 manaPylon = new BlockPylon(BlockPylon.Variant.MANA); + public static final Block naturaPylon = new BlockPylon(BlockPylon.Variant.NATURA); + public static final Block gaiaPylon = new BlockPylon(BlockPylon.Variant.GAIA); public static final Block pistonRelay = new BlockPistonRelay(); public static final Block distributor = new BlockDistributor(); public static final Block manaVoid = new BlockManaVoid(); @@ -254,7 +256,9 @@ public final class ModBlocks { r.register(dilutedPool); r.register(fabulousPool); r.register(runeAltar); - r.register(pylon); + r.register(manaPylon); + r.register(naturaPylon); + r.register(gaiaPylon); r.register(pistonRelay); r.register(distributor); r.register(manaVoid); @@ -374,7 +378,9 @@ public final class ModBlocks { 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(manaPylon).setRegistryName(manaPylon.getRegistryName())); + r.register(new ItemBlockMod(naturaPylon).setRegistryName(naturaPylon.getRegistryName())); + r.register(new ItemBlockMod(gaiaPylon).setRegistryName(gaiaPylon.getRegistryName())); r.register(new ItemBlockMod(pistonRelay).setRegistryName(pistonRelay.getRegistryName())); r.register(new ItemBlockMod(distributor).setRegistryName(distributor.getRegistryName())); r.register(new ItemBlockMod(manaVoid).setRegistryName(manaVoid.getRegistryName())); 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 b1d336488..99f4ed439 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -31,7 +31,6 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; 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; @@ -317,13 +316,13 @@ public class TileAlfPortal extends TileMod implements ITickable { List list = new ArrayList<>(); int range = 5; - IBlockState pylonState = ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA); + IBlockState pylonState = ModBlocks.naturaPylon.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) && world.getBlockState(pos.down()).getBlock() instanceof BlockPool) + if(world.getBlockState(pos) == pylonState && world.getBlockState(pos.down()).getBlock() instanceof BlockPool) list.add(pos); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index db6274ce0..7047bbcb4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -104,7 +104,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl for(BlockPos o : OBSIDIAN_LOCATIONS) mb.addComponent(o.up(), Blocks.OBSIDIAN.getDefaultState()); for(BlockPos p : PYLON_LOCATIONS.get(EnumFacing.Axis.X)) { - mb.addComponent(p.up(), ModBlocks.pylon.getDefaultState()); + mb.addComponent(p.up(), ModBlocks.manaPylon.getDefaultState()); mb.addComponent(new FlowerComponent(p, ModBlocks.flower)); } for(BlockPos f : FLOWER_LOCATIONS) @@ -406,7 +406,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl return false; for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) - if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon).down())) + if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.manaPylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon).down())) return false; for(BlockPos flower : FLOWER_LOCATIONS) 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 6e3b07e42..b2cad71b9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -16,8 +16,8 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; -import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.BlockPylon; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.core.handler.ConfigHandler; @@ -35,21 +35,21 @@ public class TilePylon extends TileEntity implements ITickable { public void update() { ++ticks; - if(world.getBlockState(getPos()).getBlock() != ModBlocks.pylon) + if(!(getBlockType() instanceof BlockPylon)) return; - PylonVariant variant = world.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); + BlockPylon.Variant variant = ((BlockPylon) getBlockType()).variant; if(activated && world.isRemote) { if(world.getBlockState(centerPos).getBlock() != getBlockForMeta() - || variant == PylonVariant.NATURA && (portalOff() || !(world.getBlockState(getPos().down()).getBlock() instanceof BlockPool))) { + || variant == BlockPylon.Variant.NATURA && (portalOff() || !(world.getBlockState(getPos().down()).getBlock() instanceof BlockPool))) { activated = false; return; } Vector3 centerBlock = new Vector3(centerPos.getX() + 0.5, centerPos.getY() + 0.75 + (Math.random() - 0.5 * 0.25), centerPos.getZ() + 0.5); - if(variant == PylonVariant.NATURA) { + if(variant == BlockPylon.Variant.NATURA) { if(ConfigHandler.elfPortalParticlesEnabled) { double worldTime = ticks; worldTime += new Random(pos.hashCode()).nextInt(1000); @@ -89,11 +89,11 @@ public class TilePylon extends TileEntity implements ITickable { } if(world.rand.nextBoolean() && world.isRemote) - Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == PylonVariant.GAIA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 0.5F : 1F, (float) Math.random(), 2); + Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == BlockPylon.Variant.GAIA ? 1F : 0.5F, variant == BlockPylon.Variant.NATURA ? 1F : 0.5F, variant == BlockPylon.Variant.NATURA ? 0.5F : 1F, (float) Math.random(), 2); } private Block getBlockForMeta() { - return world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal; + return ((BlockPylon) getBlockType()).variant == BlockPylon.Variant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal; } private boolean portalOff() { diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 1b53363ab..1c2c3bf7e 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -208,7 +208,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.incenseStick); addItem(ModItems.bloodPendant); addBlock(ModBlocks.felPumpkin); - addBlock(ModBlocks.pylon); + addBlock(ModBlocks.manaPylon); + addBlock(ModBlocks.naturaPylon); + addBlock(ModBlocks.gaiaPylon); addBlock(ModBlocks.pistonRelay); addBlock(ModBlocks.hourglass); addBlock(ModBlocks.animatedTorch); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 48dda80a3..340425edf 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -492,7 +492,7 @@ public final class ModCraftingRecipes { recipeBellows = ModBlocks.bellows.getRegistryName(); recipeRedstoneRoot = ModItems.redstoneRoot.getRegistryName(); recipesAltarMeta = allOfGroup("metamorphic_apothecary"); - recipePylon = path("pylon_0"); + recipePylon = ModBlocks.manaPylon.getRegistryName(); recipeTurntable = ModBlocks.turntable.getRegistryName(); recipeAlchemyCatalyst = ModBlocks.alchemyCatalyst.getRegistryName(); recipeOpenCrate = path("opencrate_0"); @@ -658,9 +658,9 @@ public final class ModCraftingRecipes { recipeThirdEye = ModItems.thirdEye.getRegistryName(); recipeGoddessCharm = ModItems.goddessCharm.getRegistryName(); recipeAlfPortal = ModBlocks.alfPortal.getRegistryName(); - recipeNaturaPylon = path("pylon_1"); + recipeNaturaPylon = ModBlocks.naturaPylon.getRegistryName(); recipeDreamwoodTwig = ModItems.dreamwoodTwig.getRegistryName(); - recipeGaiaPylon = path("pylon_2"); + recipeGaiaPylon = ModBlocks.gaiaPylon.getRegistryName(); recipeGaiaIngot = ModItems.gaiaIngot.getRegistryName(); recipeLivingrockDecor1 = path("livingrock_1"); recipeLivingrockDecor2 = path("livingrock_2"); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 8e25b3aab..394edf6d1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -70,7 +70,6 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; @@ -160,7 +159,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { Multiblock mb = new Multiblock(); for(BlockPos p : PYLON_LOCATIONS) - mb.addComponent(p.up(), ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.GAIA)); + mb.addComponent(p.up(), ModBlocks.gaiaPylon.getDefaultState()); for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) @@ -185,7 +184,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { IBlockState state = world.getBlockState(pos_); Block blockat = state.getBlock(); - if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { + if(blockat != ModBlocks.gaiaPylon) { if(!world.isRemote) player.sendMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); return false; diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index afd594c33..29032efe7 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -174,6 +174,14 @@ public class FlattenItems implements IFixableData { case 3: return ModBlocks.fabulousPool.getRegistryName().toString(); } }); + LOOKUP.put("botania:pylon", i -> { + switch (i) { + default: + case 0: return ModBlocks.manaPylon.getRegistryName().toString(); + case 1: return ModBlocks.naturaPylon.getRegistryName().toString(); + case 2: return ModBlocks.gaiaPylon.getRegistryName().toString(); + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index dd8c5e8c6..20c27a247 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -22,6 +22,7 @@ public final class LibBlockNames { public static final String POOL_PREFIX = POOL + "_"; public static final String RUNE_ALTAR = "runeAltar"; public static final String PYLON = "pylon"; + public static final String PYLON_PREFIX = PYLON + "_"; public static final String PISTON_RELAY = "pistonRelay"; public static final String DISTRIBUTOR = "distributor"; public static final String MANA_VOID = "manaVoid"; diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json deleted file mode 100644 index 2b722b677..000000000 --- a/src/main/resources/assets/botania/blockstates/pylon.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:dummy" - }, - "variants": { - "variant": { - "mana": { - "textures": { - "particle": "botania:model/pylon_mana" - } - }, - "natura": { - "textures": { - "particle": "botania:model/pylon_natura" - } - }, - "gaia": { - "textures": { - "particle": "botania:model/pylon_gaia" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pylon_gaia.json b/src/main/resources/assets/botania/blockstates/pylon_gaia.json new file mode 100644 index 000000000..40d811b87 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pylon_gaia.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:model/pylon_gaia" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pylon_mana.json b/src/main/resources/assets/botania/blockstates/pylon_mana.json new file mode 100644 index 000000000..f0f8f8243 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pylon_mana.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:model/pylon_mana" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pylon_natura.json b/src/main/resources/assets/botania/blockstates/pylon_natura.json new file mode 100644 index 000000000..5c72aa8a2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pylon_natura.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:model/pylon_natura" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 3bf162e87..aaaffa956 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -687,9 +687,9 @@ tile.botania:unstableBlock14.name=Red Unstable Cube tile.botania:unstableBlock15.name=Black Unstable Cube tile.botania:pistonRelay.name=Force Relay tile.botania:distributor.name=Mana Splitter -tile.botania:pylon0.name=Mana Pylon -tile.botania:pylon1.name=Natura Pylon -tile.botania:pylon2.name=Gaia Pylon +tile.botania:pylon_mana.name=Mana Pylon +tile.botania:pylon_natura.name=Natura Pylon +tile.botania:pylon_gaia.name=Gaia Pylon tile.botania:manaBeacon0.name=White Unstable Beacon tile.botania:manaBeacon1.name=Orange Unstable Beacon tile.botania:manaBeacon2.name=Magenta Unstable Beacon diff --git a/src/main/resources/assets/botania/lang/es_ar.lang b/src/main/resources/assets/botania/lang/es_ar.lang index ce753c547..ec2df91d6 100644 --- a/src/main/resources/assets/botania/lang/es_ar.lang +++ b/src/main/resources/assets/botania/lang/es_ar.lang @@ -199,9 +199,9 @@ tile.botania:unstableBlock14.name=Cubo Inestable Rojo tile.botania:unstableBlock15.name=Cubo Inestable Negro tile.botania:pistonRelay.name=Relé de Fuerza tile.botania:distributor.name=Mana Distributor -tile.botania:pylon0.name=Mana Pylon -tile.botania:pylon1.name=Natura Pylon -tile.botania:pylon2.name=Gaia Pylon +tile.botania:pylon_mana.name=Mana Pylon +tile.botania:pylon_natura.name=Natura Pylon +tile.botania:pylon_gaia.name=Gaia Pylon tile.botania:manaBeacon0.name=Faro Inestable Blanco tile.botania:manaBeacon1.name=Faro Inestable Naranja tile.botania:manaBeacon2.name=Faro Inestable Magenta diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 8d6c86ecd..e2611d969 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -547,9 +547,9 @@ tile.botania:unstableBlock14.name=Cubo inestable rojo tile.botania:unstableBlock15.name=Cubo inestable negro tile.botania:pistonRelay.name=Relé de fuerza tile.botania:distributor.name=Distribuidor de maná -tile.botania:pylon0.name=Pilón de maná -tile.botania:pylon1.name=Pilón de Natura -tile.botania:pylon2.name=Pilón de Gaia +tile.botania:pylon_mana.name=Pilón de maná +tile.botania:pylon_natura.name=Pilón de Natura +tile.botania:pylon_gaia.name=Pilón de Gaia tile.botania:manaBeacon0.name=Faro inestable blanco tile.botania:manaBeacon1.name=Faro inestable naranja tile.botania:manaBeacon2.name=Faro inestable magenta diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index eab878b86..cc5e82725 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -473,9 +473,9 @@ tile.botania:unstableBlock14.name=Cube instable rouge tile.botania:unstableBlock15.name=Cube instable noir tile.botania:pistonRelay.name=Relais de force tile.botania:distributor.name=Distributeur de mana -tile.botania:pylon0.name=Pylône de mana -tile.botania:pylon1.name=Pylône de Natura -tile.botania:pylon2.name=Pylône de Gaïa +tile.botania:pylon_mana.name=Pylône de mana +tile.botania:pylon_natura.name=Pylône de Natura +tile.botania:pylon_gaia.name=Pylône de Gaïa tile.botania:manaBeacon0.name=Balise instable blanche tile.botania:manaBeacon1.name=Balise instable orange tile.botania:manaBeacon2.name=Balise instable magenta diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index e0845a456..718cd3cc9 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -464,9 +464,9 @@ tile.botania:unstableBlock14.name=赤色の不安定キューブ tile.botania:unstableBlock15.name=黒色の不安定キューブ tile.botania:pistonRelay.name=フォース中継器 tile.botania:distributor.name=マナ分配器 -tile.botania:pylon0.name=マナの支柱 -tile.botania:pylon1.name=ナツーラの支柱 -tile.botania:pylon2.name=ガイアの支柱 +tile.botania:pylon_mana.name=マナの支柱 +tile.botania:pylon_natura.name=ナツーラの支柱 +tile.botania:pylon_gaia.name=ガイアの支柱 tile.botania:manaBeacon0.name=白色の不安定ビーコン tile.botania:manaBeacon1.name=橙色の不安定ビーコン tile.botania:manaBeacon2.name=赤紫色の不安定ビーコン diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 90e5e09a6..8febfe7c9 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -512,9 +512,9 @@ tile.botania:unstableBlock14.name=빨강색 불안정한 큐브 tile.botania:unstableBlock15.name=검은색 불안정한 큐브 tile.botania:pistonRelay.name=힘 전달기 tile.botania:distributor.name=마나 분산기 -tile.botania:pylon0.name=마나 송전탑 -tile.botania:pylon1.name=자연 송전탑 -tile.botania:pylon2.name=대지 송전탑 +tile.botania:pylon_mana.name=마나 송전탑 +tile.botania:pylon_natura.name=자연 송전탑 +tile.botania:pylon_gaia.name=대지 송전탑 tile.botania:manaBeacon0.name=하얀색 불안정한 신호기 tile.botania:manaBeacon1.name=주황색 불안정한 신호기 tile.botania:manaBeacon2.name=자홍색 불안정한 신호기 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 9034938ae..6fdeb783f 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -537,9 +537,9 @@ tile.botania:unstableBlock14.name=Rood Instabiel Blok tile.botania:unstableBlock15.name=Zwart Instabiel Blok tile.botania:pistonRelay.name=Krachtverbinding tile.botania:distributor.name=Mana Verdeler -tile.botania:pylon0.name=Mana Zuil -tile.botania:pylon1.name=Natura Zuil -tile.botania:pylon2.name=Gaia Zuil +tile.botania:pylon_mana.name=Mana Zuil +tile.botania:pylon_natura.name=Natura Zuil +tile.botania:pylon_gaia.name=Gaia Zuil tile.botania:manaBeacon0.name=Wit Instabiel Baken tile.botania:manaBeacon1.name=Oranje Instabiel Baken tile.botania:manaBeacon2.name=Magenta Instabiel Baken diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index c30a6c111..1c2333e6b 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -680,9 +680,9 @@ tile.botania:unstableBlock14.name=Cubo Instável Vermelho tile.botania:unstableBlock15.name=Cubo Instável Preto tile.botania:pistonRelay.name=Transmissor de Mana tile.botania:distributor.name=Distribuidor de Mana -tile.botania:pylon0.name=Pilão de Mana -tile.botania:pylon1.name=Pilão da Natureza -tile.botania:pylon2.name=Pilão de Gaia +tile.botania:pylon_mana.name=Pilão de Mana +tile.botania:pylon_natura.name=Pilão da Natureza +tile.botania:pylon_gaia.name=Pilão de Gaia tile.botania:manaBeacon0.name=Sinalizador Instável Branco tile.botania:manaBeacon1.name=Sinalizador Instável Laranja tile.botania:manaBeacon2.name=Sinalizador Instável Magenta diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 7a1ae3280..75f3fa4d7 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -290,9 +290,9 @@ tile.botania:unstableBlock14.name=Красный нестабильный куб tile.botania:unstableBlock15.name=Чёрный нестабильный куб tile.botania:pistonRelay.name=Силовое реле tile.botania:distributor.name=Распределитель маны -tile.botania:pylon0.name=Пилон маны -tile.botania:pylon1.name=Природный пилон -tile.botania:pylon2.name=Гайа пилон +tile.botania:pylon_mana.name=Пилон маны +tile.botania:pylon_natura.name=Природный пилон +tile.botania:pylon_gaia.name=Гайа пилон tile.botania:manaBeacon0.name=Белый нестабильный маяк tile.botania:manaBeacon1.name=Оранжевый нестабильный маяк tile.botania:manaBeacon2.name=Сиреневый нестабильный маяк diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 35557bbf6..cb47bf1be 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -687,9 +687,9 @@ tile.botania:unstableBlock14.name=红色不稳定立方 tile.botania:unstableBlock15.name=黑色不稳定立方 tile.botania:pistonRelay.name=力量传递器 tile.botania:distributor.name=魔力分配器 -tile.botania:pylon0.name=魔法水晶 -tile.botania:pylon1.name=自然水晶 -tile.botania:pylon2.name=盖亚水晶 +tile.botania:pylon_mana.name=魔法水晶 +tile.botania:pylon_natura.name=自然水晶 +tile.botania:pylon_gaia.name=盖亚水晶 tile.botania:manaBeacon0.name=白色不稳定信标 tile.botania:manaBeacon1.name=橙色不稳定信标 tile.botania:manaBeacon2.name=品红色不稳定信标 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 2a24a2630..63f00741a 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -644,9 +644,9 @@ tile.botania:unstableBlock14.name=紅色不穩定立方 tile.botania:unstableBlock15.name=黑色不穩定立方 tile.botania:pistonRelay.name=力量傳遞器 tile.botania:distributor.name=瑪那分配器 -tile.botania:pylon0.name=瑪那水晶 -tile.botania:pylon1.name=自然水晶 -tile.botania:pylon2.name=蓋亞水晶 +tile.botania:pylon_mana.name=瑪那水晶 +tile.botania:pylon_natura.name=自然水晶 +tile.botania:pylon_gaia.name=蓋亞水晶 tile.botania:manaBeacon0.name=白色不穩定信標 tile.botania:manaBeacon1.name=橘色不穩定信標 tile.botania:manaBeacon2.name=洋紅色不穩定信標 diff --git a/src/main/resources/assets/botania/models/item/itemblock/pylon_gaia.json b/src/main/resources/assets/botania/models/item/pylon_gaia.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/pylon_gaia.json rename to src/main/resources/assets/botania/models/item/pylon_gaia.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/pylon_mana.json b/src/main/resources/assets/botania/models/item/pylon_mana.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/pylon_mana.json rename to src/main/resources/assets/botania/models/item/pylon_mana.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/pylon_natura.json b/src/main/resources/assets/botania/models/item/pylon_natura.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/pylon_natura.json rename to src/main/resources/assets/botania/models/item/pylon_natura.json diff --git a/src/main/resources/assets/botania/recipes/pylon_2.json b/src/main/resources/assets/botania/recipes/pylon_gaia.json similarity index 72% rename from src/main/resources/assets/botania/recipes/pylon_2.json rename to src/main/resources/assets/botania/recipes/pylon_gaia.json index 0eedf7b56..e208df57f 100644 --- a/src/main/resources/assets/botania/recipes/pylon_2.json +++ b/src/main/resources/assets/botania/recipes/pylon_gaia.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pylon", - "data": 2 + "item": "botania:pylon_gaia" }, "pattern": [ " D ", @@ -11,8 +10,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:pylon", - "data": 0 + "item": "botania:pylon_mana" }, "D": { "item": "#ELVENPIXIEDUST" diff --git a/src/main/resources/assets/botania/recipes/pylon_0.json b/src/main/resources/assets/botania/recipes/pylon_mana.json similarity index 85% rename from src/main/resources/assets/botania/recipes/pylon_0.json rename to src/main/resources/assets/botania/recipes/pylon_mana.json index 00dd16058..eb107ee9f 100644 --- a/src/main/resources/assets/botania/recipes/pylon_0.json +++ b/src/main/resources/assets/botania/recipes/pylon_mana.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pylon", - "data": 0 + "item": "botania:pylon_mana" }, "pattern": [ " G ", diff --git a/src/main/resources/assets/botania/recipes/pylon_1.json b/src/main/resources/assets/botania/recipes/pylon_natura.json similarity index 72% rename from src/main/resources/assets/botania/recipes/pylon_1.json rename to src/main/resources/assets/botania/recipes/pylon_natura.json index 1b9b292fb..b477b1d98 100644 --- a/src/main/resources/assets/botania/recipes/pylon_1.json +++ b/src/main/resources/assets/botania/recipes/pylon_natura.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pylon", - "data": 1 + "item": "botania:pylon_natura" }, "pattern": [ " T ", @@ -11,8 +10,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:pylon", - "data": 0 + "item": "botania:pylon_mana" }, "T": { "item": "#NUGGETTERRASTEEL"