initial c to java port package cleanup, WCF func adjust
This commit is contained in:
parent
6c59ca5d73
commit
2d1df55e65
330 changed files with 397 additions and 8199 deletions
|
@ -2,7 +2,6 @@ package game.entity;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.audio.SoundType;
|
||||
import game.block.Block;
|
||||
import game.block.BlockFence;
|
||||
|
@ -33,6 +32,7 @@ import game.nbt.NBTTagFloat;
|
|||
import game.nbt.NBTTagList;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.rng.Random;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.Explosion;
|
||||
|
|
|
@ -4,8 +4,6 @@ import java.util.Collection;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.Log;
|
||||
import game.collect.Sets;
|
||||
import game.entity.attributes.AttributeInstance;
|
||||
import game.entity.attributes.AttributeMap;
|
||||
|
@ -13,6 +11,7 @@ import game.entity.npc.EntityNPC;
|
|||
import game.entity.projectile.EntityArrow;
|
||||
import game.entity.types.EntityLiving;
|
||||
import game.item.ItemStack;
|
||||
import game.log.Log;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.network.Packet;
|
||||
import game.packet.S14PacketEntity;
|
||||
|
@ -29,6 +28,7 @@ import game.packet.SPacketSpawnMob;
|
|||
import game.packet.SPacketSpawnObject;
|
||||
import game.packet.SPacketSpawnPlayer;
|
||||
import game.potion.PotionEffect;
|
||||
import game.util.ExtMath;
|
||||
|
||||
public class EntityTrackerEntry {
|
||||
public final Entity trackedEntity;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package game.entity.animal;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -9,6 +8,7 @@ import game.entity.npc.EntityNPC;
|
|||
import game.entity.types.EntityLiving;
|
||||
import game.init.SoundEvent;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.World;
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package game.entity.animal;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIFollowParent;
|
||||
import game.ai.EntityAILookIdle;
|
||||
import game.ai.EntityAIMate;
|
||||
|
@ -19,6 +18,7 @@ import game.init.SoundEvent;
|
|||
import game.item.Item;
|
||||
import game.item.ItemStack;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.util.ExtMath;
|
||||
import game.world.World;
|
||||
|
||||
public class EntityChicken extends EntityAnimal
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.animal;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.collect.Lists;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -13,6 +12,7 @@ import game.entity.types.IEntityMultiPart;
|
|||
import game.init.Config;
|
||||
import game.init.SoundEvent;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.Vec3;
|
||||
import game.world.World;
|
||||
import game.world.WorldClient;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.animal;
|
|||
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIFollowParent;
|
||||
import game.ai.EntityAILookIdle;
|
||||
import game.ai.EntityAIMate;
|
||||
|
@ -37,6 +36,7 @@ import game.nbt.NBTTagList;
|
|||
import game.pathfinding.PathNavigateGround;
|
||||
import game.potion.Potion;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.World;
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.animal;
|
|||
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIAttackOnCollide;
|
||||
import game.ai.EntityAIAvoidEntity;
|
||||
import game.ai.EntityAIHurtByTarget;
|
||||
|
@ -39,6 +38,7 @@ import game.pathfinding.PathNavigateGround;
|
|||
import game.potion.Potion;
|
||||
import game.potion.PotionEffect;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.State;
|
||||
import game.world.Vec3;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.animal;
|
|||
|
||||
import java.util.Map;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIEatGrass;
|
||||
import game.ai.EntityAIFollowParent;
|
||||
import game.ai.EntityAILookIdle;
|
||||
|
@ -33,6 +32,7 @@ import game.item.ItemStack;
|
|||
import game.nbt.NBTTagCompound;
|
||||
import game.pathfinding.PathNavigateGround;
|
||||
import game.rng.Random;
|
||||
import game.util.ExtMath;
|
||||
import game.world.World;
|
||||
|
||||
public class EntitySheep extends EntityAnimal
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package game.entity.animal;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIBase;
|
||||
import game.color.DyeColor;
|
||||
import game.entity.npc.Alignment;
|
||||
|
@ -9,6 +8,7 @@ import game.init.Items;
|
|||
import game.init.SoundEvent;
|
||||
import game.item.Item;
|
||||
import game.item.ItemStack;
|
||||
import game.util.ExtMath;
|
||||
import game.world.World;
|
||||
|
||||
public class EntitySquid extends EntityWaterMob
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.animal;
|
|||
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIAttackOnCollide;
|
||||
import game.ai.EntityAIBeg;
|
||||
import game.ai.EntityAIFollowOwner;
|
||||
|
@ -34,6 +33,7 @@ import game.item.ItemStack;
|
|||
import game.nbt.NBTTagCompound;
|
||||
import game.pathfinding.PathNavigateGround;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.World;
|
||||
|
||||
public class EntityWolf extends EntityTameable
|
||||
|
|
|
@ -2,8 +2,8 @@ package game.entity.attributes;
|
|||
|
||||
import java.util.Map;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.collect.Maps;
|
||||
import game.util.ExtMath;
|
||||
|
||||
public class Attribute
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@ package game.entity.attributes;
|
|||
|
||||
import java.util.Collection;
|
||||
|
||||
import game.Log;
|
||||
import game.log.Log;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.nbt.NBTTagList;
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.item;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -16,6 +15,7 @@ import game.init.Items;
|
|||
import game.item.Item;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.World;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package game.entity.item;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.block.BlockRailBase;
|
||||
import game.block.BlockRailPowered;
|
||||
|
@ -15,6 +14,7 @@ import game.item.Item;
|
|||
import game.item.ItemStack;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.tileentity.IWorldNameable;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.State;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.item;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.block.BlockAnvil;
|
||||
import game.block.BlockFalling;
|
||||
|
@ -19,6 +18,7 @@ import game.material.Material;
|
|||
import game.nbt.NBTBase;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.tileentity.TileEntity;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.Facing;
|
||||
import game.world.State;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package game.entity.item;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.entity.Entity;
|
||||
import game.init.SoundEvent;
|
||||
import game.item.ItemStack;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.World;
|
||||
import game.world.WorldClient;
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package game.entity.item;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.Log;
|
||||
import game.color.TextColor;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -12,9 +10,11 @@ import game.init.Config;
|
|||
import game.init.ItemRegistry;
|
||||
import game.init.SoundEvent;
|
||||
import game.item.ItemStack;
|
||||
import game.log.Log;
|
||||
import game.material.Material;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.PortalType;
|
||||
import game.world.World;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package game.entity.item;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.BlockFence;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -10,6 +9,7 @@ import game.init.Items;
|
|||
import game.item.Item;
|
||||
import game.item.ItemStack;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.World;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package game.entity.item;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.color.TextColor;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -11,6 +10,7 @@ import game.init.SoundEvent;
|
|||
import game.material.Material;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.PortalType;
|
||||
import game.world.World;
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package game.entity.npc;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIBase;
|
||||
import game.ai.EntityMoveHelper;
|
||||
import game.block.Block;
|
||||
import game.entity.attributes.Attributes;
|
||||
import game.entity.types.EntityLiving;
|
||||
import game.rng.Random;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.World;
|
||||
|
|
|
@ -4,9 +4,7 @@ import java.lang.reflect.InvocationTargetException;
|
|||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.Game;
|
||||
import game.GuiSign;
|
||||
import game.ai.AIRangedAttack;
|
||||
import game.ai.EntityAIAttackOnCollide;
|
||||
import game.ai.EntityAIAvoidEntity;
|
||||
|
@ -54,6 +52,7 @@ import game.gui.GuiHopper;
|
|||
import game.gui.GuiHorse;
|
||||
import game.gui.GuiMerchant;
|
||||
import game.gui.GuiRepair;
|
||||
import game.gui.GuiSign;
|
||||
import game.init.Config;
|
||||
import game.init.ItemRegistry;
|
||||
import game.init.Items;
|
||||
|
@ -98,6 +97,7 @@ import game.rng.Random;
|
|||
import game.tileentity.IInteractionObject;
|
||||
import game.tileentity.LockCode;
|
||||
import game.tileentity.TileEntitySign;
|
||||
import game.util.ExtMath;
|
||||
import game.village.MerchantRecipeList;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package game.entity.npc;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIBase;
|
||||
import game.ai.EntityMoveHelper;
|
||||
import game.biome.Biome;
|
||||
|
@ -14,6 +13,7 @@ import game.nbt.NBTTagCompound;
|
|||
import game.pathfinding.PathNavigateGround;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.rng.Random;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.Chunk;
|
||||
import game.world.World;
|
||||
|
|
|
@ -3,7 +3,6 @@ package game.entity.npc;
|
|||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIMoveThroughVillage;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.animal.EntityChicken;
|
||||
|
@ -12,6 +11,7 @@ import game.entity.attributes.Attributes;
|
|||
import game.entity.types.EntityLiving;
|
||||
import game.init.Config;
|
||||
import game.rng.Random;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.World;
|
||||
import game.world.WorldServer;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.projectile;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.enchantment.EnchantmentHelper;
|
||||
import game.entity.DamageSource;
|
||||
|
@ -19,6 +18,7 @@ import game.item.ItemStack;
|
|||
import game.material.Material;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.HitPosition;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.projectile;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.enchantment.EnchantmentHelper;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -12,6 +11,7 @@ import game.entity.types.IProjectile;
|
|||
import game.init.Config;
|
||||
import game.init.SoundEvent;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.HitPosition;
|
||||
import game.world.Vec3;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.projectile;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.enchantment.EnchantmentHelper;
|
||||
import game.entity.DamageSource;
|
||||
|
@ -19,6 +18,7 @@ import game.init.SoundEvent;
|
|||
import game.item.ItemStack;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.HitPosition;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.projectile;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.entity.DamageSource;
|
||||
import game.entity.Entity;
|
||||
|
@ -11,6 +10,7 @@ import game.init.BlockRegistry;
|
|||
import game.nbt.NBTTagCompound;
|
||||
import game.nbt.NBTTagList;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.HitPosition;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.types;
|
|||
|
||||
import java.util.Set;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.collect.Sets;
|
||||
import game.entity.DamageSource;
|
||||
|
@ -13,6 +12,7 @@ import game.init.Items;
|
|||
import game.item.ItemStack;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.World;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package game.entity.types;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.util.ExtMath;
|
||||
|
||||
public class EntityBodyHelper
|
||||
{
|
||||
|
|
|
@ -6,7 +6,6 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.ai.EntityAIBase;
|
||||
import game.ai.EntityAIMoveTowardsRestriction;
|
||||
import game.ai.EntityAITasks;
|
||||
|
@ -61,6 +60,7 @@ import game.potion.PotionEffect;
|
|||
import game.potion.PotionHelper;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.rng.Random;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.State;
|
||||
|
|
|
@ -2,7 +2,6 @@ package game.entity.types;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import game.ExtMath;
|
||||
import game.block.Block;
|
||||
import game.block.BlockPortal;
|
||||
import game.entity.Entity;
|
||||
|
@ -10,6 +9,7 @@ import game.init.BlockRegistry;
|
|||
import game.init.Blocks;
|
||||
import game.nbt.NBTTagCompound;
|
||||
import game.renderer.particle.ParticleType;
|
||||
import game.util.ExtMath;
|
||||
import game.world.BlockPos;
|
||||
import game.world.BoundingBox;
|
||||
import game.world.HitPosition;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue