Update jei and improve other things

This commit is contained in:
Nedelosk committed 2017-01-15 18:07:05 +01:00
1 parent 3059231363
commit de2dc3dabb
6 files changed
+108 -34

No files matched your search

@@ -10,6 +10,9 @@ 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.BlockDirt;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.BlockGrassPath;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyEnum;
@@ -52,8 +55,35 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
this.setHardness(0.5f);
this.setSoundType(SoundType.GROUND);
this.type = type;
}
}
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
switch (side){
case UP:
return true;
case NORTH:
case SOUTH:
case WEST:
case EAST:
IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side));
Block block = iblockstate.getBlock();
return !iblockstate.isOpaqueCube() && block != Blocks.FARMLAND && block != Blocks.GRASS_PATH && block != this;
default:
return super.shouldSideBeRendered(blockState, blockAccess, pos, side);
}
}
/**
* Used to determine ambient occlusion and culling when rebuilding chunks for render
*/
public boolean isOpaqueCube(IBlockState state){
return false;
}
public boolean isFullCube(IBlockState state){
return false;
}
@Override
public String getUnlocalizedName() {
@@ -164,12 +194,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState());
}
}
@Override
public boolean isOpaqueCube(IBlockState state) {
return false;
}
@Override
public EnumAcidity getPH(final World world, final BlockPos pos) {
return world.getBlockState(pos).getValue(ACIDITY);
@@ -0,0 +1,25 @@
package binnie.core.liquid;
import forestry.api.core.IFluidContainerPermission;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
public class BinnieContainerPermission implements IFluidContainerPermission {
private final FluidContainer container;
public BinnieContainerPermission(FluidContainer container) {
this.container = container;
}
@Override
public boolean contentsAllowed(FluidStack fluidStack) {
Fluid fluid = fluidStack.getFluid();
if(fluid instanceof BinnieFluid){
BinnieFluid binnie = (BinnieFluid) fluid;
return binnie.fluidType.canPlaceIn(container);
}
return true;
}
}
@@ -4,20 +4,29 @@ import binnie.Binnie;
import binnie.extratrees.alcohol.AlcoholEffect;
import binnie.extratrees.alcohol.drink.DrinkManager;
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;
public class ItemFluidContainer extends ItemFood {
public class ItemFluidContainer extends ItemFood implements IItemModelRegister, IColoredItem {
private FluidContainer container;
public static int LiquidExtraBee = 64;
public static int LiquidExtraTree = 128;
@@ -94,32 +103,30 @@ public class ItemFluidContainer extends ItemFood {
// }
// return this.container.getContentsIcon();
// }
//
// @Override
// @SideOnly(Side.CLIENT)
// public int getColorFromItemStack(final ItemStack item, final int pass) {
// final FluidStack fluid = this.getLiquid(item);
// if (fluid == null) {
// return 16777215;
// }
// if (pass == 0 && fluid.getFluid() instanceof BinnieFluid) {
// return ((BinnieFluid) fluid.getFluid()).fluidType.getContainerColour();
// }
// return super.getColorFromItemStack(item, pass);
// }
//
// @Override
// public boolean requiresMultipleRenderPasses() {
// return true;
// }
//
// @Override
// public ItemStack onEaten(final ItemStack stack, final World world, final EntityPlayer player) {
// player.getFoodStats().func_151686_a(this, stack);
// world.playSoundAtEntity(player, "random.burp", 0.5f, world.rand.nextFloat() * 0.1f + 0.9f);
// this.onFoodEaten(stack, world, player);
// return this.container.getEmpty();
// }
@Override
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
final FluidStack fluid = this.getLiquid(stack);
if (fluid == null) {
return 16777215;
}
if (tintIndex == 0 && fluid.getFluid() instanceof BinnieFluid) {
return ((BinnieFluid) fluid.getFluid()).fluidType.getContainerColour();
}
return -1;
}
@Override
public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving) {
if(entityLiving instanceof EntityPlayer){
EntityPlayer player = (EntityPlayer) entityLiving;
player.getFoodStats().addStats(this, stack);
world.playSound((EntityPlayer)null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, world.rand.nextFloat() * 0.1F + 0.9F);
onFoodEaten(stack, world, player);
return this.container.getEmpty();
}
return stack;
}
@Override
protected void onFoodEaten(final ItemStack stack, final World world, final EntityPlayer player) {
@@ -141,6 +148,11 @@ public class ItemFluidContainer extends ItemFood {
public EnumAction getItemUseAction(final ItemStack stack) {
return this.isDrinkable(stack) ? EnumAction.DRINK : EnumAction.NONE;
}
@Override
public void registerModel(Item item, IModelManager manager) {
manager.registerItemModel(item, 0);
}
// @Override
// public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) {
@@ -1,6 +1,7 @@
package binnie.core.liquid;
import binnie.core.ManagerBase;
import forestry.api.core.EnumContainerType;
import forestry.core.render.TextureManager;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.fluids.FluidRegistry;
@@ -18,6 +19,10 @@ public class ManagerLiquid extends ManagerBase {
public ManagerLiquid() {
this.fluids = new LinkedHashMap<>();
EnumContainerType.CAN.add(new BinnieContainerPermission(FluidContainer.Can));
EnumContainerType.CAPSULE.add(new BinnieContainerPermission(FluidContainer.Capsule));
EnumContainerType.REFRACTORY.add(new BinnieContainerPermission(FluidContainer.Refractory));
EnumContainerType.GLASS.add(new BinnieContainerPermission(FluidContainer.Glass));
}
public Collection<IFluidType> getFluidTypes() {