diff --git a/src/main/java/binnie/botany/api/EnumAcidity.java b/src/main/java/binnie/botany/api/EnumAcidity.java index 6bab0abe..737dfe1e 100644 --- a/src/main/java/binnie/botany/api/EnumAcidity.java +++ b/src/main/java/binnie/botany/api/EnumAcidity.java @@ -1,14 +1,30 @@ package binnie.botany.api; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; public enum EnumAcidity implements IStringSerializable { - Acid, + Acid(TextFormatting.RED), Neutral, - Alkaline; + Alkaline(TextFormatting.AQUA); + + final TextFormatting color; + + EnumAcidity() { + this(null); + } + + EnumAcidity(TextFormatting color) { + this.color = color; + } @Override public String getName() { return this.name().toLowerCase(); } + + public String getTranslated(boolean withColor){ + return (withColor && color != null ? color : "") + I18n.translateToLocal("botany.ph." + getName()); + } } diff --git a/src/main/java/binnie/botany/api/EnumMoisture.java b/src/main/java/binnie/botany/api/EnumMoisture.java index ed5462bc..11f5b3cb 100644 --- a/src/main/java/binnie/botany/api/EnumMoisture.java +++ b/src/main/java/binnie/botany/api/EnumMoisture.java @@ -1,14 +1,30 @@ package binnie.botany.api; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; public enum EnumMoisture implements IStringSerializable { - Dry, + Dry(TextFormatting.YELLOW), Normal, - Damp; + Damp(TextFormatting.DARK_BLUE); + + final TextFormatting color; + + EnumMoisture() { + this(null); + } + + EnumMoisture(TextFormatting color) { + this.color = color; + } @Override public String getName() { return name().toLowerCase(); } + + public String getTranslated(boolean withColor){ + return (withColor && color != null ? color : "") + I18n.translateToLocal("botany.moisture." + getName()); + } } diff --git a/src/main/java/binnie/botany/api/EnumSoilType.java b/src/main/java/binnie/botany/api/EnumSoilType.java index dbc5ef3f..c217392b 100644 --- a/src/main/java/binnie/botany/api/EnumSoilType.java +++ b/src/main/java/binnie/botany/api/EnumSoilType.java @@ -1,11 +1,16 @@ package binnie.botany.api; -public enum EnumSoilType { +import java.util.Locale; + +import net.minecraft.util.IStringSerializable; + +public enum EnumSoilType implements IStringSerializable { SOIL, LOAM, FLOWERBED; - public String getID() { - return this.name().toLowerCase(); - } + @Override + public String getName() { + return this.name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/binnie/botany/core/ModuleCore.java b/src/main/java/binnie/botany/core/ModuleCore.java index b35ee9fa..a46c8a7e 100644 --- a/src/main/java/binnie/botany/core/ModuleCore.java +++ b/src/main/java/binnie/botany/core/ModuleCore.java @@ -17,7 +17,7 @@ public class ModuleCore implements IInitializable { Binnie.Language.addObjectName(pH2, Binnie.Language.unlocalised(Botany.instance, "moisture." + pH2.getName())); } for (final EnumSoilType pH3 : EnumSoilType.values()) { - Binnie.Language.addObjectName(pH3, Binnie.Language.unlocalised(Botany.instance, "soil." + pH3.getID())); + Binnie.Language.addObjectName(pH3, Binnie.Language.unlocalised(Botany.instance, "soil." + pH3.getName())); } } diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 937a7e4a..5682de77 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockFlower extends BlockContainer implements /*IItemModelRegister, */IColoredBlock { - public static final AxisAlignedBB FLOWER_BLOCK_AABB = new AxisAlignedBB(0.3F, 0.0F, 0.3, 0.7F, 0.6F, 0.7F); + public static final AxisAlignedBB FLOWER_BLOCK_AABB = new AxisAlignedBB(0.3D, 0.0D, 0.3D, 0.7D, 0.6D, 0.7D); public BlockFlower() { super(Material.PLANTS); diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 32fd1be7..bd4ae0a2 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -23,11 +23,6 @@ import java.util.Random; public class BlockPlant extends BlockBush { public static final PropertyEnum PLANT_TYPE = PropertyEnum.create("plant_type", Type.class); - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList<>(); - } - // @Override // @SideOnly(Side.CLIENT) // public void registerBlockIcons(final IIconRegister p_149651_1_) { @@ -41,6 +36,11 @@ public class BlockPlant extends BlockBush { this.setCreativeTab(CreativeTabBotany.instance); this.setTickRandomly(true); } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + return new ArrayList<>(); + } @Override public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 5a0d730d..a2ca2d51 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -1,11 +1,14 @@ package binnie.botany.gardening; import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; import binnie.botany.api.gardening.IBlockSoil; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -17,23 +20,53 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; +import java.util.Random; -public class BlockSoil extends Block implements IBlockSoil { - boolean weedKilled; - // IIcon[] iconsTop; -// IIcon[] iconsSide; -// IIcon[] iconsNoWeed; - EnumSoilType type; +public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { + + private final boolean weedKilled; + private final EnumSoilType type; + public static final PropertyEnum MOISTURE = PropertyEnum.create("moisture", EnumMoisture.class); public static final PropertyEnum ACIDITY = PropertyEnum.create("acidity", EnumAcidity.class); + public static final AxisAlignedBB SOIL_BLOCK_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.9375D, 1.0D); + public BlockSoil(EnumSoilType type, String blockName, boolean weedKilled) { + super(Material.GROUND); + this.weedKilled = weedKilled; + this.setCreativeTab(CreativeTabBotany.instance); + this.setRegistryName(blockName); + this.setTickRandomly(true); + this.setLightOpacity(255); + this.setHardness(0.5f); + this.setSoundType(SoundType.GROUND); + this.type = type; + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return SOIL_BLOCK_AABB; + } + + @Override + public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) { + return SOIL_BLOCK_AABB; + } + + @Override + public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) { + return SOIL_BLOCK_AABB; + } + @Override @SideOnly(Side.CLIENT) public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { @@ -41,6 +74,32 @@ public class BlockSoil extends Block implements IBlockSoil { par3List.add(new ItemStack(this, 1, i)); } } + + @Override + @SideOnly(Side.CLIENT) + public void registerModel(Item item, IModelManager manager) { + int index = 0; + for(EnumMoisture moisture : EnumMoisture.values()){ + for(EnumAcidity acidity : EnumAcidity.values()){ + String modelName = ""; + if(acidity != EnumAcidity.Neutral){ + modelName +=acidity.getName(); + } + if(moisture != EnumMoisture.Normal){ + if(!modelName.isEmpty()){ + modelName += "_"; + } + modelName +=moisture.getName(); + } + if(modelName.isEmpty()){ + modelName = "normal"; + } + manager.registerItemModel(item, index, type.getName() + (weedKilled ? "NoWeed" : "") + "/" + modelName); + index++; + } + } + + } @Override protected BlockStateContainer createBlockState() { @@ -59,103 +118,49 @@ public class BlockSoil extends Block implements IBlockSoil { return getDefaultState().withProperty(MOISTURE, moisture).withProperty(ACIDITY, acidity); } - // @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { -// return this.getIcon(side, world.getBlockMetadata(x, y, z)); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final int side, int meta) { -// meta = ((meta >= 9) ? 8 : meta); -// final EnumMoisture moisture = EnumMoisture.values()[meta % 3]; -// final EnumAcidity acidity = EnumAcidity.values()[meta / 3]; -// return (side == 1) ? (this.weedKilled ? this.iconsNoWeed[meta] : this.iconsTop[meta]) : ((side == 0) ? Blocks.dirt.getIcon(side, 0) : this.iconsSide[meta]); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerBlockIcons(final IIconRegister register) { -// for (final EnumMoisture moisture : EnumMoisture.values()) { -// for (final EnumAcidity pH : EnumAcidity.values()) { -// this.iconsTop[moisture.ordinal() + pH.ordinal() * 3] = Botany.proxy.getIcon(register, "soil/" + this.getType().getID() + "." + pH.getID() + "." + moisture.getID() + ".0"); -// this.iconsSide[moisture.ordinal() + pH.ordinal() * 3] = Botany.proxy.getIcon(register, "soil/" + this.getType().getID() + "." + pH.getID() + "." + moisture.getID() + ".1"); -// this.iconsNoWeed[moisture.ordinal() + pH.ordinal() * 3] = Botany.proxy.getIcon(register, "soil/" + this.getType().getID() + "." + pH.getID() + "." + moisture.getID() + ".2"); -// } -// } -// } - public EnumSoilType getType() { return this.type; } - - public BlockSoil(final EnumSoilType type, final String blockName, final boolean weedKilled) { - super(Material.GROUND); - this.weedKilled = false; -// this.iconsTop = new IIcon[9]; -// this.iconsSide = new IIcon[9]; -// this.iconsNoWeed = new IIcon[9]; - this.weedKilled = weedKilled; - this.setCreativeTab(CreativeTabBotany.instance); - this.setRegistryName(blockName); - this.setTickRandomly(true); - //this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.9375f, 1.0f); - this.setLightOpacity(255); - this.setHardness(0.5f); - this.setSoundType(SoundType.GROUND); - this.type = type; + + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } - -// @Override -// public int damageDropped(final int p_149692_1_) { -// return p_149692_1_; -// } -// -// @Override -// public void updateTick(final World world, final int x, final int y, final int z, final Random random) { -// final int meta = world.getBlockMetadata(x, y, z); -// EnumMoisture moisture = EnumMoisture.values()[meta % 3]; -// final EnumAcidity acidity = EnumAcidity.values()[meta / 3]; -// final EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z); -// if (desiredMoisture.ordinal() > moisture.ordinal()) { -// moisture = ((moisture == EnumMoisture.Dry) ? EnumMoisture.Normal : EnumMoisture.Damp); -// } -// if (desiredMoisture.ordinal() < moisture.ordinal()) { -// moisture = ((moisture == EnumMoisture.Damp) ? EnumMoisture.Normal : EnumMoisture.Dry); -// } -// final int meta2 = getMeta(acidity, moisture); -// if (meta != meta2) { -// world.setBlockMetadataWithNotify(x, y, z, meta2, 2); -// } -// if (!this.weedKilled && random.nextInt(5 - this.getType(world, x, y, z).ordinal()) == 0 && world.getBlock(x, y + 1, z) == Blocks.air) { -// world.setBlock(x, y + 1, z, Botany.plant, BlockPlant.Type.Weeds.ordinal(), 2); -// } -// } -// -// @Override -// public AxisAlignedBB getCollisionBoundingBoxFromPool(final World p_149668_1_, final int p_149668_2_, final int p_149668_3_, final int p_149668_4_) { -// return AxisAlignedBB.getBoundingBox(p_149668_2_ + 0, p_149668_3_ + 0, p_149668_4_ + 0, p_149668_2_ + 1, p_149668_3_ + 1, p_149668_4_ + 1); -// } -// -// @Override -// public boolean isOpaqueCube() { -// return false; -// } -// -// @Override -// public boolean renderAsNormalBlock() { -// return false; -// } + + @Override + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + int meta = getMetaFromState(state); + EnumMoisture moisture = EnumMoisture.values()[meta % 3]; + EnumAcidity acidity = EnumAcidity.values()[meta / 3]; + EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, pos); + if (desiredMoisture.ordinal() > moisture.ordinal()) { + moisture = ((moisture == EnumMoisture.Dry) ? EnumMoisture.Normal : EnumMoisture.Damp); + } + if (desiredMoisture.ordinal() < moisture.ordinal()) { + moisture = ((moisture == EnumMoisture.Damp) ? EnumMoisture.Normal : EnumMoisture.Dry); + } + int meta2 = getMeta(acidity, moisture); + if (meta != meta2) { + world.setBlockState(pos, getStateFromMeta(meta2), 2); + } + if (!this.weedKilled && rand.nextInt(5 - getType(world, pos).ordinal()) == 0 && world.getBlockState(pos.up()).getBlock() == Blocks.AIR) { + world.setBlockState(pos.up(), Botany.plant.getStateFromMeta(BlockPlant.Type.Weeds.ordinal()), 2); + } + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } @Override public EnumAcidity getPH(final World world, final BlockPos pos) { - return world.getBlockState(pos).getValue(ACIDITY); //EnumAcidity.values()[world.getBlockMetadata(x, y, z) / 3]; + return world.getBlockState(pos).getValue(ACIDITY); } @Override public EnumMoisture getMoisture(final World world, final BlockPos pos) { - return world.getBlockState(pos).getValue(MOISTURE); //EnumMoisture.values()[world.getBlockMetadata(x, y, z) % 3]; + return world.getBlockState(pos).getValue(MOISTURE); } @Override @@ -185,14 +190,14 @@ public class BlockSoil extends Block implements IBlockSoil { @Override public boolean setPH(final World world, final BlockPos pos, final EnumAcidity pH) { - //final int meta = getMeta(pH, this.getMoisture(world, pos)); - return world.setBlockState(pos, world.getBlockState(pos).withProperty(ACIDITY, pH));//world.setBlockMetadataWithNotify(x, y, z, meta, 2); + final int meta = getMeta(pH, this.getMoisture(world, pos)); + return world.setBlockState(pos, world.getBlockState(pos).withProperty(ACIDITY, pH)); } @Override public boolean setMoisture(final World world, final BlockPos pos, final EnumMoisture moisture) { - //final int meta = getMeta(this.getPH(world, x, y, z), moisture); - return world.setBlockState(pos, world.getBlockState(pos).withProperty(MOISTURE, moisture));//return world.setBlockMetadataWithNotify(x, y, z, meta, 2); + final int meta = getMeta(this.getPH(world, pos), moisture); + return world.setBlockState(pos, world.getBlockState(pos).withProperty(MOISTURE, moisture)); } public static int getMeta(final EnumAcidity acid, final EnumMoisture moisture) { @@ -207,28 +212,32 @@ public class BlockSoil extends Block implements IBlockSoil { } } - public static String getPH(final ItemStack stack) { - return Binnie.Language.localise(EnumAcidity.values()[stack.getItemDamage() / 3]); + public static String getPH(ItemStack stack, boolean withColor) { + return EnumAcidity.values()[stack.getItemDamage() / 3].getTranslated(withColor); } - public static String getMoisture(final ItemStack stack) { - return Binnie.Language.localise(EnumMoisture.values()[stack.getItemDamage() % 3]); + public static String getMoisture(ItemStack stack, boolean withColor) { + return EnumMoisture.values()[stack.getItemDamage() % 3].getTranslated(withColor); + } + + @Override + public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + IBlockState plant = plantable.getPlant(world, pos.up()); + if (plant.getBlock() == Botany.flower) { + return true; + } + if (plant.getBlock() == Botany.plant) { + return !this.weedKilled || !BlockPlant.isWeed(world, pos); + } + return world instanceof World && Blocks.DIRT.canSustainPlant(state, world, pos, direction, plantable); } - -// @Override -// public boolean canSustainPlant(final IBlockAccess world, final BlockPos pos, final EnumFacing direction, final IPlantable plantable) { -// final Block plant = plantable.getPlant(world, x, y + 1, z); -// if (plant == Botany.flower) { -// return true; -// } -// if (plant == Botany.plant) { -// return !this.weedKilled || !BlockPlant.isWeed(world, x, y, z); -// } -// return world instanceof World && Blocks.dirt.canSustainPlant(world, x, y, z, direction, plantable); -// } @Override public boolean resistsWeeds(final World world, final BlockPos pos) { return this.weedKilled; } + + public boolean isWeedKilled() { + return weedKilled; + } } diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 152824b3..5839616c 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -12,6 +12,8 @@ import binnie.core.BinnieCore; import com.mojang.authlib.GameProfile; import forestry.api.core.EnumTemperature; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -41,34 +43,34 @@ public class Gardening { return isSoil(item.getItem()); } -// public static EnumMoisture getNaturalMoisture(final World world, final BlockPos pos) { -// float bias = getBiomeMoisture(world.getBiome(pos), pos.getY()); -// for (int dx = -1; dx < 2; ++dx) { -// for (int dz = -1; dz < 2; ++dz) { -// if (dx != 0 || dz != 0) { -// if (world.getBlock(x + dx, y, z + dz) == Blocks.sand) { -// bias -= 1.5; -// } -// else if (world.getBlock(x + dx, y, z + dz) == Blocks.water) { -// bias += 1.5; -// } -// } -// } -// } -// if (world.isRaining() && world.canBlockSeeTheSky(x, y + 1, z) && world.getPrecipitationHeight(x, z) <= y + 1) { -// bias += 1.5; -// } -// for (int dx = -1; dx < 2; ++dx) { -// for (int dz = -1; dz < 2; ++dz) { -// if (dx != 0 || dz != 0) { -// if (world.getBlock(x + dx, y, z + dz) == Blocks.gravel && bias > 0.0f) { -// bias *= 0.4f; -// } -// } -// } -// } -// return (bias <= -1.0f) ? EnumMoisture.Dry : ((bias >= 1.0f) ? EnumMoisture.Damp : EnumMoisture.Normal); -// } + public static EnumMoisture getNaturalMoisture(final World world, final BlockPos pos) { + float bias = getBiomeMoisture(world.getBiome(pos), pos.getY()); + for (int dx = -1; dx < 2; ++dx) { + for (int dz = -1; dz < 2; ++dz) { + if (dx != 0 || dz != 0) { + if (world.getBlockState(pos.add(dx, 0, dz)) == Blocks.SAND) { + bias -= 1.5; + } + else if (world.getBlockState(pos.add(dx, 0, dz)) == Blocks.WATER) { + bias += 1.5; + } + } + } + } + if (world.isRaining() && world.canBlockSeeSky(pos.up()) && world.getPrecipitationHeight(pos).getY() <= pos.getY() + 1) { + bias += 1.5; + } + for (int dx = -1; dx < 2; ++dx) { + for (int dz = -1; dz < 2; ++dz) { + if (dx != 0 || dz != 0) { + if (world.getBlockState(pos.add(dx, 0, dz)).getBlock() == Blocks.GRAVEL && bias > 0.0f) { + bias *= 0.4f; + } + } + } + } + return (bias <= -1.0f) ? EnumMoisture.Dry : ((bias >= 1.0f) ? EnumMoisture.Damp : EnumMoisture.Normal); + } public static EnumAcidity getNaturalPH(final World world, final BlockPos pos) { final float bias = getBiomePH(world.getBiome(pos), pos.getY()); @@ -88,10 +90,10 @@ public class Gardening { return (float) (-3.0 * (R - 0.5) + 0.5 * (T - 0.699999988079071) * (T - 0.699999988079071) + 0.02f * (H - 64) - 0.15000000596046448); } -// public static void createSoil(final World world, final BlockPos pos, final EnumSoilType soil, final EnumMoisture moisture, final EnumAcidity acidity) { -// final int meta = moisture.ordinal() + acidity.ordinal() * 3; -// world.setBlockState(x, y, z, getSoilBlock(soil), meta, 2); -// } + public static void createSoil(final World world, final BlockPos pos, final EnumSoilType soil, final EnumMoisture moisture, final EnumAcidity acidity) { + final int meta = moisture.ordinal() + acidity.ordinal() * 3; + world.setBlockState(pos, getSoilBlock(soil).getStateFromMeta(meta), 2); + } public static boolean plant(final World world, final BlockPos pos, final IFlower flower, final GameProfile owner) { final boolean set = world.setBlockState(pos, Botany.flower.getDefaultState()); @@ -194,22 +196,23 @@ public class Gardening { return 1; } -// public static boolean canTolerate(final IFlower flower, final World world, final BlockPos pos) { -// if (flower == null || flower.getGenome() == null) { -// return false; -// } -// final Block soil = world.getBlock(x, y - 1, z); -// final int soilMeta = world.getBlockMetadata(x, y - 1, z); -// final BiomeGenBase biome = world.getBiomeGenForCoords(x, z); -// return canTolerate(flower, EnumAcidity.values()[soilMeta / 3 % 3], EnumMoisture.values()[soilMeta % 3], EnumTemperature.getFromValue(biome.temperature)); -// } -// -// public static EnumSoilType getSoilType(final World world, final BlockPos pos) { -// if (world.getBlock(x, y, z) instanceof IBlockSoil) { -// return ((IBlockSoil) world.getBlock(x, y, z)).getType(world, x, y, z); -// } -// return EnumSoilType.SOIL; -// } + public static boolean canTolerate(final IFlower flower, final World world, final BlockPos pos) { + if (flower == null || flower.getGenome() == null) { + return false; + } + IBlockState soil = world.getBlockState(pos.down()); + final Block soilBlock = soil.getBlock(); + final int soilMeta = soilBlock.getMetaFromState(soil); + final Biome biome = world.getBiome(pos); + return canTolerate(flower, EnumAcidity.values()[soilMeta / 3 % 3], EnumMoisture.values()[soilMeta % 3], EnumTemperature.getFromValue(biome.getTemperature())); + } + + public static EnumSoilType getSoilType(final World world, final BlockPos pos) { + if (world.getBlockState(pos).getBlock() instanceof IBlockSoil) { + return ((IBlockSoil) world.getBlockState(pos).getBlock()).getType(world, pos); + } + return EnumSoilType.SOIL; + } public static Block getSoilBlock(final EnumSoilType type) { return getSoilBlock(type, false); @@ -229,26 +232,28 @@ public class Gardening { } } - public static boolean canTolerate(final IFlower flower, final EnumAcidity ePH, final EnumMoisture eMoisture, final EnumTemperature eTemp) { + public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) { return flower.getGenome().canTolerate(ePH) && flower.getGenome().canTolerate(eMoisture) && flower.getGenome().canTolerate(eTemp); } - public static boolean isWeedkiller(final ItemStack heldItem) { + public static boolean isWeedkiller(ItemStack heldItem) { return heldItem != null && heldItem.isItemEqual(BotanyItems.Weedkiller.get(1)); } -// public static boolean addWeedKiller(final World world, final BlockPos pos) { -// if (!(world.getBlockState(pos).getBlock() instanceof IBlockSoil)) { -// return false; -// } -// final EnumSoilType type = getSoilType(world, pos); -// final Block block = getSoilBlock(type, true); -// final boolean done = world.setBlock(x, y, z, block, world.getBlockMetadata(x, y, z), 2); -// if (done && BlockPlant.isWeed(world, pos.up())) { -// world.setBlockToAir(pos.up()); -// } -// return done; -// } + public static boolean addWeedKiller(World world, BlockPos pos) { + if (!(world.getBlockState(pos).getBlock() instanceof IBlockSoil)) { + return false; + } + EnumSoilType type = getSoilType(world, pos); + Block block = getSoilBlock(type, true); + IBlockState oldState = world.getBlockState(pos); + IBlockState newState = block.getStateFromMeta(oldState.getBlock().getMetaFromState(oldState)); + boolean done = world.setBlockState(pos, newState, 2); + if (done && BlockPlant.isWeed(world, pos.up())) { + world.setBlockToAir(pos.up()); + } + return done; + } static { Gardening.fertiliserAcid = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index f1c72f2d..198ed498 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -1,61 +1,48 @@ package binnie.botany.gardening; +import binnie.Binnie; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; +import forestry.core.utils.Translator; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; public class ItemSoil extends ItemBlock { - EnumSoilType type; - private boolean noWeed; + private final EnumSoilType type; + private final boolean noWeed; + public ItemSoil(BlockSoil block) { + super(block); + this.type = block.getType(); + this.noWeed = block.isWeedKilled(); + this.hasSubtypes = true; + } + @Override @SideOnly(Side.CLIENT) public void addInformation(final ItemStack stack, final EntityPlayer playerIn, final List tooltip, final boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); - final EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3]; - final EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3]; String info = ""; - if (moisture == EnumMoisture.Dry) { - info += "§eDry§f"; - } - if (moisture == EnumMoisture.Damp) { - info += "§9Damp§f"; - } - if (acidity == EnumAcidity.Acid) { - if (info.length() > 0) { - info += ", "; - } - info += "§cAcidic§f"; - } - if (acidity == EnumAcidity.Alkaline) { - if (info.length() > 0) { - info += ", "; - } - info += "§bAlkaline§f"; + info+=BlockSoil.getMoisture(stack, true); + if (info.length() > 0) { + info += ", "; } + info+=BlockSoil.getPH(stack, true); if (info.length() > 0) { tooltip.add(info); } if (this.noWeed) { - tooltip.add("Weedkiller"); + tooltip.add(TextFormatting.GREEN + Binnie.Language.localise("botany.soil.weedkiller")); } } - public ItemSoil(final Block block) { - super(block); - this.type = ((BlockSoil) this.block).getType(); - this.noWeed = ((BlockSoil) this.block).weedKilled; - this.hasSubtypes = true; - } - @Override public String getItemStackDisplayName(final ItemStack stack) { return this.type.name().substring(0, 1) + this.type.name().toLowerCase().substring(1); diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java index 0d8ede24..4478d69b 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java @@ -5,7 +5,6 @@ import javax.annotation.Nonnull; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.Incubator; -import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IRecipeLayout; @@ -19,15 +18,15 @@ import net.minecraft.util.ResourceLocation; public class IncubatorRecipeCategory extends BlankRecipeCategory { - @Nonnull - private final IDrawable tank; - @Nonnull - private final IDrawable tankOverlay; @Nonnull private final ResourceLocation guiTank = new ResourceLocation("binniecore:textures/gui/craftgui-slots.png"); @Nonnull private final ResourceLocation guiArrow = new ResourceLocation("binniecore:textures/gui/craftgui-panels.png"); + @Nonnull + private final IDrawable tank; + @Nonnull + private final IDrawable tankOverlay; @Nonnull private final IDrawable arrow; @Nonnull diff --git a/src/main/resources/assets/botany/blockstates/flowerbed.json b/src/main/resources/assets/botany/blockstates/flowerbed.json new file mode 100644 index 00000000..bf656267 --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/flowerbed.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=neutral,moisture=normal": { "model": "botany:flowerbed/normal" }, + "acidity=neutral,moisture=dry": { "model": "botany:flowerbed/dry" }, + "acidity=neutral,moisture=damp": { "model": "botany:flowerbed/damp" }, + "acidity=acid,moisture=normal": { "model": "botany:flowerbed/acid" }, + "acidity=acid,moisture=dry": { "model": "botany:flowerbed/acid_dry" }, + "acidity=acid,moisture=damp": { "model": "botany:flowerbed/acid_damp" }, + "acidity=alkaline,moisture=normal": { "model": "botany:flowerbed/alkaline" }, + "acidity=alkaline,moisture=dry": { "model": "botany:flowerbed/alkaline_dry" }, + "acidity=alkaline,moisture=damp": { "model": "botany:flowerbed/alkaline_damp" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json b/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json new file mode 100644 index 00000000..5b94c2e7 --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=neutral,moisture=normal": { "model": "botany:flowerbedNoWeed/normal" }, + "acidity=neutral,moisture=dry": { "model": "botany:flowerbedNoWeed/dry" }, + "acidity=neutral,moisture=damp": { "model": "botany:flowerbedNoWeed/damp" }, + "acidity=acid,moisture=normal": { "model": "botany:flowerbedNoWeed/acid" }, + "acidity=acid,moisture=dry": { "model": "botany:flowerbedNoWeed/acid_dry" }, + "acidity=acid,moisture=damp": { "model": "botany:flowerbedNoWeed/acid_damp" }, + "acidity=alkaline,moisture=normal": { "model": "botany:flowerbedNoWeed/alkaline" }, + "acidity=alkaline,moisture=dry": { "model": "botany:flowerbedNoWeed/alkaline_dry" }, + "acidity=alkaline,moisture=damp": { "model": "botany:flowerbedNoWeed/alkaline_damp" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/loam.json b/src/main/resources/assets/botany/blockstates/loam.json new file mode 100644 index 00000000..746afbf1 --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/loam.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=neutral,moisture=normal": { "model": "botany:loam/normal" }, + "acidity=neutral,moisture=dry": { "model": "botany:loam/dry" }, + "acidity=neutral,moisture=damp": { "model": "botany:loam/damp" }, + "acidity=acid,moisture=normal": { "model": "botany:loam/acid" }, + "acidity=acid,moisture=dry": { "model": "botany:loam/acid_dry" }, + "acidity=acid,moisture=damp": { "model": "botany:loam/acid_damp" }, + "acidity=alkaline,moisture=normal": { "model": "botany:loam/alkaline" }, + "acidity=alkaline,moisture=dry": { "model": "botany:loam/alkaline_dry" }, + "acidity=alkaline,moisture=damp": { "model": "botany:loam/alkaline_damp" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/loamNoWeed.json b/src/main/resources/assets/botany/blockstates/loamNoWeed.json new file mode 100644 index 00000000..2d6a4222 --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/loamNoWeed.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=neutral,moisture=normal": { "model": "botany:loamNoWeed/normal" }, + "acidity=neutral,moisture=dry": { "model": "botany:loamNoWeed/dry" }, + "acidity=neutral,moisture=damp": { "model": "botany:loamNoWeed/damp" }, + "acidity=acid,moisture=normal": { "model": "botany:loamNoWeed/acid" }, + "acidity=acid,moisture=dry": { "model": "botany:loamNoWeed/acid_dry" }, + "acidity=acid,moisture=damp": { "model": "botany:loamNoWeed/acid_damp" }, + "acidity=alkaline,moisture=normal": { "model": "botany:loamNoWeed/alkaline" }, + "acidity=alkaline,moisture=dry": { "model": "botany:loamNoWeed/alkaline_dry" }, + "acidity=alkaline,moisture=damp": { "model": "botany:loamNoWeed/alkaline_damp" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/soil.json b/src/main/resources/assets/botany/blockstates/soil.json new file mode 100644 index 00000000..248d4e5a --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/soil.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=neutral,moisture=normal": { "model": "botany:soil/normal" }, + "acidity=neutral,moisture=dry": { "model": "botany:soil/dry" }, + "acidity=neutral,moisture=damp": { "model": "botany:soil/damp" }, + "acidity=acid,moisture=normal": { "model": "botany:soil/acid" }, + "acidity=acid,moisture=dry": { "model": "botany:soil/acid_dry" }, + "acidity=acid,moisture=damp": { "model": "botany:soil/acid_damp" }, + "acidity=alkaline,moisture=normal": { "model": "botany:soil/alkaline" }, + "acidity=alkaline,moisture=dry": { "model": "botany:soil/alkaline_dry" }, + "acidity=alkaline,moisture=damp": { "model": "botany:soil/alkaline_damp" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/soilNoWeed.json b/src/main/resources/assets/botany/blockstates/soilNoWeed.json new file mode 100644 index 00000000..6ba0abce --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/soilNoWeed.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=neutral,moisture=normal": { "model": "botany:soilNoWeed/normal" }, + "acidity=neutral,moisture=dry": { "model": "botany:soilNoWeed/dry" }, + "acidity=neutral,moisture=damp": { "model": "botany:soilNoWeed/damp" }, + "acidity=acid,moisture=normal": { "model": "botany:soilNoWeed/acid" }, + "acidity=acid,moisture=dry": { "model": "botany:soilNoWeed/acid_dry" }, + "acidity=acid,moisture=damp": { "model": "botany:soilNoWeed/acid_damp" }, + "acidity=alkaline,moisture=normal": { "model": "botany:soilNoWeed/alkaline" }, + "acidity=alkaline,moisture=dry": { "model": "botany:soilNoWeed/alkaline_dry" }, + "acidity=alkaline,moisture=damp": { "model": "botany:soilNoWeed/alkaline_damp" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index dfa66284..649b9356 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -8,6 +8,8 @@ botany.moisture.dry=Dry botany.moisture.normal=Normal botany.moisture.damp=Damp +botany.soil.weedkiller=Weedkiller + botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed diff --git a/src/main/resources/assets/botany/models/block/flowerbed/acid.json b/src/main/resources/assets/botany/models/block/flowerbed/acid.json new file mode 100644 index 00000000..5f49c341 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/acid.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.acid.normal.0", + "side": "botany:blocks/soil/flowerbed.acid.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/acid_damp.json b/src/main/resources/assets/botany/models/block/flowerbed/acid_damp.json new file mode 100644 index 00000000..347602a7 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/acid_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.acid.damp.0", + "side": "botany:blocks/soil/flowerbed.acid.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/acid_dry.json b/src/main/resources/assets/botany/models/block/flowerbed/acid_dry.json new file mode 100644 index 00000000..db4c50fa --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/acid_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.acid.dry.0", + "side": "botany:blocks/soil/flowerbed.acid.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/alkaline.json b/src/main/resources/assets/botany/models/block/flowerbed/alkaline.json new file mode 100644 index 00000000..f881a183 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/alkaline.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.alkaline.normal.0", + "side": "botany:blocks/soil/flowerbed.alkaline.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/alkaline_damp.json b/src/main/resources/assets/botany/models/block/flowerbed/alkaline_damp.json new file mode 100644 index 00000000..96b2f111 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/alkaline_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.alkaline.damp.0", + "side": "botany:blocks/soil/flowerbed.alkaline.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/alkaline_dry.json b/src/main/resources/assets/botany/models/block/flowerbed/alkaline_dry.json new file mode 100644 index 00000000..e8d9ee95 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/alkaline_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.alkaline.dry.0", + "side": "botany:blocks/soil/flowerbed.alkaline.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/damp.json b/src/main/resources/assets/botany/models/block/flowerbed/damp.json new file mode 100644 index 00000000..4c24ab3b --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.neutral.damp.0", + "side": "botany:blocks/soil/flowerbed.neutral.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/dry.json b/src/main/resources/assets/botany/models/block/flowerbed/dry.json new file mode 100644 index 00000000..a59d8c66 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.neutral.dry.0", + "side": "botany:blocks/soil/flowerbed.neutral.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbed/normal.json b/src/main/resources/assets/botany/models/block/flowerbed/normal.json new file mode 100644 index 00000000..32dfd45d --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbed/normal.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.neutral.normal.0", + "side": "botany:blocks/soil/flowerbed.neutral.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid.json new file mode 100644 index 00000000..9926f6e1 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.acid.normal.2", + "side": "botany:blocks/soil/flowerbed.acid.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_damp.json new file mode 100644 index 00000000..33d70d98 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.acid.damp.2", + "side": "botany:blocks/soil/flowerbed.acid.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_dry.json new file mode 100644 index 00000000..0f2669df --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.acid.dry.2", + "side": "botany:blocks/soil/flowerbed.acid.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline.json new file mode 100644 index 00000000..e5415c31 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.alkaline.normal.2", + "side": "botany:blocks/soil/flowerbed.alkaline.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_damp.json new file mode 100644 index 00000000..0f0be6e2 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.alkaline.damp.2", + "side": "botany:blocks/soil/flowerbed.alkaline.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_dry.json new file mode 100644 index 00000000..c2484a17 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.alkaline.dry.2", + "side": "botany:blocks/soil/flowerbed.alkaline.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/damp.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/damp.json new file mode 100644 index 00000000..ab73a2d4 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.neutral.damp.2", + "side": "botany:blocks/soil/flowerbed.neutral.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/dry.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/dry.json new file mode 100644 index 00000000..6670a4b4 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.neutral.dry.2", + "side": "botany:blocks/soil/flowerbed.neutral.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/normal.json b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/normal.json new file mode 100644 index 00000000..29249455 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowerbedNoWeed/normal.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/flowerbed.neutral.normal.2", + "side": "botany:blocks/soil/flowerbed.neutral.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/acid.json b/src/main/resources/assets/botany/models/block/loam/acid.json new file mode 100644 index 00000000..353c1e51 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/acid.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.acid.normal.0", + "side": "botany:blocks/soil/loam.acid.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/acid_damp.json b/src/main/resources/assets/botany/models/block/loam/acid_damp.json new file mode 100644 index 00000000..6b21573a --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/acid_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.acid.damp.0", + "side": "botany:blocks/soil/loam.acid.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/acid_dry.json b/src/main/resources/assets/botany/models/block/loam/acid_dry.json new file mode 100644 index 00000000..ce1c7a41 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/acid_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.acid.dry.0", + "side": "botany:blocks/soil/loam.acid.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/alkaline.json b/src/main/resources/assets/botany/models/block/loam/alkaline.json new file mode 100644 index 00000000..b31c2709 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/alkaline.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.alkaline.normal.0", + "side": "botany:blocks/soil/loam.alkaline.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/alkaline_damp.json b/src/main/resources/assets/botany/models/block/loam/alkaline_damp.json new file mode 100644 index 00000000..a796d874 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/alkaline_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.alkaline.damp.0", + "side": "botany:blocks/soil/loam.alkaline.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/alkaline_dry.json b/src/main/resources/assets/botany/models/block/loam/alkaline_dry.json new file mode 100644 index 00000000..b8dc9f36 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/alkaline_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.alkaline.dry.0", + "side": "botany:blocks/soil/loam.alkaline.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/damp.json b/src/main/resources/assets/botany/models/block/loam/damp.json new file mode 100644 index 00000000..4807cc61 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.neutral.damp.0", + "side": "botany:blocks/soil/loam.neutral.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/dry.json b/src/main/resources/assets/botany/models/block/loam/dry.json new file mode 100644 index 00000000..a4aad71c --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.neutral.dry.0", + "side": "botany:blocks/soil/loam.neutral.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loam/normal.json b/src/main/resources/assets/botany/models/block/loam/normal.json new file mode 100644 index 00000000..06c320de --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loam/normal.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.neutral.normal.0", + "side": "botany:blocks/soil/loam.neutral.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/acid.json b/src/main/resources/assets/botany/models/block/loamNoWeed/acid.json new file mode 100644 index 00000000..08b052c6 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/acid.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.acid.normal.2", + "side": "botany:blocks/soil/loam.acid.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/block/loamNoWeed/acid_damp.json new file mode 100644 index 00000000..09f5574b --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/acid_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.acid.damp.2", + "side": "botany:blocks/soil/loam.acid.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/block/loamNoWeed/acid_dry.json new file mode 100644 index 00000000..d4c2c7b2 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/acid_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.acid.dry.2", + "side": "botany:blocks/soil/loam.acid.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline.json b/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline.json new file mode 100644 index 00000000..d1954423 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.alkaline.normal.2", + "side": "botany:blocks/soil/loam.alkaline.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_damp.json new file mode 100644 index 00000000..5fffcff1 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.alkaline.damp.2", + "side": "botany:blocks/soil/loam.alkaline.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_dry.json new file mode 100644 index 00000000..81d8053c --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.alkaline.dry.2", + "side": "botany:blocks/soil/loam.alkaline.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/damp.json b/src/main/resources/assets/botany/models/block/loamNoWeed/damp.json new file mode 100644 index 00000000..04dc99fb --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.neutral.damp.2", + "side": "botany:blocks/soil/loam.neutral.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/dry.json b/src/main/resources/assets/botany/models/block/loamNoWeed/dry.json new file mode 100644 index 00000000..394d446e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.neutral.dry.2", + "side": "botany:blocks/soil/loam.neutral.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/normal.json b/src/main/resources/assets/botany/models/block/loamNoWeed/normal.json new file mode 100644 index 00000000..d2f12d4d --- /dev/null +++ b/src/main/resources/assets/botany/models/block/loamNoWeed/normal.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/loam.neutral.normal.2", + "side": "botany:blocks/soil/loam.neutral.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil.json b/src/main/resources/assets/botany/models/block/soil.json new file mode 100644 index 00000000..4fe5561a --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil.json @@ -0,0 +1,19 @@ +{ "parent": "block/block", + "textures":{ + "particle": "blocks/dirt", + "down": "blocks/dirt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 15, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botany/models/block/soil/acid.json b/src/main/resources/assets/botany/models/block/soil/acid.json new file mode 100644 index 00000000..b77395f5 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/acid.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.acid.normal.0", + "side": "botany:blocks/soil/soil.acid.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/acid_damp.json b/src/main/resources/assets/botany/models/block/soil/acid_damp.json new file mode 100644 index 00000000..3b32fc18 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/acid_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.acid.damp.0", + "side": "botany:blocks/soil/soil.acid.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/acid_dry.json b/src/main/resources/assets/botany/models/block/soil/acid_dry.json new file mode 100644 index 00000000..6c0a330c --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/acid_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.acid.dry.0", + "side": "botany:blocks/soil/soil.acid.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/alkaline.json b/src/main/resources/assets/botany/models/block/soil/alkaline.json new file mode 100644 index 00000000..d82e4e42 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/alkaline.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.alkaline.normal.0", + "side": "botany:blocks/soil/soil.alkaline.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/alkaline_damp.json b/src/main/resources/assets/botany/models/block/soil/alkaline_damp.json new file mode 100644 index 00000000..f23ffe92 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/alkaline_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.alkaline.damp.0", + "side": "botany:blocks/soil/soil.alkaline.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/alkaline_dry.json b/src/main/resources/assets/botany/models/block/soil/alkaline_dry.json new file mode 100644 index 00000000..f352a141 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/alkaline_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.alkaline.dry.0", + "side": "botany:blocks/soil/soil.alkaline.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/damp.json b/src/main/resources/assets/botany/models/block/soil/damp.json new file mode 100644 index 00000000..03278558 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.neutral.damp.0", + "side": "botany:blocks/soil/soil.neutral.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/dry.json b/src/main/resources/assets/botany/models/block/soil/dry.json new file mode 100644 index 00000000..716a132e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.neutral.dry.0", + "side": "botany:blocks/soil/soil.neutral.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soil/normal.json b/src/main/resources/assets/botany/models/block/soil/normal.json new file mode 100644 index 00000000..d3100c14 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soil/normal.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.neutral.normal.0", + "side": "botany:blocks/soil/soil.neutral.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/acid.json b/src/main/resources/assets/botany/models/block/soilNoWeed/acid.json new file mode 100644 index 00000000..c42985c4 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/acid.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.acid.normal.2", + "side": "botany:blocks/soil/soil.acid.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/block/soilNoWeed/acid_damp.json new file mode 100644 index 00000000..2e7dd389 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/acid_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.acid.damp.2", + "side": "botany:blocks/soil/soil.acid.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/block/soilNoWeed/acid_dry.json new file mode 100644 index 00000000..3a7bfcce --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/acid_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.acid.dry.2", + "side": "botany:blocks/soil/soil.acid.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline.json b/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline.json new file mode 100644 index 00000000..717eba01 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.alkaline.normal.2", + "side": "botany:blocks/soil/soil.alkaline.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_damp.json new file mode 100644 index 00000000..6b27528e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.alkaline.damp.2", + "side": "botany:blocks/soil/soil.alkaline.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_dry.json new file mode 100644 index 00000000..f442377e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.alkaline.dry.2", + "side": "botany:blocks/soil/soil.alkaline.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/damp.json b/src/main/resources/assets/botany/models/block/soilNoWeed/damp.json new file mode 100644 index 00000000..b220e29c --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/damp.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.neutral.damp.2", + "side": "botany:blocks/soil/soil.neutral.damp.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/dry.json b/src/main/resources/assets/botany/models/block/soilNoWeed/dry.json new file mode 100644 index 00000000..d9597895 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/dry.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.neutral.dry.2", + "side": "botany:blocks/soil/soil.neutral.dry.1" + } +} diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/normal.json b/src/main/resources/assets/botany/models/block/soilNoWeed/normal.json new file mode 100644 index 00000000..c9e4ba7f --- /dev/null +++ b/src/main/resources/assets/botany/models/block/soilNoWeed/normal.json @@ -0,0 +1,7 @@ +{ + "parent": "botany:block/soil", + "textures": { + "top": "botany:blocks/soil/soil.neutral.normal.2", + "side": "botany:blocks/soil/soil.neutral.normal.1" + } +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/acid.json b/src/main/resources/assets/botany/models/item/flowerbed/acid.json new file mode 100644 index 00000000..273f9a42 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/acid" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/acid_damp.json b/src/main/resources/assets/botany/models/item/flowerbed/acid_damp.json new file mode 100644 index 00000000..80267778 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/acid_dry.json b/src/main/resources/assets/botany/models/item/flowerbed/acid_dry.json new file mode 100644 index 00000000..bdfc5055 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/alkaline.json b/src/main/resources/assets/botany/models/item/flowerbed/alkaline.json new file mode 100644 index 00000000..ba580dc3 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/flowerbed/alkaline_damp.json new file mode 100644 index 00000000..ff44c1b6 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/flowerbed/alkaline_dry.json new file mode 100644 index 00000000..83268441 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/damp.json b/src/main/resources/assets/botany/models/item/flowerbed/damp.json new file mode 100644 index 00000000..5cfd48d5 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/dry.json b/src/main/resources/assets/botany/models/item/flowerbed/dry.json new file mode 100644 index 00000000..68803ba6 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed/normal.json b/src/main/resources/assets/botany/models/item/flowerbed/normal.json new file mode 100644 index 00000000..db77ed19 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed/normal" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid.json new file mode 100644 index 00000000..15100337 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/acid" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_damp.json new file mode 100644 index 00000000..bf0fe0ae --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_dry.json new file mode 100644 index 00000000..735ea4b7 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline.json new file mode 100644 index 00000000..cd4eb05f --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_damp.json new file mode 100644 index 00000000..2d813916 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_dry.json new file mode 100644 index 00000000..171d3726 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/damp.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/damp.json new file mode 100644 index 00000000..cff0f84e --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/dry.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/dry.json new file mode 100644 index 00000000..b7c59d64 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/normal.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/normal.json new file mode 100644 index 00000000..1831fc31 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbedNoWeed/normal" +} diff --git a/src/main/resources/assets/botany/models/item/loam/acid.json b/src/main/resources/assets/botany/models/item/loam/acid.json new file mode 100644 index 00000000..9a09cbbc --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/acid" +} diff --git a/src/main/resources/assets/botany/models/item/loam/acid_damp.json b/src/main/resources/assets/botany/models/item/loam/acid_damp.json new file mode 100644 index 00000000..7c920304 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/loam/acid_dry.json b/src/main/resources/assets/botany/models/item/loam/acid_dry.json new file mode 100644 index 00000000..6402ffcf --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/loam/alkaline.json b/src/main/resources/assets/botany/models/item/loam/alkaline.json new file mode 100644 index 00000000..c4a7663d --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/loam/alkaline_damp.json b/src/main/resources/assets/botany/models/item/loam/alkaline_damp.json new file mode 100644 index 00000000..3a35e1ea --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/loam/alkaline_dry.json b/src/main/resources/assets/botany/models/item/loam/alkaline_dry.json new file mode 100644 index 00000000..7f13910a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/loam/damp.json b/src/main/resources/assets/botany/models/item/loam/damp.json new file mode 100644 index 00000000..255bc479 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/damp" +} diff --git a/src/main/resources/assets/botany/models/item/loam/dry.json b/src/main/resources/assets/botany/models/item/loam/dry.json new file mode 100644 index 00000000..c7118aee --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/dry" +} diff --git a/src/main/resources/assets/botany/models/item/loam/normal.json b/src/main/resources/assets/botany/models/item/loam/normal.json new file mode 100644 index 00000000..9a6afb09 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam/normal" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/acid.json b/src/main/resources/assets/botany/models/item/loamNoWeed/acid.json new file mode 100644 index 00000000..1de3eaf4 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/acid" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/item/loamNoWeed/acid_damp.json new file mode 100644 index 00000000..43640a02 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/item/loamNoWeed/acid_dry.json new file mode 100644 index 00000000..f7592a94 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline.json b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline.json new file mode 100644 index 00000000..ab79de87 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_damp.json new file mode 100644 index 00000000..040af21a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_dry.json new file mode 100644 index 00000000..b8cd4693 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/damp.json b/src/main/resources/assets/botany/models/item/loamNoWeed/damp.json new file mode 100644 index 00000000..d8b68104 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/damp" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/dry.json b/src/main/resources/assets/botany/models/item/loamNoWeed/dry.json new file mode 100644 index 00000000..c8382625 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/dry" +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/normal.json b/src/main/resources/assets/botany/models/item/loamNoWeed/normal.json new file mode 100644 index 00000000..719d8bbc --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loamNoWeed/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loamNoWeed/normal" +} diff --git a/src/main/resources/assets/botany/models/item/soil/acid.json b/src/main/resources/assets/botany/models/item/soil/acid.json new file mode 100644 index 00000000..4f25dfb5 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/acid" +} diff --git a/src/main/resources/assets/botany/models/item/soil/acid_damp.json b/src/main/resources/assets/botany/models/item/soil/acid_damp.json new file mode 100644 index 00000000..8d12fe93 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/soil/acid_dry.json b/src/main/resources/assets/botany/models/item/soil/acid_dry.json new file mode 100644 index 00000000..5fac5291 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/soil/alkaline.json b/src/main/resources/assets/botany/models/item/soil/alkaline.json new file mode 100644 index 00000000..657bde54 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/soil/alkaline_damp.json b/src/main/resources/assets/botany/models/item/soil/alkaline_damp.json new file mode 100644 index 00000000..1ee1120c --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/soil/alkaline_dry.json b/src/main/resources/assets/botany/models/item/soil/alkaline_dry.json new file mode 100644 index 00000000..1b3f82e3 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/soil/damp.json b/src/main/resources/assets/botany/models/item/soil/damp.json new file mode 100644 index 00000000..1ceb849c --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/damp" +} diff --git a/src/main/resources/assets/botany/models/item/soil/dry.json b/src/main/resources/assets/botany/models/item/soil/dry.json new file mode 100644 index 00000000..35a3ae7a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/dry" +} diff --git a/src/main/resources/assets/botany/models/item/soil/normal.json b/src/main/resources/assets/botany/models/item/soil/normal.json new file mode 100644 index 00000000..c96f927a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil/normal" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/acid.json b/src/main/resources/assets/botany/models/item/soilNoWeed/acid.json new file mode 100644 index 00000000..513f1092 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/acid" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/item/soilNoWeed/acid_damp.json new file mode 100644 index 00000000..ffe03602 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/item/soilNoWeed/acid_dry.json new file mode 100644 index 00000000..5ccda7e0 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline.json b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline.json new file mode 100644 index 00000000..835aaa12 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_damp.json new file mode 100644 index 00000000..bd0566e9 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_dry.json new file mode 100644 index 00000000..c5c1d1c1 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/damp.json b/src/main/resources/assets/botany/models/item/soilNoWeed/damp.json new file mode 100644 index 00000000..aa5b5c9f --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/damp" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/dry.json b/src/main/resources/assets/botany/models/item/soilNoWeed/dry.json new file mode 100644 index 00000000..4edb8ea3 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/dry" +} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/normal.json b/src/main/resources/assets/botany/models/item/soilNoWeed/normal.json new file mode 100644 index 00000000..9860046f --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilNoWeed/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soilNoWeed/normal" +}