PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-08 06:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed tomato plants not consuming seeds when planted

Browse source
This commit is contained in:
Sollace 2019-01-10 09:45:05 +02:00
parent b2192cc862
commit 72aad10845
3 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java
View file

@ -18,12 +18,13 @@ public class BlockSugar extends BlockFalling {
setRegistryName(domain, name); setRegistryName(domain, name);
setSoundType(SoundType.SAND); setSoundType(SoundType.SAND);
setCreativeTab(CreativeTabs.MATERIALS); setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setHardness(0.7F); setHardness(0.7F);
} }
@Override @Override
public int quantityDropped(Random random) { public int quantityDropped(Random random) {
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
return 9; return 9;
} }

29
src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java
View file

@ -17,6 +17,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
@ -128,7 +129,7 @@ public class BlockTomatoPlant extends BlockCrops {
@Override @Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) { public Item getItemDropped(IBlockState state, Random rand, int fortune) {
if (getAge(state) == 0) { if (getAge(state) == 0) {
return UItems.stick; return Items.AIR;
} }
if (isMaxAge(state)) { if (isMaxAge(state)) {
@ -142,13 +143,11 @@ public class BlockTomatoPlant extends BlockCrops {
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
Random rand = world instanceof World ? ((World)world).rand : RANDOM; Random rand = world instanceof World ? ((World)world).rand : RANDOM;
drops.add(new ItemStack(UItems.stick, 1, 0));
Item item = getItemDropped(state, rand, fortune); Item item = getItemDropped(state, rand, fortune);
if (item != Items.AIR) { if (item != Items.AIR) {
drops.add(new ItemStack(item, 1, damageDropped(state))); drops.add(new ItemStack(item, 1, damageDropped(state)));
if (getAge(state) > 0) {
drops.add(new ItemStack(item, rand.nextInt(2), 1));
}
} }
} }
@ -160,7 +159,19 @@ public class BlockTomatoPlant extends BlockCrops {
Type type = state.getValue(TYPE); Type type = state.getValue(TYPE);
Item crop = type == Type.CLOUDSDALE ? UItems.cloudsdale_tomato : UItems.tomato; Item crop = type == Type.CLOUDSDALE ? UItems.cloudsdale_tomato : UItems.tomato;
spawnAsEntity(world, pos, new ItemStack(crop, getAge(state), 0));
int good = getAge(state);
int rotten = world.rand.nextInt(good);
good -= rotten;
if (good > 0) {
spawnAsEntity(world, pos, new ItemStack(crop, good, 0));
}
if (rotten > 0) {
spawnAsEntity(world, pos, new ItemStack(crop, rotten, 1));
}
world.setBlockState(pos, state.withProperty(getAgeProperty(), 0)); world.setBlockState(pos, state.withProperty(getAgeProperty(), 0));
return true; return true;
@ -179,7 +190,13 @@ public class BlockTomatoPlant extends BlockCrops {
public boolean plant(World world, BlockPos pos, IBlockState state) { public boolean plant(World world, BlockPos pos, IBlockState state) {
if (getAge(state) == 0) { if (getAge(state) == 0) {
world.setBlockState(pos, state.withProperty(getAgeProperty(), 1)); world.setBlockState(pos, state.withProperty(getAgeProperty(), 1));
SoundType sound = getSoundType(state, world, pos, null);
world.playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, sound.getVolume(), sound.getPitch() * 2);
return true; return true;
} }

9
src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java
View file

@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.block.BlockTomatoPlant; import com.minelittlepony.unicopia.block.BlockTomatoPlant;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -25,8 +26,12 @@ public class ItemTomatoSeeds extends Item {
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
if (state.getBlock() instanceof BlockTomatoPlant) { Block block = state.getBlock();
if (((BlockTomatoPlant)state.getBlock()).plant(world, pos, state)) {
if (block instanceof BlockTomatoPlant) {
if (((BlockTomatoPlant)block).plant(world, pos, state)) {
player.getHeldItem(hand).shrink(1);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
} }