diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index 6aaa02058..e42a43d0e 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -39,3 +39,8 @@ botania:pylon[variant={mana, natura, gaia}] => botania:mana_pylon => botania:natura_pylon => botania:gaia_pylon + +botania:platform[variant={abstruse, spectral, infrangible}] +=> botania:abstruse_platform +=> botania:spectral_platform +=> botania:infrangible_platform 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 9ada89c2c..cb39d7d96 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -97,7 +97,7 @@ public final class ColorHandler { } } return 0xFFFFFF; - }, ModBlocks.platform); + }, ModBlocks.abstrusePlatform, ModBlocks.spectralPlatform, ModBlocks.infrangiblePlatform); ItemColors items = Minecraft.getMinecraft().getItemColors(); diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 3eb204d53..c4d04cfd0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -19,7 +19,6 @@ import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; -import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; @@ -81,7 +80,16 @@ public class MiscellaneousIcons { evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), model); // Platforms - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); + ModelResourceLocation abstruseName = new ModelResourceLocation("botania:abstruse_platform", "normal"); + IBakedModel abstruse = evt.getModelRegistry().getObject(abstruseName); + ModelResourceLocation spectralName = new ModelResourceLocation("botania:spectral_platform", "normal"); + IBakedModel spectral = evt.getModelRegistry().getObject(spectralName); + ModelResourceLocation infrangibleName = new ModelResourceLocation("botania:infrangible_platform", "normal"); + IBakedModel infrangible = evt.getModelRegistry().getObject(infrangibleName); + + evt.getModelRegistry().putObject(abstruseName, new PlatformModel(abstruse)); + evt.getModelRegistry().putObject(spectralName, new PlatformModel(spectral)); + evt.getModelRegistry().putObject(infrangibleName, new PlatformModel(infrangible)); // Lexicon evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon_3d_default", "inventory"), diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 14bc285c4..dd49ff2b9 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -29,6 +29,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.property.IExtendedBlockState; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockCamo; +import vazkii.botania.common.block.BlockPlatform; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; @@ -36,11 +37,20 @@ import javax.annotation.Nonnull; import java.util.List; public class PlatformModel implements IBakedModel { + private final IBakedModel original; + + public PlatformModel(IBakedModel original) { + this.original = original; + } @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { - if(state.getBlock() != ModBlocks.platform) + // rendering the item form + if(state == null) + return original.getQuads(state, side, rand); + + if(!(state.getBlock() instanceof BlockPlatform)) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, side, rand); BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); @@ -59,8 +69,7 @@ public class PlatformModel implements IBakedModel { Minecraft mc = Minecraft.getMinecraft(); if(heldState == null && layer == BlockRenderLayer.SOLID) { // No camo - ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); - return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path).getQuads(state, side, rand); + return original.getQuads(state, side, rand); } else if(heldState != null) { // Some people used this to get an invisible block in the past, accommodate that. @@ -82,37 +91,21 @@ public class PlatformModel implements IBakedModel { return ImmutableList.of(); // Nothing renders } - @Override - public boolean isAmbientOcclusion() { - return true; + @Override public boolean isAmbientOcclusion() { + return original.isAmbientOcclusion(); } - - @Override - public boolean isGui3d() { - return true; + @Override public boolean isGui3d() { + return original.isGui3d(); } - - @Override - public boolean isBuiltInRenderer() { - return false; + @Override public boolean isBuiltInRenderer() { + return original.isBuiltInRenderer(); } - - @Nonnull - @Override - public TextureAtlasSprite getParticleTexture() { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:blocks/livingwood0"); + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return original.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { + return original.getItemCameraTransforms(); } - - @Nonnull - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; - } - - @Nonnull - @Override - public ItemOverrideList getOverrides() { - return ItemOverrideList.NONE; + @Nonnull @Override public ItemOverrideList getOverrides() { + return original.getOverrides(); } private static class FakeBlockAccess implements IBlockAccess { diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 966826100..b743a24f8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -50,39 +50,35 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; +import java.util.Locale; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost { - public BlockPlatform() { - super(Material.WOOD, LibBlockNames.PLATFORM); + public enum Variant { + ABSTRUSE, + SPECTRAL, + INFRANGIBLE + } + + public final Variant variant; + + public BlockPlatform(Variant v) { + super(Material.WOOD, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.PLATFORM_SUFFIX); setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); + this.variant = v; } @Nonnull @Override public BlockStateContainer createBlockState() { - return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, }, + return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE, BotaniaStateProps.HELD_WORLD, BotaniaStateProps.HELD_POS }); } - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.PLATFORM_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta > PlatformVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.values()[meta]); - } - @Nonnull @Override public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { @@ -103,39 +99,25 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return true; } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { - for(int i = 0; i < PlatformVariant.values().length; i++) - stacks.add(new ItemStack(this, 1, i)); - } - @Override public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity, boolean isActualState) { - PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); - if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) + if(variant == Variant.INFRANGIBLE || variant == Variant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity, isActualState); } @Override public float getBlockHardness(IBlockState state, World world, BlockPos pos) { - PlatformVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); - return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, world, pos); + return variant == Variant.INFRANGIBLE ? -1F : super.getBlockHardness(state, world, pos); } @Override public boolean canEntityDestroy(IBlockState state, IBlockAccess world, BlockPos pos, Entity entity) { - return state.getValue(BotaniaStateProps.PLATFORM_VARIANT) != PlatformVariant.INFRANGIBLE; + return variant != Variant.INFRANGIBLE; } @Override - public float getExplosionResistance(World world, BlockPos pos, @Nonnull Entity exploder, Explosion explosion) { - return world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT) != PlatformVariant.INFRANGIBLE ? super.getExplosionResistance(world, pos, exploder, explosion) : Float.MAX_VALUE; + public float getExplosionResistance(World world, BlockPos pos, @Nullable Entity exploder, Explosion explosion) { + return variant != Variant.INFRANGIBLE ? super.getExplosionResistance(world, pos, exploder, explosion) : Float.MAX_VALUE; } @Nonnull @@ -146,8 +128,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - PlatformVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); - return variant == PlatformVariant.ABSTRUSE ? LexiconData.platform : variant == PlatformVariant.INFRANGIBLE ? null : LexiconData.spectralPlatform; + return variant == Variant.ABSTRUSE ? LexiconData.platform : variant == Variant.INFRANGIBLE ? null : LexiconData.spectralPlatform; } @Override @@ -160,13 +141,4 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, public boolean isGhost(IBlockState state, World world, BlockPos pos) { return true; } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, 3); - // Statemapper after item registration, because the items should be registered to the actual variant names - ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); - - } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 4b9a8b5b1..facbab375 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -159,7 +159,9 @@ public final class ModBlocks { public static final Block gatheringDrum = new BlockForestDrum(BlockForestDrum.Variant.GATHERING); public static final Block canopyDrum = new BlockForestDrum(BlockForestDrum.Variant.CANOPY); public static final Block shinyFlower = new BlockShinyFlower(); - public static final Block platform = new BlockPlatform(); + public static final Block abstrusePlatform = new BlockPlatform(BlockPlatform.Variant.ABSTRUSE); + public static final Block spectralPlatform = new BlockPlatform(BlockPlatform.Variant.SPECTRAL); + public static final Block infrangiblePlatform = new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE); public static final Block alfPortal = new BlockAlfPortal(); public static final Block dreamwood = new BlockDreamwood(); public static final Block conjurationCatalyst = new BlockConjurationCatalyst(); @@ -278,7 +280,9 @@ public final class ModBlocks { r.register(gatheringDrum); r.register(canopyDrum); r.register(shinyFlower); - r.register(platform); + r.register(abstrusePlatform); + r.register(spectralPlatform); + r.register(infrangiblePlatform); r.register(alfPortal); r.register(dreamwood); r.register(conjurationCatalyst); @@ -400,7 +404,9 @@ public final class ModBlocks { r.register(new ItemBlockMod(gatheringDrum).setRegistryName(gatheringDrum.getRegistryName())); r.register(new ItemBlockMod(canopyDrum).setRegistryName(canopyDrum.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(shinyFlower).setRegistryName(shinyFlower.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(platform).setRegistryName(platform.getRegistryName())); + r.register(new ItemBlockMod(abstrusePlatform).setRegistryName(abstrusePlatform.getRegistryName())); + r.register(new ItemBlockMod(spectralPlatform).setRegistryName(spectralPlatform.getRegistryName())); + r.register(new ItemBlockMod(infrangiblePlatform).setRegistryName(infrangiblePlatform.getRegistryName())); r.register(new ItemBlockMod(alfPortal).setRegistryName(alfPortal.getRegistryName())); r.register(new ItemBlockDreamwood(dreamwood).setRegistryName(dreamwood.getRegistryName())); r.register(new ItemBlockMod(conjurationCatalyst).setRegistryName(conjurationCatalyst.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 1c2c3bf7e..9dd0413ee 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -194,7 +194,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.craftPattern3_2); addItem(ModItems.craftPatternDonut); - addBlock(ModBlocks.platform); + addBlock(ModBlocks.abstrusePlatform); + addBlock(ModBlocks.spectralPlatform); + addBlock(ModBlocks.infrangiblePlatform); addBlock(ModBlocks.alfPortal); addBlock(ModBlocks.altar); addBlock(ModBlocks.runeAltar); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 340425edf..1d12c3c0a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -498,9 +498,9 @@ public final class ModCraftingRecipes { recipeOpenCrate = path("opencrate_0"); recipeForestEye = ModBlocks.forestEye.getRegistryName(); recipeForestDrum = ModBlocks.wildDrum.getRegistryName(); - recipePlatform = path("platform_0"); + recipePlatform = ModBlocks.abstrusePlatform.getRegistryName(); recipeConjurationCatalyst = ModBlocks.conjurationCatalyst.getRegistryName(); - recipeSpectralPlatform = path("platform_1"); + recipeSpectralPlatform = ModBlocks.spectralPlatform.getRegistryName(); recipeGatherDrum = ModBlocks.gatheringDrum.getRegistryName(); recipePlaceholder = ModItems.placeholder.getRegistryName(); recipeCraftCrate = path("opencrate_1"); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 29032efe7..19f038166 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -182,6 +182,14 @@ public class FlattenItems implements IFixableData { case 2: return ModBlocks.gaiaPylon.getRegistryName().toString(); } }); + LOOKUP.put("botania:platform", i -> { + switch (i) { + default: + case 0: return ModBlocks.abstrusePlatform.getRegistryName().toString(); + case 1: return ModBlocks.spectralPlatform.getRegistryName().toString(); + case 2: return ModBlocks.infrangiblePlatform.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 20c27a247..65a6dae17 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -38,6 +38,7 @@ public final class LibBlockNames { public static final String DRUM_PREFIX = "drum_"; public static final String SHINY_FLOWER = "shinyFlower"; public static final String PLATFORM = "platform"; + public static final String PLATFORM_SUFFIX = "_" + PLATFORM; public static final String ALF_PORTAL = "alfheimPortal"; public static final String DREAM_WOOD = "dreamwood"; public static final String CONJURATION_CATALYST = "conjurationCatalyst"; diff --git a/src/main/resources/assets/botania/blockstates/abstruse_platform.json b/src/main/resources/assets/botania/blockstates/abstruse_platform.json new file mode 100644 index 000000000..cc4c9d803 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/abstruse_platform.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:abstruse_platform" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/infrangible_platform.json b/src/main/resources/assets/botania/blockstates/infrangible_platform.json new file mode 100644 index 000000000..785fcff3a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/infrangible_platform.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:infrangible_platform" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/platform.json b/src/main/resources/assets/botania/blockstates/platform.json deleted file mode 100644 index f2f52b17f..000000000 --- a/src/main/resources/assets/botania/blockstates/platform.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=abstruse": { "model": "botania:abstruse_platform" }, - "variant=spectral": { "model": "botania:spectral_platform" }, - "variant=infrangible": { "model": "botania:infrangible_platform" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectral_platform.json b/src/main/resources/assets/botania/blockstates/spectral_platform.json new file mode 100644 index 000000000..15a3b123e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spectral_platform.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:spectral_platform" } + } +} \ 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 aaaffa956..5fa47bee6 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -739,9 +739,9 @@ tile.botania:shinyFlower12.name=Glimmering Brown Flower tile.botania:shinyFlower13.name=Glimmering Green Flower tile.botania:shinyFlower14.name=Glimmering Red Flower tile.botania:shinyFlower15.name=Glimmering Black Flower -tile.botania:platform0.name=Abstruse Platform -tile.botania:platform1.name=Spectral Platform -tile.botania:platform2.name=Infrangible Platform +tile.botania:abstruse_platform.name=Abstruse Platform +tile.botania:spectral_platform.name=Spectral Platform +tile.botania:infrangible_platform.name=Infrangible Platform tile.botania:alfheimPortal.name=Elven Gateway Core tile.botania:blockDarkQuartz.name=Block of Smokey Quartz tile.botania:chiseledDarkQuartz.name=Chiseled Smokey Quartz Block diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index e2611d969..e19a2e6e5 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -599,9 +599,9 @@ tile.botania:shinyFlower12.name=Flor centelleante marrón tile.botania:shinyFlower13.name=Flor centelleante verde tile.botania:shinyFlower14.name=Flor centelleante roja tile.botania:shinyFlower15.name=Flor centelleante negra -tile.botania:platform0.name=Plataforma abstrusa -tile.botania:platform1.name=Plataforma espectral -tile.botania:platform2.name=Plataforma irrompible +tile.botania:abstruse_platform.name=Plataforma abstrusa +tile.botania:spectral_platform.name=Plataforma espectral +tile.botania:infrangible_platform.name=Plataforma irrompible tile.botania:alfheimPortal.name=Núcleo de acceso élfico tile.botania:blockDarkQuartz.name=Bloque de cuarzo ahumado tile.botania:chiseledDarkQuartz.name=Bloque cincelado de cuarzo ahumado diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index cc5e82725..ff736eea2 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -525,9 +525,9 @@ tile.botania:shinyFlower12.name=Fleur chatoyante marron tile.botania:shinyFlower13.name=Fleur chatoyante verte tile.botania:shinyFlower14.name=Fleur chatoyante rouge tile.botania:shinyFlower15.name=Fleur chatoyante noire -tile.botania:platform0.name=Plate-forme ocultée -tile.botania:platform1.name=Plate-forme spectrale -tile.botania:platform2.name=Plate-forme inviolable +tile.botania:abstruse_platform.name=Plate-forme ocultée +tile.botania:spectral_platform.name=Plate-forme spectrale +tile.botania:infrangible_platform.name=Plate-forme inviolable tile.botania:alfheimPortal.name=Coeur de passerelle elfique tile.botania:blockDarkQuartz.name=Bloc de quartz fumé tile.botania:chiseledDarkQuartz.name=Bloc de quartz fumé sculpté diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 718cd3cc9..de8ad0414 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -516,9 +516,9 @@ tile.botania:shinyFlower12.name=茶色の光り輝く花 tile.botania:shinyFlower13.name=緑色の光り輝く花 tile.botania:shinyFlower14.name=赤色の光り輝く花 tile.botania:shinyFlower15.name=黒色の光り輝く花 -tile.botania:platform0.name=難解なプラットフォーム -tile.botania:platform1.name=幽霊のプラットフォーム -tile.botania:platform2.name=丈夫なプラットフォーム +tile.botania:abstruse_platform.name=難解なプラットフォーム +tile.botania:spectral_platform.name=幽霊のプラットフォーム +tile.botania:infrangible_platform.name=丈夫なプラットフォーム tile.botania:alfheimPortal.name=エルフの出入り口の核 tile.botania:blockDarkQuartz.name=煙がかったクォーツブロック tile.botania:chiseledDarkQuartz.name=模様入りの煙がかったクォーツブロック diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 8febfe7c9..13d2506f4 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -564,9 +564,9 @@ tile.botania:shinyFlower12.name=빛나는 갈색 꽃 tile.botania:shinyFlower13.name=빛나는 초록색 꽃 tile.botania:shinyFlower14.name=빛나는 빨강색 꽃 tile.botania:shinyFlower15.name=빛나는 검은색 꽃 -tile.botania:platform0.name=난해한 플랫폼 -tile.botania:platform1.name=유령 플랫폼 -tile.botania:platform2.name=강한 플랫폼 +tile.botania:abstruse_platform.name=난해한 플랫폼 +tile.botania:spectral_platform.name=유령 플랫폼 +tile.botania:infrangible_platform.name=강한 플랫폼 tile.botania:alfheimPortal.name=요정의 게이트 코어 tile.botania:blockDarkQuartz.name=스모키석영 블럭 tile.botania:chiseledDarkQuartz.name=조각 된 스모키석영 블럭 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 6fdeb783f..4cde6c4b7 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -589,9 +589,9 @@ tile.botania:shinyFlower12.name=Glinsterende Bruine Bloem tile.botania:shinyFlower13.name=Glinsterende Groene Bloem tile.botania:shinyFlower14.name=Glinsterende Rode Bloem tile.botania:shinyFlower15.name=Glinsterende Zwarte Bloem -tile.botania:platform0.name=Diepzinnig Platform -tile.botania:platform1.name=Spookachtig Platform -tile.botania:platform2.name=Onbreekbaar Platform +tile.botania:abstruse_platform.name=Diepzinnig Platform +tile.botania:spectral_platform.name=Spookachtig Platform +tile.botania:infrangible_platform.name=Onbreekbaar Platform tile.botania:alfheimPortal.name=Elven Toegangspoort tile.botania:blockDarkQuartz.name=Donker Kwarts Blok tile.botania:chiseledDarkQuartz.name=Gebeiteld Donker Kwarts Blok diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 1c2333e6b..e3e861bd6 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -732,9 +732,9 @@ tile.botania:shinyFlower12.name=Flor Marrom Reluzente tile.botania:shinyFlower13.name=Flor Verde Reluzente tile.botania:shinyFlower14.name=Flor Vermelha Reluzente tile.botania:shinyFlower15.name=Flor Preta Reluzente -tile.botania:platform0.name=Platforma Abstrusa -tile.botania:platform1.name=Platforma Espectral -tile.botania:platform2.name=Platforma Infragível +tile.botania:abstruse_platform.name=Platforma Abstrusa +tile.botania:spectral_platform.name=Platforma Espectral +tile.botania:infrangible_platform.name=Platforma Infragível tile.botania:alfheimPortal.name=Núcleo do Portal Élfico tile.botania:blockDarkQuartz.name=Bloco de Quartzo Escuro tile.botania:chiseledDarkQuartz.name=Bloco de Quartzo Escuro Talhado diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 75f3fa4d7..d1bf9fa91 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -339,9 +339,9 @@ tile.botania:shinyFlower12.name=Светящийся коричневый цве tile.botania:shinyFlower13.name=Светящийся зелёный цветок tile.botania:shinyFlower14.name=Светящийся красный цветок tile.botania:shinyFlower15.name=Светящийся чёрный цветок -tile.botania:platform0.name=Заумная платформа -tile.botania:platform1.name=Спектральная платформа -tile.botania:platform2.name=Нерушимая платформа +tile.botania:abstruse_platform.name=Заумная платформа +tile.botania:spectral_platform.name=Спектральная платформа +tile.botania:infrangible_platform.name=Нерушимая платформа tile.botania:alfheimPortal.name=Ядро эльфийских врат tile.botania:blockDarkQuartz.name=Блок дымного кварца tile.botania:chiseledDarkQuartz.name=Резной блок дымного кварца diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index cb47bf1be..60811a8c5 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -739,9 +739,9 @@ tile.botania:shinyFlower12.name=棕色荧光花 tile.botania:shinyFlower13.name=绿色荧光花 tile.botania:shinyFlower14.name=红色荧光花 tile.botania:shinyFlower15.name=黑色荧光花 -tile.botania:platform0.name=奥秘平台 -tile.botania:platform1.name=幻影平台 -tile.botania:platform2.name=不破平台 +tile.botania:abstruse_platform.name=奥秘平台 +tile.botania:spectral_platform.name=幻影平台 +tile.botania:infrangible_platform.name=不破平台 tile.botania:alfheimPortal.name=精灵门核心 tile.botania:blockDarkQuartz.name=烟熏石英块 tile.botania:chiseledDarkQuartz.name=錾制烟熏石英块 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 63f00741a..408f17cf7 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -696,9 +696,9 @@ tile.botania:shinyFlower12.name=棕色螢光花 tile.botania:shinyFlower13.name=綠色螢光花 tile.botania:shinyFlower14.name=紅色螢光花 tile.botania:shinyFlower15.name=黑色螢光花 -tile.botania:platform0.name=奧秘平台 -tile.botania:platform1.name=幻影平台 -tile.botania:platform2.name=不破平台 +tile.botania:abstruse_platform.name=奧秘平台 +tile.botania:spectral_platform.name=幻影平台 +tile.botania:infrangible_platform.name=不破平台 tile.botania:alfheimPortal.name=精靈門核心 tile.botania:blockDarkQuartz.name=煙熏石英塊 tile.botania:chiseledDarkQuartz.name=浮雕煙熏石英塊 diff --git a/src/main/resources/assets/botania/recipes/platform_0.json b/src/main/resources/assets/botania/recipes/abstruse_platform.json similarity index 88% rename from src/main/resources/assets/botania/recipes/platform_0.json rename to src/main/resources/assets/botania/recipes/abstruse_platform.json index 10b373ef5..380b52e2e 100644 --- a/src/main/resources/assets/botania/recipes/platform_0.json +++ b/src/main/resources/assets/botania/recipes/abstruse_platform.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:platform", - "data": 0, + "item": "botania:abstruse_platform", "count": 2 }, "pattern": [ diff --git a/src/main/resources/assets/botania/recipes/ghostrail.json b/src/main/resources/assets/botania/recipes/ghostrail.json index 65b3c70c1..779a03a3c 100644 --- a/src/main/resources/assets/botania/recipes/ghostrail.json +++ b/src/main/resources/assets/botania/recipes/ghostrail.json @@ -7,8 +7,7 @@ "item": "minecraft:rail" }, { - "item": "botania:platform", - "data": 1 + "item": "botania:spectral_platform" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/lens_phantom.json b/src/main/resources/assets/botania/recipes/lens_phantom.json index d7f7319d3..96f55efa6 100644 --- a/src/main/resources/assets/botania/recipes/lens_phantom.json +++ b/src/main/resources/assets/botania/recipes/lens_phantom.json @@ -7,8 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "botania:platform", - "data": 0 + "item": "botania:abstruse_platform" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/prism.json b/src/main/resources/assets/botania/recipes/prism.json index bd748e6fc..8aa0f49ba 100644 --- a/src/main/resources/assets/botania/recipes/prism.json +++ b/src/main/resources/assets/botania/recipes/prism.json @@ -13,8 +13,7 @@ "item": "#GEMPRISMARINE" }, "S": { - "item": "botania:platform", - "data": 1 + "item": "botania:spectral_platform" }, "G": { "item": "#BLOCKGLASSCOLORLESS" diff --git a/src/main/resources/assets/botania/recipes/platform_1.json b/src/main/resources/assets/botania/recipes/spectral_platform.json similarity index 88% rename from src/main/resources/assets/botania/recipes/platform_1.json rename to src/main/resources/assets/botania/recipes/spectral_platform.json index b31a57fb9..653aab428 100644 --- a/src/main/resources/assets/botania/recipes/platform_1.json +++ b/src/main/resources/assets/botania/recipes/spectral_platform.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:platform", - "data": 1, + "item": "botania:spectral_platform", "count": 2 }, "pattern": [