sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

move attributes

Browse source
This commit is contained in:
Sen 2025-05-13 14:39:09 +02:00
parent 1578d22e46
commit 66e9f68eee
51 changed files with 90 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/client/network/ClientPlayer.java
View file

@ -27,16 +27,16 @@ import client.gui.container.GuiRepair;
import client.gui.ingame.GuiSign;
import client.renderer.particle.EntityPickupFX;
import client.renderer.texture.EntityTexManager;
import common.attributes.Attribute;
import common.attributes.AttributeInstance;
import common.attributes.AttributeMap;
import common.attributes.AttributeModifier;
import common.collect.Lists;
import common.collect.Maps;
import common.dimension.Dimension;
import common.entity.DataWatcher;
import common.entity.Entity;
import common.entity.animal.EntityHorse;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.AttributeMap;
import common.entity.attributes.AttributeModifier;
import common.entity.effect.EntityLightning;
import common.entity.item.EntityBoat;
import common.entity.item.EntityXp;

4
common/src/common/ai/EntityAIFindEntityNearest.java
View file

@ -4,8 +4,8 @@ import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.entity.types.EntityLiving;
public class EntityAIFindEntityNearest extends EntityAIBase

4
common/src/common/ai/EntityAITarget.java
View file

@ -1,7 +1,7 @@
package common.ai;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.entity.types.IEntityOwnable;
import common.init.Config;

2
common/src/common/ai/EntityMoveHelper.java
View file

@ -1,6 +1,6 @@
package common.ai;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.util.ExtMath;

2
common/src/common/entity/attributes/Attribute.java → common/src/common/attributes/Attribute.java
View file

@ -1,4 +1,4 @@
package common.entity.attributes;
package common.attributes;
import java.util.Map;

2
common/src/common/entity/attributes/AttributeInstance.java → common/src/common/attributes/AttributeInstance.java
View file

@ -1,4 +1,4 @@
package common.entity.attributes;
package common.attributes;
import java.util.Collection;
import java.util.Map;

3
common/src/common/entity/attributes/AttributeMap.java → common/src/common/attributes/AttributeMap.java
View file

@ -1,4 +1,4 @@
package common.entity.attributes;
package common.attributes;
import java.util.Collection;
import java.util.Map;
@ -6,6 +6,7 @@ import java.util.Map.Entry;
import common.collect.Maps;
import common.collect.Sets;
import common.util.LowerStringMap;
import java.util.Set;

2
common/src/common/entity/attributes/AttributeModifier.java → common/src/common/attributes/AttributeModifier.java
View file

@ -1,4 +1,4 @@
package common.entity.attributes;
package common.attributes;
import common.rng.Random;

2
common/src/common/entity/attributes/Attributes.java → common/src/common/attributes/Attributes.java
View file

@ -1,4 +1,4 @@
package common.entity.attributes;
package common.attributes;
import java.util.Collection;

4
common/src/common/entity/EntityTrackerEntry.java
View file

@ -4,9 +4,9 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
import common.attributes.AttributeInstance;
import common.attributes.AttributeMap;
import common.collect.Sets;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.AttributeMap;
import common.entity.npc.EntityNPC;
import common.entity.projectile.EntityArrow;
import common.entity.types.EntityLiving;

2
common/src/common/entity/animal/EntityChicken.java
View file

@ -8,7 +8,7 @@ import common.ai.EntityAISwimming;
import common.ai.EntityAITempt;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving;

2
common/src/common/entity/animal/EntityCow.java
View file

@ -8,7 +8,7 @@ import common.ai.EntityAISwimming;
import common.ai.EntityAITempt;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving;

4
common/src/common/entity/animal/EntityHorse.java
View file

@ -10,12 +10,12 @@ import common.ai.EntityAIRunAroundLikeCrazy;
import common.ai.EntityAISwimming;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.block.Block;
import common.block.SoundType;
import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving;

4
common/src/common/entity/animal/EntityMouse.java
View file

