From 9dfa61c7fab985a0d9f2bf2867ab3a43ad47cf7c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 5 Mar 2018 00:35:08 -0600 Subject: [PATCH] Flatten alt grasses --- block_flattening_notes.txt | 7 +++ .../botania/api/state/BotaniaStateProps.java | 4 -- .../api/state/enums/AltGrassVariant.java | 28 --------- .../botania/common/block/BlockAltGrass.java | 59 ++++++------------- .../botania/common/block/ModBlocks.java | 21 ++++++- .../common/core/BotaniaCreativeTab.java | 7 ++- .../botania/common/fixers/FlattenItems.java | 14 +++++ .../botania/common/item/ItemGrassSeeds.java | 13 ++-- .../botania/common/lib/LibBlockNames.java | 2 +- .../common/world/SkyblockWorldEvents.java | 3 +- .../assets/botania/blockstates/altgrass.json | 40 ------------- .../assets/botania/blockstates/dry_grass.json | 10 ++++ .../botania/blockstates/golden_grass.json | 10 ++++ .../botania/blockstates/infused_grass.json | 10 ++++ .../botania/blockstates/mutated_grass.json | 10 ++++ .../botania/blockstates/scorched_grass.json | 10 ++++ .../botania/blockstates/vivid_grass.json | 10 ++++ .../resources/assets/botania/lang/en_us.lang | 12 ++-- .../resources/assets/botania/lang/ja_jp.lang | 12 ++-- .../resources/assets/botania/lang/pt_br.lang | 12 ++-- .../resources/assets/botania/lang/zh_cn.lang | 12 ++-- .../resources/assets/botania/lang/zh_tw.lang | 12 ++-- 22 files changed, 161 insertions(+), 157 deletions(-) create mode 100644 block_flattening_notes.txt delete mode 100644 src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java delete mode 100644 src/main/resources/assets/botania/blockstates/altgrass.json create mode 100644 src/main/resources/assets/botania/blockstates/dry_grass.json create mode 100644 src/main/resources/assets/botania/blockstates/golden_grass.json create mode 100644 src/main/resources/assets/botania/blockstates/infused_grass.json create mode 100644 src/main/resources/assets/botania/blockstates/mutated_grass.json create mode 100644 src/main/resources/assets/botania/blockstates/scorched_grass.json create mode 100644 src/main/resources/assets/botania/blockstates/vivid_grass.json diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt new file mode 100644 index 000000000..2b6638199 --- /dev/null +++ b/block_flattening_notes.txt @@ -0,0 +1,7 @@ +botania:altgrass[variant={dry, golden, vivid, scorched, infused, mutated}] +=> botania:dry_grass +=> botania:golden_grass +=> botania:vivid_grass +=> botania:scorched_grass +=> botania:infused_grass +=> botania:mutated_grass \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f31df9465..c57ad62d2 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -22,7 +22,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.enums.AlfPortalState; -import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; @@ -93,9 +92,6 @@ public final class BotaniaStateProps { // BlockAltar public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); - // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); - // BlockBiomeStoneA public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java deleted file mode 100644 index 222fdb9ea..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java +++ /dev/null @@ -1,28 +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 AltGrassVariant implements IStringSerializable { - DRY, - GOLDEN, - VIVID, - SCORCHED, - INFUSED, - MUTATED; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 70f1b1fbe..e65257e40 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -22,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -34,29 +35,34 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; +import java.util.Locale; import java.util.Random; public class BlockAltGrass extends BlockMod implements ILexiconable { - public BlockAltGrass() { - super(Material.GRASS, LibBlockNames.ALT_GRASS); + public enum Variant { + DRY, + GOLDEN, + VIVID, + SCORCHED, + INFUSED, + MUTATED + } + + private final Variant variant; + + public BlockAltGrass(Variant v) { + super(Material.GRASS, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX); setHardness(0.6F); setSoundType(SoundType.PLANT); setTickRandomly(true); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.ALTGRASS_VARIANT); + this.variant = v; } @Override @@ -64,34 +70,16 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return type.equals("shovel"); } - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.ALTGRASS_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.values()[meta]); - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList list) { - for(int i = 0; i < 6; i++) - list.add(new ItemStack(this, 1, i)); - } - @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if(!world.isRemote && state.getBlock() == this && world.getLight(pos.up()) >= 9) { - AltGrassVariant variant = state.getValue(BotaniaStateProps.ALTGRASS_VARIANT); for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); world.getBlockState(pos1.up()).getBlock(); if(world.getBlockState(pos1).getBlock() == Blocks.DIRT && world.getBlockState(pos1).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2) - world.setBlockState(pos1, getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2); + world.setBlockState(pos1, getDefaultState(), 1 | 2); } } } @@ -102,12 +90,6 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return Blocks.DIRT.getItemDropped(state, rand, fortune); } - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); - } - @Override public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { EnumPlantType type = plantable.getPlantType(world, pos.down()); @@ -119,7 +101,6 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) { if (state.getBlock() != this) return; - AltGrassVariant variant = state.getValue(BotaniaStateProps.ALTGRASS_VARIANT); switch(variant) { case DRY: break; @@ -149,10 +130,4 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.grassSeeds; } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, AltGrassVariant.values().length); - } } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index d8de0131e..621403ba2 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -208,7 +208,12 @@ public final class ModBlocks { public static final Block shimmerrock = new BlockShimmerrock(); public static final Block shimmerwoodPlanks = new BlockShimmerwoodPlanks(); public static final Block avatar = new BlockAvatar(); - public static final Block altGrass = new BlockAltGrass(); + public static final Block dryGrass = new BlockAltGrass(BlockAltGrass.Variant.DRY); + public static final Block goldenGrass = new BlockAltGrass(BlockAltGrass.Variant.GOLDEN); + public static final Block vividGrass = new BlockAltGrass(BlockAltGrass.Variant.VIVID); + public static final Block scorchedGrass = new BlockAltGrass(BlockAltGrass.Variant.SCORCHED); + public static final Block infusedGrass = new BlockAltGrass(BlockAltGrass.Variant.INFUSED); + public static final Block mutatedGrass = new BlockAltGrass(BlockAltGrass.Variant.MUTATED); public static final Block animatedTorch = new BlockAnimatedTorch(); @SubscribeEvent @@ -296,7 +301,12 @@ public final class ModBlocks { r.register(shimmerrock); r.register(shimmerwoodPlanks); r.register(avatar); - r.register(altGrass); + r.register(dryGrass); + r.register(goldenGrass); + r.register(vividGrass); + r.register(scorchedGrass); + r.register(infusedGrass); + r.register(mutatedGrass); r.register(animatedTorch); RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); @@ -382,7 +392,12 @@ public final class ModBlocks { r.register(new ItemBlockMod(shimmerrock).setRegistryName(shimmerrock.getRegistryName())); r.register(new ItemBlockMod(shimmerwoodPlanks).setRegistryName(shimmerwoodPlanks.getRegistryName())); r.register(new ItemBlockMod(avatar).setRegistryName(avatar.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(altGrass).setRegistryName(altGrass.getRegistryName())); + r.register(new ItemBlockMod(dryGrass).setRegistryName(dryGrass.getRegistryName())); + r.register(new ItemBlockMod(goldenGrass).setRegistryName(goldenGrass.getRegistryName())); + r.register(new ItemBlockMod(vividGrass).setRegistryName(vividGrass.getRegistryName())); + r.register(new ItemBlockMod(scorchedGrass).setRegistryName(scorchedGrass.getRegistryName())); + r.register(new ItemBlockMod(infusedGrass).setRegistryName(infusedGrass.getRegistryName())); + r.register(new ItemBlockMod(mutatedGrass).setRegistryName(mutatedGrass.getRegistryName())); r.register(new ItemBlockMod(animatedTorch).setRegistryName(animatedTorch.getRegistryName())); initOreDict(); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 618d43d4e..fd071a100 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -145,7 +145,12 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.scorchedSeeds); addItem(ModItems.infusedSeeds); addItem(ModItems.mutatedSeeds); - addBlock(ModBlocks.altGrass); + addBlock(ModBlocks.dryGrass); + addBlock(ModBlocks.goldenGrass); + addBlock(ModBlocks.vividGrass); + addBlock(ModBlocks.scorchedGrass); + addBlock(ModBlocks.infusedGrass); + addBlock(ModBlocks.mutatedGrass); if(Botania.thaumcraftLoaded) addItem(ModItems.manaInkwell); addBlock(ModBlocks.forestDrum); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 9c200e13d..0dca276bd 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.datafix.IFixableData; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.state.enums.CratePattern; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.lib.LibItemNames; @@ -122,6 +123,19 @@ public class FlattenItems implements IFixableData { return ModItems.blackLotus.getRegistryName().toString(); } }); + + // ItemBlocks + LOOKUP.put("botania:altgrass", i -> { + switch (i) { + default: + case 0: return ModBlocks.dryGrass.getRegistryName().toString(); + case 1: return ModBlocks.goldenGrass.getRegistryName().toString(); + case 2: return ModBlocks.vividGrass.getRegistryName().toString(); + case 3: return ModBlocks.scorchedGrass.getRegistryName().toString(); + case 4: return ModBlocks.infusedGrass.getRegistryName().toString(); + case 5: return ModBlocks.mutatedGrass.getRegistryName().toString(); + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index de64bf1d5..de3f45027 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -34,7 +34,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -171,17 +170,17 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { else if(type == IslandType.MYCEL) return Blocks.MYCELIUM.getDefaultState(); else if(type == IslandType.DRY) - return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY); + return ModBlocks.dryGrass.getDefaultState(); else if(type == IslandType.GOLDEN) - return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.GOLDEN); + return ModBlocks.goldenGrass.getDefaultState(); else if(type == IslandType.VIVID) - return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.VIVID); + return ModBlocks.vividGrass.getDefaultState(); else if(type == IslandType.SCORCHED) - return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.SCORCHED); + return ModBlocks.scorchedGrass.getDefaultState(); else if(type == IslandType.INFUSED) - return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.INFUSED); + return ModBlocks.infusedGrass.getDefaultState(); else if(type == IslandType.MUTATED) - return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.MUTATED); + return ModBlocks.mutatedGrass.getDefaultState(); else return Blocks.GRASS.getDefaultState(); } diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 409d09ed7..9aa5887a1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -102,7 +102,7 @@ public final class LibBlockNames { public static final String SHIMMERROCK = "shimmerrock"; public static final String SHIMMERWOOD_PLANKS = "shimmerwoodPlanks"; public static final String AVATAR = "avatar"; - public static final String ALT_GRASS = "altGrass"; + public static final String ALT_GRASS_SUFFIX = "_grass"; public static final String ANIMATED_TORCH = "animatedTorch"; public static final String SUBTILE_PUREDAISY = "puredaisy"; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 0cd2f51b2..45dc3b8be 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -75,7 +75,8 @@ public final class SkyblockWorldEvents { ItemStack equipped = event.getItemStack(); if(equipped.isEmpty() && event.getEntityPlayer().isSneaking()) { Block block = event.getWorld().getBlockState(event.getPos()).getBlock(); - if(ImmutableSet.of(Blocks.GRASS, Blocks.GRASS_PATH, Blocks.FARMLAND, Blocks.DIRT, ModBlocks.altGrass).contains(block)) { + // FIXME 1.13 use a tag and readd the alt grasses + if(ImmutableSet.of(Blocks.GRASS, Blocks.GRASS_PATH, Blocks.FARMLAND, Blocks.DIRT/*, ModBlocks.altGrass*/).contains(block)) { if(event.getWorld().isRemote) event.getEntityPlayer().swingArm(event.getHand()); else { diff --git a/src/main/resources/assets/botania/blockstates/altgrass.json b/src/main/resources/assets/botania/blockstates/altgrass.json deleted file mode 100644 index 58e0cf7f6..000000000 --- a/src/main/resources/assets/botania/blockstates/altgrass.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "variants": { - "variant=dry": [ - { "model": "botania:dry_grass" }, - { "model": "botania:dry_grass", "y": 90 }, - { "model": "botania:dry_grass", "y": 180 }, - { "model": "botania:dry_grass", "y": 270 } - ], - "variant=golden": [ - { "model": "botania:golden_grass" }, - { "model": "botania:golden_grass", "y": 90 }, - { "model": "botania:golden_grass", "y": 180 }, - { "model": "botania:golden_grass", "y": 270 } - ], - "variant=vivid": [ - { "model": "botania:vivid_grass" }, - { "model": "botania:vivid_grass", "y": 90 }, - { "model": "botania:vivid_grass", "y": 180 }, - { "model": "botania:vivid_grass", "y": 270 } - ], - "variant=scorched": [ - { "model": "botania:scorched_grass" }, - { "model": "botania:scorched_grass", "y": 90 }, - { "model": "botania:scorched_grass", "y": 180 }, - { "model": "botania:scorched_grass", "y": 270 } - ], - "variant=infused": [ - { "model": "botania:infused_grass" }, - { "model": "botania:infused_grass", "y": 90 }, - { "model": "botania:infused_grass", "y": 180 }, - { "model": "botania:infused_grass", "y": 270 } - ], - "variant=mutated": [ - { "model": "botania:mutated_grass" }, - { "model": "botania:mutated_grass", "y": 90 }, - { "model": "botania:mutated_grass", "y": 180 }, - { "model": "botania:mutated_grass", "y": 270 } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dry_grass.json b/src/main/resources/assets/botania/blockstates/dry_grass.json new file mode 100644 index 000000000..f044f3370 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dry_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:dry_grass" }, + { "model": "botania:dry_grass", "y": 90 }, + { "model": "botania:dry_grass", "y": 180 }, + { "model": "botania:dry_grass", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/golden_grass.json b/src/main/resources/assets/botania/blockstates/golden_grass.json new file mode 100644 index 000000000..7f7195200 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/golden_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:golden_grass" }, + { "model": "botania:golden_grass", "y": 90 }, + { "model": "botania:golden_grass", "y": 180 }, + { "model": "botania:golden_grass", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/infused_grass.json b/src/main/resources/assets/botania/blockstates/infused_grass.json new file mode 100644 index 000000000..606fdfa75 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/infused_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:infused_grass" }, + { "model": "botania:infused_grass", "y": 90 }, + { "model": "botania:infused_grass", "y": 180 }, + { "model": "botania:infused_grass", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mutated_grass.json b/src/main/resources/assets/botania/blockstates/mutated_grass.json new file mode 100644 index 000000000..f3c38bc6e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mutated_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:mutated_grass" }, + { "model": "botania:mutated_grass", "y": 90 }, + { "model": "botania:mutated_grass", "y": 180 }, + { "model": "botania:mutated_grass", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/scorched_grass.json b/src/main/resources/assets/botania/blockstates/scorched_grass.json new file mode 100644 index 000000000..3d860e0aa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/scorched_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:scorched_grass" }, + { "model": "botania:scorched_grass", "y": 90 }, + { "model": "botania:scorched_grass", "y": 180 }, + { "model": "botania:scorched_grass", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/vivid_grass.json b/src/main/resources/assets/botania/blockstates/vivid_grass.json new file mode 100644 index 000000000..65939a52c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/vivid_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:vivid_grass" }, + { "model": "botania:vivid_grass", "y": 90 }, + { "model": "botania:vivid_grass", "y": 180 }, + { "model": "botania:vivid_grass", "y": 270 } + ] + } +} \ 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 b236dbbbd..f55d3c8d7 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1142,12 +1142,12 @@ tile.botania:shimmerwoodPlanks0Slab.name=Shimmerwood Plank Slab tile.botania:shimmerwoodPlanks0SlabFull.name=Shimmerwood Plank Slab tile.botania:shimmerwoodPlanks0Stairs.name=Shimmerwood Plank Stairs tile.botania:avatar.name=Livingwood Avatar -tile.botania:altGrass0.name=Dry Grass -tile.botania:altGrass1.name=Golden Grass -tile.botania:altGrass2.name=Vivid Grass -tile.botania:altGrass3.name=Scorched Grass -tile.botania:altGrass4.name=Infused Grass -tile.botania:altGrass5.name=Mutated Grass +tile.botania:dry_grass.name=Dry Grass +tile.botania:golden_grass.name=Golden Grass +tile.botania:vivid_grass.name=Vivid Grass +tile.botania:scorched_grass.name=Scorched Grass +tile.botania:infused_grass.name=Infused Grass +tile.botania:mutated_grass.name=Mutated Grass tile.botania:animatedTorch.name=Animated Torch # FLOWER NAMES diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index bd3e5644b..53cf8ec26 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -931,12 +931,12 @@ tile.botania:shimmerwoodPlanks0Slab.name=きらめく木のハーフブロック tile.botania:shimmerwoodPlanks0SlabFull.name=きらめく木のハーフブロック tile.botania:shimmerwoodPlanks0Stairs.name=きらめく木の階段 tile.botania:avatar.name=リビングロックの化身 -tile.botania:altGrass0.name=乾燥した草ブロック -tile.botania:altGrass1.name=金色の草ブロック -tile.botania:altGrass2.name=鮮やかな草ブロック -tile.botania:altGrass3.name=枯れた草ブロック -tile.botania:altGrass4.name=マナで満たされた草ブロック -tile.botania:altGrass5.name=変異した草ブロック +tile.botania:dry_grass.name=乾燥した草ブロック +tile.botania:golden_grass.name=金色の草ブロック +tile.botania:vivid_grass.name=鮮やかな草ブロック +tile.botania:scorched_grass.name=枯れた草ブロック +tile.botania:infused_grass.name=マナで満たされた草ブロック +tile.botania:mutated_grass.name=変異した草ブロック tile.botania:animatedTorch.name=動く松明 # FLOWER NAMES diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 682beae1c..a7599bd47 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1147,12 +1147,12 @@ tile.botania:shimmerwoodPlanks0Slab.name=Laje de Madeira Reluzente tile.botania:shimmerwoodPlanks0SlabFull.name=Laje de Madeira Reluzente tile.botania:shimmerwoodPlanks0Stairs.name=Escadas de de Madeira Reluzente tile.botania:avatar.name=Avatar de Madeira-viva -tile.botania:altGrass0.name=Grama Seca -tile.botania:altGrass1.name=Grama Dourada -tile.botania:altGrass2.name=Grama Vívia -tile.botania:altGrass3.name=Grama Queimada -tile.botania:altGrass4.name=Grama Infusa -tile.botania:altGrass5.name=Grama Mutante +tile.botania:dry_grass.name=Grama Seca +tile.botania:golden_grass.name=Grama Dourada +tile.botania:vivid_grass.name=Grama Vívia +tile.botania:scorched_grass.name=Grama Queimada +tile.botania:infused_grass.name=Grama Infusa +tile.botania:mutated_grass.name=Grama Mutante tile.botania:animatedTorch.name=Tocha Animada # FLOWER NAMES diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 86b13570d..d5a297838 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1142,12 +1142,12 @@ tile.botania:shimmerwoodPlanks0Slab.name=微光木板台阶 tile.botania:shimmerwoodPlanks0SlabFull.name=微光木板台阶 tile.botania:shimmerwoodPlanks0Stairs.name=微光木板楼梯 tile.botania:avatar.name=活木枝化身 -tile.botania:altGrass0.name=干草地 -tile.botania:altGrass1.name=黄金草地 -tile.botania:altGrass2.name=鲜草草地 -tile.botania:altGrass3.name=焦草草地 -tile.botania:altGrass4.name=注魔草地 -tile.botania:altGrass5.name=异变草地 +tile.botania:dry_grass.name=干草地 +tile.botania:golden_grass.name=黄金草地 +tile.botania:vivid_grass.name=鲜草草地 +tile.botania:scorched_grass.name=焦草草地 +tile.botania:infused_grass.name=注魔草地 +tile.botania:mutated_grass.name=异变草地 tile.botania:animatedTorch.name=活化红石火把 # FLOWER NAMES diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index cb35d8575..bdacf20fc 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1103,12 +1103,12 @@ tile.botania:shimmerwoodPlanks0Slab.name=微光木板半磚 tile.botania:shimmerwoodPlanks0SlabFull.name=微光木板半磚 tile.botania:shimmerwoodPlanks0Stairs.name=微光木板階梯 tile.botania:avatar.name=活木枝化身 -tile.botania:altGrass0.name=乾草地 -tile.botania:altGrass1.name=黃金草地 -tile.botania:altGrass2.name=鮮草草地 -tile.botania:altGrass3.name=焦草草地 -tile.botania:altGrass4.name=注魔草地 -tile.botania:altGrass5.name=異變草地 +tile.botania:dry_grass.name=乾草地 +tile.botania:golden_grass.name=黃金草地 +tile.botania:vivid_grass.name=鮮草草地 +tile.botania:scorched_grass.name=焦草草地 +tile.botania:infused_grass.name=注魔草地 +tile.botania:mutated_grass.name=異變草地 # FLOWER NAMES tile.botania:flower..name=植物魔法花