mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 03:25:07 +00:00
Improve wood blocks
This commit is contained in:
1 parent
3ed915f9d5
commit
a990ce3dc9
33 files changed
+465
-1604
No files matched your search
@@ -15,6 +15,8 @@ import net.minecraft.world.World;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
|
||||
public class BlockMetadata extends BlockContainer implements IBlockMetadata {
|
||||
static int temporyMeta = -1;
|
||||
|
||||
@@ -91,17 +93,16 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
|
||||
final Block block2 = (Block) block;
|
||||
final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
|
||||
if (tile != null && !tile.hasDroppedBlock()) {
|
||||
final int tileMeta = TileEntityMetadata.getTileMetadata(world, pos);
|
||||
//drops = block2.getDrops(world, i, j, k, world.getBlockMetadata(i, j, k), 0);
|
||||
drops = block2.getDrops(world, pos, world.getBlockState(pos), 0);
|
||||
}
|
||||
//final boolean hasBeenBroken = world.setBlockToAir(i, j, k);
|
||||
// if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
|
||||
// for (final ItemStack drop : drops) {
|
||||
// //block.dropAsStack(world, i, j, k, drop);
|
||||
// }
|
||||
// tile.dropBlock();
|
||||
// }
|
||||
return false; //hasBeenBroken;
|
||||
final boolean hasBeenBroken = world.setBlockToAir(pos);
|
||||
if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
|
||||
for (final ItemStack drop : drops) {
|
||||
block.dropAsStack(world, pos, drop);
|
||||
}
|
||||
tile.dropBlock();
|
||||
}
|
||||
return hasBeenBroken;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,21 +7,17 @@ import binnie.extratrees.alcohol.drink.IDrinkLiquid;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemFluidContainerForestry;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.SoundEvents;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBucket;
|
||||
import net.minecraft.item.ItemFood;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import scala.collection.parallel.BucketCombiner;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -10,6 +10,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
@@ -33,6 +34,16 @@ public class BinnieModProxy implements IBinnieModProxy {
|
||||
public Block registerBlock(Block block) {
|
||||
return GameRegistry.register(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends Block> void registerBlock(T block, ItemBlock itemBlock) {
|
||||
registerBlock(block);
|
||||
|
||||
if(itemBlock.getRegistryName() == null){
|
||||
itemBlock.setRegistryName(block.getRegistryName());
|
||||
}
|
||||
registerItem(itemBlock);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels() {
|
||||
|
||||
@@ -4,6 +4,7 @@ import binnie.core.AbstractMod;
|
||||
import binnie.core.IInitializable;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
|
||||
public interface IProxyCore extends IInitializable {
|
||||
|
||||
@@ -12,6 +13,8 @@ public interface IProxyCore extends IInitializable {
|
||||
Item registerItem(Item item);
|
||||
|
||||
Block registerBlock(Block block);
|
||||
|
||||
<B extends Block> void registerBlock(B block, ItemBlock itemBlock);
|
||||
|
||||
public void registerModels();
|
||||
|
||||
|
||||
Reference in new issue
Block a user