From 2d567f04cb4f96ed5c474434f2e9740639fdaa3a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 7 Mar 2018 19:39:25 -0600 Subject: [PATCH] Flatten spreaders --- .../botania/api/state/BotaniaStateProps.java | 10 +--- .../api/state/enums/SpreaderVariant.java | 26 ---------- .../client/core/handler/ColorHandler.java | 7 +-- .../render/tile/RenderTileSpreader.java | 4 -- .../botania/common/block/ModBlocks.java | 15 ++++-- .../common/block/mana/BlockSpreader.java | 51 +++++-------------- .../subtile/generating/SubTileEndoflame.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 19 ++----- .../common/core/BotaniaCreativeTab.java | 5 +- .../core/handler/InternalMethodHandler.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 8 +-- .../botania/common/fixers/FlattenItems.java | 9 ++++ .../botania/common/lib/LibBlockNames.java | 1 + .../botania/blockstates/elven_spreader.json | 5 ++ .../botania/blockstates/gaia_spreader.json | 5 ++ .../botania/blockstates/mana_spreader.json | 5 ++ .../blockstates/redstone_spreader.json | 5 ++ .../assets/botania/blockstates/spreader.json | 8 --- .../resources/assets/botania/lang/de_de.lang | 4 +- .../resources/assets/botania/lang/en_us.lang | 8 +-- .../resources/assets/botania/lang/es_ar.lang | 8 +-- .../resources/assets/botania/lang/es_es.lang | 8 +-- .../resources/assets/botania/lang/fr_fr.lang | 8 +-- .../resources/assets/botania/lang/ja_jp.lang | 8 +-- .../resources/assets/botania/lang/ko_kr.lang | 8 +-- .../resources/assets/botania/lang/nl_nl.lang | 8 +-- .../resources/assets/botania/lang/pt_br.lang | 8 +-- .../resources/assets/botania/lang/ru_ru.lang | 8 +-- .../resources/assets/botania/lang/zh_cn.lang | 8 +-- .../resources/assets/botania/lang/zh_tw.lang | 8 +-- .../{spreader_2.json => elven_spreader.json} | 3 +- .../{spreader_3.json => gaia_spreader.json} | 6 +-- .../{spreader_0.json => mana_spreader.json} | 3 +- .../{spreader_0.json => mana_spreader.json} | 3 +- .../assets/botania/recipes/managun.json | 3 +- ...spreader_1.json => redstone_spreader.json} | 6 +-- .../botania/recipes/redstringrelay.json | 3 +- 37 files changed, 129 insertions(+), 179 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java create mode 100644 src/main/resources/assets/botania/blockstates/elven_spreader.json create mode 100644 src/main/resources/assets/botania/blockstates/gaia_spreader.json create mode 100644 src/main/resources/assets/botania/blockstates/mana_spreader.json create mode 100644 src/main/resources/assets/botania/blockstates/redstone_spreader.json delete mode 100644 src/main/resources/assets/botania/blockstates/spreader.json rename src/main/resources/assets/botania/recipes/{spreader_2.json => elven_spreader.json} (95%) rename src/main/resources/assets/botania/recipes/{spreader_3.json => gaia_spreader.json} (72%) rename src/main/resources/assets/botania/recipes/garden_of_glass/{spreader_0.json => mana_spreader.json} (96%) rename src/main/resources/assets/botania/recipes/{spreader_0.json => mana_spreader.json} (96%) rename src/main/resources/assets/botania/recipes/{spreader_1.json => redstone_spreader.json} (63%) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 44813b063..33906cb30 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -28,9 +28,7 @@ import vazkii.botania.api.state.enums.CratePattern; 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.QuartzVariant; -import vazkii.botania.api.state.enums.SpreaderVariant; /** * Holds all Botania block state properties. Use these to set botania blockstates @@ -127,7 +125,7 @@ public final class BotaniaStateProps { } }); - // BlockOpenCrate + // BlockCraftyCrate public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); // BlockPavement @@ -140,15 +138,9 @@ public final class BotaniaStateProps { } }); - // BlockPlatform - public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); - // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); - // BlockSpreader - public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); - private BotaniaStateProps() { } diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java deleted file mode 100644 index 3794b113f..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.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 SpreaderVariant implements IStringSerializable { - MANA, - REDSTONE, - ELVEN, - GAIA; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} 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 cb39d7d96..93a760bec 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -19,7 +19,6 @@ 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.SpreaderVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; @@ -66,12 +65,10 @@ public final class ColorHandler { // Spreader blocks.registerBlockColorHandler( (state, world, pos, tintIndex) -> { - if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) - return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return Color.HSBtoRGB(time * 5 % 360 / 360F, 0.4F, 0.9F); }, - ModBlocks.spreader + ModBlocks.gaiaSpreader ); // Petal Block @@ -117,7 +114,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.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.spreader); + ModBlocks.petalBlock, ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.gaiaSpreader); 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/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index b11bc6087..efee81d84 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -49,10 +49,6 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer @Override public void render(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress, float unused) { - if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false) - || spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader) - return; - GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 4c82255c5..38b4e6920 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -140,7 +140,10 @@ public final class ModBlocks { public static final Block livingrock = new BlockLivingrock(); 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 manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA); + public static final Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE); + public static final Block elvenSpreader = new BlockSpreader(BlockSpreader.Variant.ELVEN); + public static final Block gaiaSpreader = new BlockSpreader(BlockSpreader.Variant.GAIA); 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); @@ -271,7 +274,10 @@ public final class ModBlocks { r.register(livingrock); r.register(livingwood); r.register(specialFlower); - r.register(spreader); + r.register(manaSpreader); + r.register(redstoneSpreader); + r.register(elvenSpreader); + r.register(gaiaSpreader); r.register(manaPool); r.register(creativePool); r.register(dilutedPool); @@ -405,7 +411,10 @@ public final class ModBlocks { r.register(new ItemBlockWithMetadataAndName(livingrock).setRegistryName(livingrock.getRegistryName())); 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 ItemBlockMod(manaSpreader).setRegistryName(manaSpreader.getRegistryName())); + r.register(new ItemBlockMod(redstoneSpreader).setRegistryName(redstoneSpreader.getRegistryName())); + r.register(new ItemBlockMod(elvenSpreader).setRegistryName(elvenSpreader.getRegistryName())); + r.register(new ItemBlockMod(gaiaSpreader).setRegistryName(gaiaSpreader.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())); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index b06e57a19..693cd6ca3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -39,7 +39,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; @@ -52,40 +51,23 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; +import java.util.Locale; public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { - public BlockSpreader() { - super(Material.WOOD, LibBlockNames.SPREADER); + public enum Variant { + MANA, + REDSTONE, + ELVEN, + GAIA + } + + public final Variant variant; + public BlockSpreader(Variant v) { + super(Material.WOOD, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.SPREADER_SUFFIX); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.SPREADER_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta > SpreaderVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.values()[meta]); - } - - @Override - public void getSubBlocks(CreativeTabs par2, NonNullList par3) { - for(int i = 0; i < 4; i++) - par3.add(new ItemStack(this, 1, i)); + this.variant = v; } @Override @@ -220,8 +202,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - SpreaderVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.SPREADER_VARIANT); - return variant == SpreaderVariant.MANA ? LexiconData.spreader : variant == SpreaderVariant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; + return variant == Variant.MANA ? LexiconData.spreader : variant == Variant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; } @Override @@ -229,12 +210,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return FULL_BLOCK_AABB.offset(pos).shrink(1.0/16.0); } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, SpreaderVariant.values().length); - } - @Nonnull @Override public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index f740a38f9..ef8f1b85a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.generating; +import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; @@ -24,6 +25,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.mana.BlockSpreader; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; @@ -61,7 +63,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(stack.isEmpty() || stack.getItem().hasContainerItem(stack)) continue; - int burnTime = stack.getItem() == Item.getItemFromBlock(ModBlocks.spreader) ? 0 : TileEntityFurnace.getItemBurnTime(stack); + int burnTime = Block.getBlockFromItem(stack.getItem()) instanceof BlockSpreader ? 0 : TileEntityFurnace.getItemBurnTime(stack); if(burnTime > 0 && stack.getCount() > 0) { this.burnTime = Math.min(FUEL_CAP, burnTime) / 2; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 3bfa8777d..572173b5d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -51,7 +51,6 @@ import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.lib.LibResources; @@ -150,15 +149,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, List lastTentativeBurst; boolean invalidTentativeBurst = false; - @Override - public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { - if(oldState.getBlock() != newState.getBlock()) - return true; - if(oldState.getBlock() != ModBlocks.spreader || newState.getBlock() != ModBlocks.spreader) - return true; - return oldState.getValue(BotaniaStateProps.SPREADER_VARIANT) != newState.getValue(BotaniaStateProps.SPREADER_VARIANT); - } - @Override public boolean isFull() { return mana >= getMaxMana(); @@ -452,18 +442,17 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, public boolean isRedstone() { updateContainingBlockInfo(); - return world == null ? staticRedstone : getBlockMetadata() == SpreaderVariant.REDSTONE.ordinal(); + return world == null ? staticRedstone : getBlockType() == ModBlocks.redstoneSpreader; } public boolean isDreamwood() { updateContainingBlockInfo(); - int variant = getBlockMetadata(); - return world == null ? staticDreamwood : variant == SpreaderVariant.ELVEN.ordinal(); + return world == null ? staticDreamwood : getBlockType() == ModBlocks.elvenSpreader; } public boolean isULTRA_SPREADER() { updateContainingBlockInfo(); - return world == null ? staticUltra : getBlockMetadata() == SpreaderVariant.GAIA.ordinal(); + return world == null ? staticUltra : getBlockType() == ModBlocks.gaiaSpreader; } public void checkForReceiver() { @@ -569,7 +558,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = new ItemStack(getBlockType()).getDisplayName(); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 86307cc2a..eee62c573 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -362,7 +362,10 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.poolMinecart); addBlock(ModBlocks.pump); addBlock(ModBlocks.rfGenerator); - addBlock(ModBlocks.spreader); + addBlock(ModBlocks.manaSpreader); + addBlock(ModBlocks.redstoneSpreader); + addBlock(ModBlocks.elvenSpreader); + addBlock(ModBlocks.gaiaSpreader); addBlock(ModBlocks.turntable); addBlock(ModBlocks.prism); addItem(ModItems.lensNormal); 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 fd73bb46c..2bc990b6c 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.manaPool) : new ItemStack(ModItems.twigWand); + return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.manaSpreader) : 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 366ac88fd..c7600dbbd 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -439,7 +439,7 @@ public final class ModCraftingRecipes { recipeEndPortal = gogPath("end_portal_frame"); } - recipesSpreader = allOfGroup(ModBlocks.spreader.getRegistryName()); + recipesSpreader = allOfGroup("spreader"); recipePool = ModBlocks.manaPool.getRegistryName(); recipePoolDiluted = ModBlocks.dilutedPool.getRegistryName(); @@ -482,9 +482,9 @@ public final class ModCraftingRecipes { recipeManaTablet = ModItems.manaTablet.getRegistryName(); recipeManaMirror = ModItems.manaMirror.getRegistryName(); recipeManaDetector = ModBlocks.manaDetector.getRegistryName(); - recipeRedstoneSpreader = path("spreader_1"); - recipeDreamwoodSpreader = path("spreader_2"); - recipeUltraSpreader = path("spreader_3"); + recipeRedstoneSpreader = ModBlocks.redstoneSpreader.getRegistryName(); + recipeDreamwoodSpreader = ModBlocks.elvenSpreader.getRegistryName(); + recipeUltraSpreader = ModBlocks.gaiaSpreader.getRegistryName(); recipePrism = ModBlocks.prism.getRegistryName(); recipePoolCart = ModItems.poolMinecart.getRegistryName(); recipePump = ModBlocks.pump.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 44009438f..13eb83615 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -199,6 +199,15 @@ public class FlattenItems implements IFixableData { return ModBlocks.openCrate.getRegistryName().toString(); } }); + LOOKUP.put("botania:spreader", i -> { + switch(i) { + default: + case 0: return ModBlocks.manaSpreader.getRegistryName().toString(); + case 1: return ModBlocks.redstoneSpreader.getRegistryName().toString(); + case 2: return ModBlocks.elvenSpreader.getRegistryName().toString(); + case 3: return ModBlocks.gaiaSpreader.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 2d1a46c6e..5ad927bb7 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_ROCK = "livingrock"; public static final String LIVING_WOOD = "livingwood"; public static final String SPREADER = "spreader"; + public static final String SPREADER_SUFFIX = "_" + SPREADER; public static final String POOL = "pool"; public static final String POOL_PREFIX = POOL + "_"; public static final String RUNE_ALTAR = "runeAltar"; diff --git a/src/main/resources/assets/botania/blockstates/elven_spreader.json b/src/main/resources/assets/botania/blockstates/elven_spreader.json new file mode 100644 index 000000000..03d93bdec --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/elven_spreader.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:spreader_elven" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gaia_spreader.json b/src/main/resources/assets/botania/blockstates/gaia_spreader.json new file mode 100644 index 000000000..d180bd131 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gaia_spreader.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:spreader_gaia" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mana_spreader.json b/src/main/resources/assets/botania/blockstates/mana_spreader.json new file mode 100644 index 000000000..66ba11531 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mana_spreader.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:spreader_mana" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redstone_spreader.json b/src/main/resources/assets/botania/blockstates/redstone_spreader.json new file mode 100644 index 000000000..e99c2ee26 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/redstone_spreader.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:spreader_redstone" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json deleted file mode 100644 index 0187bedbb..000000000 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "variant=mana": { "model": "botania:spreader_mana" }, - "variant=redstone": { "model": "botania:spreader_redstone" }, - "variant=elven": { "model": "botania:spreader_elven" }, - "variant=gaia": { "model": "botania:spreader_gaia" } - } -} \ 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 15dd54e5a..e88545c2c 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -115,8 +115,8 @@ tile.botania:livingwood2.name=Bemooste Lebeholzbretter tile.botania:livingwood3.name=Gerahmtes Lebeholz 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:mana_spreader.name=Manaverbreiter +tile.botania:redstone_spreader.name=Redstone-Manaverbreiter tile.botania:pool_default.name=Manabecken tile.botania:pool_creative.name=Das immerwährende Becken der Schuld tile.botania:runeAltar.name=Runenaltar diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index d51faf873..6a2a2106b 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -660,10 +660,10 @@ tile.botania:livingwood2.name=Mossy Livingwood Planks tile.botania:livingwood3.name=Framed Livingwood tile.botania:livingwood4.name=Pattern Framed Livingwood tile.botania:livingwood5.name=Glimmering Livingwood -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:mana_spreader.name=Mana Spreader +tile.botania:redstone_spreader.name=Pulse Mana Spreader +tile.botania:elven_spreader.name=Elven Mana Spreader +tile.botania:gaia_spreader.name=Gaia Mana Spreader tile.botania:pool_default.name=Mana Pool tile.botania:pool_creative.name=The Everlasting Guilty Pool tile.botania:pool_diluted.name=Diluted Mana Pool diff --git a/src/main/resources/assets/botania/lang/es_ar.lang b/src/main/resources/assets/botania/lang/es_ar.lang index ec2df91d6..55e3af9e5 100644 --- a/src/main/resources/assets/botania/lang/es_ar.lang +++ b/src/main/resources/assets/botania/lang/es_ar.lang @@ -173,10 +173,10 @@ tile.botania:livingwood2.name=Tabla de Madera Viviente Musgosa tile.botania:livingwood3.name=Madera Viviente con Marco tile.botania:livingwood4.name=Madera Viviente con Marco y Diseño tile.botania:livingwood5.name=Madera Viviente con Destello -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:mana_spreader.name=Esparcidor de Maná +tile.botania:redstone_spreader.name=Esparcidor de Maná de Redstone +tile.botania:elven_spreader.name=Esparcidor de Maná Élfico +tile.botania:gaia_spreader.name=Esparcidor de Maná de Gaia 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 diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 37a5662a6..dd3da2046 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -521,10 +521,10 @@ tile.botania:livingwood2.name=Tabla musgosa de madera viviente tile.botania:livingwood3.name=Madera viviente tallada tile.botania:livingwood4.name=Madera viviente decorada tile.botania:livingwood5.name=Madera viviente centelleante -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:mana_spreader.name=Esparcidor de maná +tile.botania:redstone_spreader.name=Esparcidor de maná de redstone +tile.botania:elven_spreader.name=Esparcidor de maná élfico +tile.botania:gaia_spreader.name=Esparcidor de maná de Gaia 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 diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 42209542b..90194f528 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -447,10 +447,10 @@ tile.botania:livingwood2.name=Planches de vifbois moussues tile.botania:livingwood3.name=Vifbois encastré tile.botania:livingwood4.name=Modèle de vifbois encastré tile.botania:livingwood5.name=Vifbois chatoyant -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:mana_spreader.name=Diffuseur de mana +tile.botania:redstone_spreader.name=Diffuseur de mana redstone +tile.botania:elven_spreader.name=Diffuseur de mana elfique +tile.botania:gaia_spreader.name=Diffuseur de mana de Gaïa 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é diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 46cc6a621..50d10d09b 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -437,10 +437,10 @@ tile.botania:livingwood2.name=苔むしたリビングウッドの木材 tile.botania:livingwood3.name=模様入りのリビングウッド tile.botania:livingwood4.name=規則的な模様入りのリビングウッド tile.botania:livingwood5.name=光り輝くリビングウッド -tile.botania:spreader0.name=マナ送信機 -tile.botania:spreader1.name=パルスマナ送信機 -tile.botania:spreader2.name=エルヴェンマナ送信機 -tile.botania:spreader3.name=ガイアマナ送信機 +tile.botania:mana_spreader.name=マナ送信機 +tile.botania:redstone_spreader.name=パルスマナ送信機 +tile.botania:elven_spreader.name=エルヴェンマナ送信機 +tile.botania:gaia_spreader.name=ガイアマナ送信機 tile.botania:pool_default.name=マナプール tile.botania:pool_creative.name=永遠のギルティプール tile.botania:pool_diluted.name=弱いマナプール diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index f42e700fa..7dfd09e93 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -486,10 +486,10 @@ tile.botania:livingwood2.name=이끼 낀 생명의 나무 목재 tile.botania:livingwood3.name=테두리 생명의 나무 tile.botania:livingwood4.name=무늬가 있는 생명의 나무 tile.botania:livingwood5.name=빛나는 생명의 나무 -tile.botania:spreader0.name=마나 공급기 -tile.botania:spreader1.name=레드스톤 마나 공급기 -tile.botania:spreader2.name=요정의 마나 공급기 -tile.botania:spreader3.name=대지의 마나 공급기 +tile.botania:mana_spreader.name=마나 공급기 +tile.botania:redstone_spreader.name=레드스톤 마나 공급기 +tile.botania:elven_spreader.name=요정의 마나 공급기 +tile.botania:gaia_spreader.name=대지의 마나 공급기 tile.botania:pool_default.name=마나 웅덩이 tile.botania:pool_creative.name=영원한 속죄의 웅덩이 tile.botania:pool_diluted.name=희박한 마나 웅덩이 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index ebeafac91..e8a7d8c41 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -511,10 +511,10 @@ tile.botania:livingwood2.name=Mossige Levenshout Planken tile.botania:livingwood3.name=Omlijst Levenshout tile.botania:livingwood4.name=Patroon Omlijst Levenshout tile.botania:livingwood5.name=Glinsterend Levenshout -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:mana_spreader.name=Mana Verspreider +tile.botania:redstone_spreader.name=Redstone Mana Verspreider +tile.botania:elven_spreader.name=Elven Mana Verspreider +tile.botania:gaia_spreader.name=Gaia Mana Verspreider tile.botania:pool_default.name=Mana Voorraad tile.botania:pool_creative.name=De Eeuwige Schuld Voorraad tile.botania:pool_diluted.name=Verdunde Mana Voorraad diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 5386891f4..4a463db7a 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -653,10 +653,10 @@ tile.botania:livingwood2.name=Tábuas de Madeira-viva com musgo tile.botania:livingwood3.name=Tábuas de Madeira-viva com com bordas tile.botania:livingwood4.name=Tábuas de Madeira-viva padronizadas tile.botania:livingwood5.name=Madeira-viva reluzente -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:mana_spreader.name=Dispersor de Mana +tile.botania:redstone_spreader.name=Dispersor de Mana por Redstone +tile.botania:elven_spreader.name=Dispersor de Mana Élfico +tile.botania:gaia_spreader.name=Dispersor de Mana de Gaia 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 diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index d3f131379..c8a96034f 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -264,10 +264,10 @@ tile.botania:livingwood2.name=Замшелые доски из жизнедер tile.botania:livingwood3.name=Обрамленное жизнедерево tile.botania:livingwood4.name=Резное жизнедерево tile.botania:livingwood5.name=Светящееся жизнедерево -tile.botania:spreader0.name=Распространитель маны -tile.botania:spreader1.name=Красный распространитель маны -tile.botania:spreader2.name=Эльфийский распространитель маны -tile.botania:spreader3.name=Распространитель маны Гайи +tile.botania:mana_spreader.name=Распространитель маны +tile.botania:redstone_spreader.name=Красный распространитель маны +tile.botania:elven_spreader.name=Эльфийский распространитель маны +tile.botania:gaia_spreader.name=Распространитель маны Гайи tile.botania:pool_default.name=Бассейн маны tile.botania:pool_creative.name=Вечно наполненный бассейн tile.botania:pool_diluted.name=Бассейн разбавленной маны diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 10a50f22e..a7080422a 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -660,10 +660,10 @@ tile.botania:livingwood2.name=苔活木板 tile.botania:livingwood3.name=框边活木板 tile.botania:livingwood4.name=框纹活木板 tile.botania:livingwood5.name=微光活木 -tile.botania:spreader0.name=魔力发射器 -tile.botania:spreader1.name=魔力发射器(红石) -tile.botania:spreader2.name=精灵魔力发射器 -tile.botania:spreader3.name=盖亚魔力发射器 +tile.botania:mana_spreader.name=魔力发射器 +tile.botania:redstone_spreader.name=魔力发射器(红石) +tile.botania:elven_spreader.name=精灵魔力发射器 +tile.botania:gaia_spreader.name=盖亚魔力发射器 tile.botania:pool_default.name=魔力池 tile.botania:pool_creative.name=永恒魔力池 tile.botania:pool_diluted.name=稀释魔力池 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 14ddc6734..24643ebd4 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -617,10 +617,10 @@ tile.botania:livingwood2.name=苔活木板 tile.botania:livingwood3.name=框邊活木板 tile.botania:livingwood4.name=框紋活木板 tile.botania:livingwood5.name=微光活木 -tile.botania:spreader0.name=瑪那發射器 -tile.botania:spreader1.name=瑪那發射器(紅石) -tile.botania:spreader2.name=精靈瑪那發射器 -tile.botania:spreader3.name=蓋亞瑪那發射器 +tile.botania:mana_spreader.name=瑪那發射器 +tile.botania:redstone_spreader.name=瑪那發射器(紅石) +tile.botania:elven_spreader.name=精靈瑪那發射器 +tile.botania:gaia_spreader.name=蓋亞瑪那發射器 tile.botania:pool_default.name=瑪那池 tile.botania:pool_creative.name=永恆瑪那池 tile.botania:pool_diluted.name=稀釋瑪那池 diff --git a/src/main/resources/assets/botania/recipes/spreader_2.json b/src/main/resources/assets/botania/recipes/elven_spreader.json similarity index 95% rename from src/main/resources/assets/botania/recipes/spreader_2.json rename to src/main/resources/assets/botania/recipes/elven_spreader.json index 1c1a7ef51..02e160dd3 100644 --- a/src/main/resources/assets/botania/recipes/spreader_2.json +++ b/src/main/resources/assets/botania/recipes/elven_spreader.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:spreader", - "data": 2 + "item": "botania:elven_spreader" }, "pattern": [ "WWW", diff --git a/src/main/resources/assets/botania/recipes/spreader_3.json b/src/main/resources/assets/botania/recipes/gaia_spreader.json similarity index 72% rename from src/main/resources/assets/botania/recipes/spreader_3.json rename to src/main/resources/assets/botania/recipes/gaia_spreader.json index 2a1efe564..98a9a64a7 100644 --- a/src/main/resources/assets/botania/recipes/spreader_3.json +++ b/src/main/resources/assets/botania/recipes/gaia_spreader.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:spreader", - "data": 3 + "item": "botania:gaia_spreader" }, "pattern": [ "ESD" @@ -10,8 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "botania:spreader", - "data": 2 + "item": "botania:elven_spreader" }, "D": { "item": "#ELVENDRAGONSTONE" diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json b/src/main/resources/assets/botania/recipes/garden_of_glass/mana_spreader.json similarity index 96% rename from src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json rename to src/main/resources/assets/botania/recipes/garden_of_glass/mana_spreader.json index c9d57fa1d..ff7b22c04 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/mana_spreader.json @@ -6,8 +6,7 @@ } ], "result": { - "item": "botania:spreader", - "data": 0 + "item": "botania:mana_spreader" }, "pattern": [ "WWW", diff --git a/src/main/resources/assets/botania/recipes/spreader_0.json b/src/main/resources/assets/botania/recipes/mana_spreader.json similarity index 96% rename from src/main/resources/assets/botania/recipes/spreader_0.json rename to src/main/resources/assets/botania/recipes/mana_spreader.json index 47fdfb801..3a2d1e189 100644 --- a/src/main/resources/assets/botania/recipes/spreader_0.json +++ b/src/main/resources/assets/botania/recipes/mana_spreader.json @@ -9,8 +9,7 @@ } ], "result": { - "item": "botania:spreader", - "data": 0 + "item": "botania:mana_spreader" }, "pattern": [ "WWW", diff --git a/src/main/resources/assets/botania/recipes/managun.json b/src/main/resources/assets/botania/recipes/managun.json index 8f3b618bb..212ee4524 100644 --- a/src/main/resources/assets/botania/recipes/managun.json +++ b/src/main/resources/assets/botania/recipes/managun.json @@ -10,8 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "botania:spreader", - "data": 1 + "item": "botania:redstone_spreader" }, "D": { "item": "#MANADIAMOND" diff --git a/src/main/resources/assets/botania/recipes/spreader_1.json b/src/main/resources/assets/botania/recipes/redstone_spreader.json similarity index 63% rename from src/main/resources/assets/botania/recipes/spreader_1.json rename to src/main/resources/assets/botania/recipes/redstone_spreader.json index caf1fe083..72efefe6e 100644 --- a/src/main/resources/assets/botania/recipes/spreader_1.json +++ b/src/main/resources/assets/botania/recipes/redstone_spreader.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:spreader", - "data": 1 + "item": "botania:redstone_spreader" }, "group": "botania:spreader", "ingredients": [ { - "item": "botania:spreader", - "data": 0 + "item": "botania:mana_spreader" }, { "item": "#DUSTREDSTONE" diff --git a/src/main/resources/assets/botania/recipes/redstringrelay.json b/src/main/resources/assets/botania/recipes/redstringrelay.json index f01979429..27c2127c0 100644 --- a/src/main/resources/assets/botania/recipes/redstringrelay.json +++ b/src/main/resources/assets/botania/recipes/redstringrelay.json @@ -16,8 +16,7 @@ "item": "#BREDSTRING" }, "M": { - "item": "botania:spreader", - "data": 0 + "item": "botania:mana_spreader" } } } \ No newline at end of file