mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Flatten alt grasses
This commit is contained in:
1 parent
1a10608c11
commit
9dfa61c7fa
22 files changed
+161
-157
No files matched your search
@@ -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<AltarVariant> ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class);
|
||||
|
||||
// BlockAltGrass
|
||||
public static final PropertyEnum<AltGrassVariant> ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class);
|
||||
|
||||
// BlockBiomeStoneA
|
||||
public static final PropertyEnum<BiomeStoneVariant> BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class);
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
/**
|
||||
* This class was created by <williewillus>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* <p>
|
||||
* 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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<ItemStack> 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);
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user