@ -10,9 +10,9 @@ import common.ai.EntityAISwimming;
import common.ai.EntityAITempt;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.block.Block;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving;

2
common/src/common/entity/animal/EntityOcelot.java
View file

@ -13,9 +13,9 @@ import common.ai.EntityAITargetNonTamed;
import common.ai.EntityAITempt;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.attributes.Attributes;
import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.attributes.Attributes;
import common.entity.npc.Alignment;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;

2
common/src/common/entity/animal/EntityPig.java
View file

@ -9,7 +9,7 @@ import common.ai.EntityAISwimming;
import common.ai.EntityAITempt;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving;

2
common/src/common/entity/animal/EntityRabbit.java
View file

@ -15,11 +15,11 @@ import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.ai.EntityJumpHelper;
import common.ai.EntityMoveHelper;
import common.attributes.Attributes;
import common.block.Block;
import common.block.BlockTallGrass;
import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.attributes.Attributes;
import common.entity.npc.Alignment;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;

2
common/src/common/entity/animal/EntitySheep.java
View file

@ -11,10 +11,10 @@ import common.ai.EntityAISwimming;
import common.ai.EntityAITempt;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.attributes.Attributes;
import common.biome.Biome;
import common.collect.Maps;
import common.color.DyeColor;
import common.entity.attributes.Attributes;
import common.entity.item.EntityItem;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;

2
common/src/common/entity/animal/EntityWolf.java
View file

@ -15,10 +15,10 @@ import common.ai.EntityAISwimming;
import common.ai.EntityAITargetNonTamed;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.attributes.Attributes;
import common.color.DyeColor;
import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.attributes.Attributes;
import common.entity.npc.Alignment;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;

2
common/src/common/entity/npc/EntityChaosMarine.java
View file

@ -2,8 +2,8 @@ package common.entity.npc;
import java.util.List;
import common.attributes.Attributes;
import common.collect.Lists;
import common.entity.attributes.Attributes;
import common.init.Items;
import common.init.SpeciesRegistry;
import common.item.ItemStack;

2
common/src/common/entity/npc/EntityFlyingNPC.java
View file

@ -2,8 +2,8 @@ package common.entity.npc;
import common.ai.EntityAIBase;
import common.ai.EntityMoveHelper;
import common.attributes.Attributes;
import common.block.Block;
import common.entity.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.potion.Potion;
import common.rng.Random;

2
common/src/common/entity/npc/EntityGargoyle.java
View file

@ -1,8 +1,8 @@
package common.entity.npc;
import common.ai.AIFlyingBoxAttack;
import common.attributes.Attributes;
import common.entity.DamageSource;
import common.entity.attributes.Attributes;
import common.init.Config;
import common.item.ItemStack;
import common.model.ParticleType;

2
common/src/common/entity/npc/EntityGoblin.java
View file

@ -1,6 +1,6 @@
package common.entity.npc;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.rng.Random;
import common.world.World;

2
common/src/common/entity/npc/EntityHaunter.java
View file

@ -1,8 +1,8 @@
package common.entity.npc;
import common.ai.EntityAIExplode;
import common.attributes.Attributes;
import common.entity.Entity;
import common.entity.attributes.Attributes;
import common.entity.effect.EntityLightning;
import common.entity.types.EntityLiving;
import common.init.Config;

2
common/src/common/entity/npc/EntityHoveringNPC.java
View file

@ -1,6 +1,6 @@
package common.entity.npc;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.packet.CPacketAction;
import common.world.World;

4
common/src/common/entity/npc/EntityMage.java
View file

@ -2,8 +2,8 @@ package common.entity.npc;
import java.util.List;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.entity.effect.EntityLightning;
import common.entity.types.EntityLiving;
import common.init.Items;

4
common/src/common/entity/npc/EntityMobNPC.java
View file

@ -1,10 +1,10 @@
package common.entity.npc;
import common.ai.EntityAIHurtByTarget;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.nbt.NBTTagCompound;
import common.world.World;

