mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Fix vine balls and tweak slightly
This commit is contained in:
4 files changed
+45
-39
No files matched your search
@@ -1,5 +1,6 @@
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
@@ -8,12 +9,17 @@ import net.minecraft.client.renderer.color.BlockColors;
|
||||
import net.minecraft.client.renderer.color.IBlockColor;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.renderer.color.ItemColors;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.fml.common.registry.IForgeRegistry;
|
||||
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
|
||||
import net.minecraftforge.fml.common.registry.RegistryDelegate;
|
||||
import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
@@ -24,11 +30,16 @@ import vazkii.botania.common.item.IColorable;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.Map;
|
||||
|
||||
public final class ColorHandler {
|
||||
|
||||
public static void init() {
|
||||
BlockColors blocks = Minecraft.getMinecraft().getBlockColors();
|
||||
Map<RegistryDelegate<Block>, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap");
|
||||
|
||||
// Steal vine colorer
|
||||
blocks.registerBlockColorHandler(map.get(Blocks.vine.delegate), ModBlocks.solidVines);
|
||||
|
||||
// 16 colors
|
||||
blocks.registerBlockColorHandler(
|
||||
|
||||
@@ -34,11 +34,6 @@ import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
public class BlockSolidVines extends BlockVine implements ILexiconable {
|
||||
|
||||
protected static final AxisAlignedBB LADDER_EAST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.1875D, 1.0D, 1.0D);
|
||||
protected static final AxisAlignedBB LADDER_WEST_AABB = new AxisAlignedBB(0.8125D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
|
||||
protected static final AxisAlignedBB LADDER_SOUTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.1875D);
|
||||
protected static final AxisAlignedBB LADDER_NORTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D);
|
||||
|
||||
public BlockSolidVines() {
|
||||
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE));
|
||||
setUnlocalizedName(LibBlockNames.SOLID_VINE);
|
||||
@@ -49,17 +44,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable {
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) {
|
||||
AxisAlignedBB bounds = getBoundingBox(state, world, pos);
|
||||
|
||||
if(state.getValue(EAST)) {
|
||||
return new AxisAlignedBB(pos.add(bounds.maxX, bounds.minY, bounds.minZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ));
|
||||
}
|
||||
|
||||
if(state.getValue(SOUTH)) {
|
||||
return new AxisAlignedBB(pos.add(bounds.minX, bounds.minY, bounds.maxZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ));
|
||||
}
|
||||
|
||||
return new AxisAlignedBB(pos.add(bounds.minX, bounds.minY, bounds.minZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ));
|
||||
return getBoundingBox(state, world, pos);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,63 +18,70 @@ import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.network.datasync.DataParameter;
|
||||
import net.minecraft.network.datasync.DataSerializers;
|
||||
import net.minecraft.network.datasync.EntityDataManager;
|
||||
import net.minecraft.util.EnumParticleTypes;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class EntityVineBall extends EntityThrowable {
|
||||
|
||||
private static final DataParameter<Float> GRAVITY = EntityDataManager.createKey(EntityVineBall.class, DataSerializers.FLOAT);
|
||||
private final boolean gravity;
|
||||
private static final Map<EnumFacing, PropertyBool> propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH,
|
||||
EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST);
|
||||
|
||||
public EntityVineBall(World par1World) {
|
||||
super(par1World);
|
||||
gravity = false;
|
||||
}
|
||||
|
||||
public EntityVineBall(EntityLivingBase thrower, boolean gravity) {
|
||||
super(thrower.worldObj, thrower);
|
||||
this.gravity = gravity;
|
||||
dataManager.set(GRAVITY, gravity ? 0.03F : 0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void entityInit() {
|
||||
super.entityInit();
|
||||
dataManager.register(GRAVITY, gravity ? 0.03F : 0F);
|
||||
dataManager.register(GRAVITY, 0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onImpact(RayTraceResult var1) {
|
||||
if(var1 != null) {
|
||||
EnumFacing dir = var1.sideHit;
|
||||
|
||||
Map<EnumFacing, PropertyBool> propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH,
|
||||
EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST);
|
||||
if(worldObj.isRemote) {
|
||||
for(int j = 0; j < 16; j++) {
|
||||
this.worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, this.posX, this.posY, this.posZ, Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1, Item.getIdFromItem(ModItems.vineBall));
|
||||
}
|
||||
} else {
|
||||
if(var1 != null) {
|
||||
EnumFacing dir = var1.sideHit;
|
||||
|
||||
if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) {
|
||||
BlockPos pos = var1.getBlockPos().offset(dir);
|
||||
while(pos.getY() > 0) {
|
||||
IBlockState state = worldObj.getBlockState(pos);
|
||||
Block block = state.getBlock();
|
||||
if(block.isAir(state, worldObj, pos)) {
|
||||
IBlockState stateSet = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true);
|
||||
worldObj.setBlockState(pos, stateSet, 1 | 2);
|
||||
worldObj.playAuxSFX(2001, pos, Block.getStateId(stateSet));
|
||||
pos = pos.down();
|
||||
} else break;
|
||||
if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) {
|
||||
BlockPos pos = var1.getBlockPos().offset(dir);
|
||||
while(pos.getY() > 0) {
|
||||
IBlockState state = worldObj.getBlockState(pos);
|
||||
Block block = state.getBlock();
|
||||
if(block.isAir(state, worldObj, pos)) {
|
||||
IBlockState stateSet = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true);
|
||||
worldObj.setBlockState(pos, stateSet, 1 | 2);
|
||||
worldObj.playAuxSFX(2001, pos, Block.getStateId(stateSet));
|
||||
pos = pos.down();
|
||||
} else break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
setDead();
|
||||
}
|
||||
|
||||
setDead();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -34,8 +34,11 @@ public class ItemVineBall extends ItemMod {
|
||||
|
||||
par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
|
||||
|
||||
if(!par2World.isRemote)
|
||||
par2World.spawnEntityInWorld(new EntityVineBall(par3EntityPlayer, true));
|
||||
if(!par2World.isRemote) {
|
||||
EntityVineBall ball = new EntityVineBall(par3EntityPlayer, true);
|
||||
ball.setHeadingFromThrower(par3EntityPlayer, par3EntityPlayer.rotationPitch, par3EntityPlayer.rotationYaw, 0.0F, 1.5F, 1.0F);
|
||||
par2World.spawnEntityInWorld(ball);
|
||||
}
|
||||
|
||||
return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user