4
common/src/common/entity/npc/EntityNPC.java
View file

@ -20,6 +20,8 @@ import common.ai.EntityAISwimming;
import common.ai.EntityAIWander;
import common.ai.EntityAIWatchClosest;
import common.ai.EntityAIWatchClosest2;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.block.Block;
import common.block.BlockBed;
import common.dimension.Space;
@ -31,8 +33,6 @@ import common.entity.EntityType;
import common.entity.animal.EntityDragonPart;
import common.entity.animal.EntityHorse;
import common.entity.animal.EntityPig;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.entity.item.EntityBoat;
import common.entity.item.EntityCart;
import common.entity.item.EntityItem;

2
common/src/common/entity/npc/EntityOrc.java
View file

@ -1,6 +1,6 @@
package common.entity.npc;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.rng.Random;
import common.world.World;

2
common/src/common/entity/npc/EntityPrimarch.java
View file

@ -2,8 +2,8 @@ package common.entity.npc;
import java.util.List;
import common.attributes.Attributes;
import common.collect.Lists;
import common.entity.attributes.Attributes;
import common.rng.Random;
import common.util.Identifyable;
import common.world.World;

2
common/src/common/entity/npc/EntitySlime.java
View file

@ -2,10 +2,10 @@ package common.entity.npc;
import common.ai.EntityAIBase;
import common.ai.EntityMoveHelper;
import common.attributes.Attributes;
import common.biome.Biome;
import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.init.Config;
import common.init.SoundEvent;

2
common/src/common/entity/npc/EntitySpaceMarine.java
View file

@ -2,8 +2,8 @@ package common.entity.npc;
import java.util.List;
import common.attributes.Attributes;
import common.collect.Lists;
import common.entity.attributes.Attributes;
import common.init.Items;
import common.init.SpeciesRegistry;
import common.item.ItemStack;

2
common/src/common/entity/npc/EntityTiefling.java
View file

@ -1,6 +1,6 @@
package common.entity.npc;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.rng.Random;
import common.world.World;

2
common/src/common/entity/npc/EntityUndead.java
View file

@ -1,8 +1,8 @@
package common.entity.npc;
import common.ai.EntityAIAvoidEntity;
import common.attributes.Attributes;
import common.entity.animal.EntityWolf;
import common.entity.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.init.Items;
import common.item.ItemStack;

2
common/src/common/entity/npc/EntityVampire.java
View file

@ -1,6 +1,6 @@
package common.entity.npc;
import common.entity.attributes.Attributes;
import common.attributes.Attributes;
import common.entity.effect.EntityLightning;
import common.rng.Random;
import common.world.World;

4
common/src/common/entity/npc/EntityZombie.java
View file

@ -4,10 +4,10 @@ import java.util.List;
import java.util.function.Predicate;
import common.ai.EntityAIMoveThroughVillage;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.entity.DamageSource;
import common.entity.animal.EntityChicken;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.init.Config;
import common.rng.Random;

10
common/src/common/entity/types/EntityLiving.java
View file

@ -13,6 +13,11 @@ import common.ai.EntityJumpHelper;
import common.ai.EntityLookHelper;
import common.ai.EntityMoveHelper;
import common.ai.EntitySenses;
import common.attributes.Attribute;
import common.attributes.AttributeInstance;
import common.attributes.AttributeMap;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.block.Block;
import common.block.SoundType;
import common.collect.Lists;
@ -23,11 +28,6 @@ import common.entity.DamageSource;
import common.entity.Entity;
import common.entity.EntityDamageSource;
import common.entity.animal.EntityWolf;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.AttributeMap;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.item.EntityItem;
import common.entity.item.EntityLeashKnot;
import common.entity.item.EntityXp;

2
common/src/common/inventory/ContainerPlayer.java
View file

@ -2,8 +2,8 @@ package common.inventory;
import java.util.List;
import common.attributes.AttributeMap;
import common.collect.Lists;
import common.entity.attributes.AttributeMap;
import common.entity.npc.EntityNPC;
import common.init.CraftingRegistry;
import common.item.ItemArmor;

4
common/src/common/item/Item.java
View file

@ -4,12 +4,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.block.Block;
import common.collect.Maps;
import common.collect.Sets;
import common.color.TextColor;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.model.ItemMeshDefinition;

6
common/src/common/item/ItemArmor.java
View file

@ -5,14 +5,14 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.block.BlockDispenser;
import common.collect.Sets;
import common.dispenser.BehaviorDefaultDispenseItem;
import common.dispenser.IBehaviorDispenseItem;
import common.dispenser.IBlockSource;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.init.DispenserRegistry;

6
common/src/common/item/ItemBucketMilk.java
View file

@ -3,10 +3,10 @@ package common.item;
import java.util.Map;
import java.util.Set;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.collect.Sets;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.init.Items;
import common.world.World;

6
common/src/common/item/ItemMetal.java
View file

@ -4,11 +4,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.collect.Sets;
import common.color.TextColor;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.init.MetalType;

6
common/src/common/item/ItemMetalBlock.java
View file

@ -4,12 +4,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.block.Block;
import common.collect.Sets;
import common.color.TextColor;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.init.MetalType;

4
common/src/common/item/ItemPotion.java
View file

@ -5,11 +5,11 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.collect.Maps;
import common.collect.Sets;
import common.color.TextColor;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.npc.EntityNPC;
import common.entity.projectile.EntityPotion;
import common.init.Items;

6
common/src/common/item/ItemStack.java
View file

@ -5,6 +5,9 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.block.Block;
import common.collect.Lists;
import common.collect.Maps;
@ -12,9 +15,6 @@ import common.color.TextColor;
import common.enchantment.Enchantment;
import common.enchantment.EnchantmentDurability;
import common.enchantment.EnchantmentHelper;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.init.BlockRegistry;

6
common/src/common/item/ItemSword.java
View file

@ -3,11 +3,11 @@ package common.item;
import java.util.Map;
import java.util.Set;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.block.Block;
import common.collect.Sets;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.init.Blocks;

6
common/src/common/item/ItemTool.java
View file

@ -3,11 +3,11 @@ package common.item;
import java.util.Map;
import java.util.Set;
import common.attributes.Attribute;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.block.Block;
import common.collect.Sets;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.init.ToolMaterial;
import common.model.Transforms;

4
common/src/common/packet/S20PacketEntityProperties.java
View file

@ -4,9 +4,9 @@ import java.io.IOException;
import java.util.Collection;
import java.util.List;
import common.attributes.AttributeInstance;
import common.attributes.AttributeModifier;
import common.collect.Lists;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.AttributeModifier;
import common.network.IClientPlayer;
import common.network.Packet;
import common.network.PacketBuffer;

4
common/src/common/pathfinding/PathNavigate.java
View file

@ -2,9 +2,9 @@ package common.pathfinding;
import java.util.List;
import common.attributes.AttributeInstance;
import common.attributes.Attributes;
import common.entity.Entity;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.Attributes;
import common.entity.types.EntityLiving;
import common.util.BlockPos;
import common.util.BoundingBox;

10
common/src/common/potion/Potion.java
View file

@ -3,13 +3,13 @@ package common.potion;
import java.util.Map;
import java.util.Map.Entry;
import common.attributes.Attribute;
import common.attributes.AttributeInstance;
import common.attributes.AttributeMap;
import common.attributes.AttributeModifier;
import common.attributes.Attributes;
import common.collect.Maps;
import common.entity.DamageSource;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.AttributeMap;
import common.entity.attributes.AttributeModifier;
import common.entity.attributes.Attributes;
import common.entity.projectile.EntityPotion;
import common.entity.types.EntityLiving;
import common.init.Config;

2
common/src/common/entity/attributes/LowerStringMap.java → common/src/common/util/LowerStringMap.java
View file

@ -1,4 +1,4 @@
package common.entity.attributes;
package common.util;
import java.util.Collection;
import java.util.Map;