From 66e9f68eeecf11cbb3575862e000de5fd56ebe3d Mon Sep 17 00:00:00 2001 From: Sen Date: Tue, 13 May 2025 14:39:09 +0200 Subject: [PATCH] move attributes --- client/src/client/network/ClientPlayer.java | 8 ++++---- common/src/common/ai/EntityAIFindEntityNearest.java | 4 ++-- common/src/common/ai/EntityAITarget.java | 4 ++-- common/src/common/ai/EntityMoveHelper.java | 2 +- .../src/common/{entity => }/attributes/Attribute.java | 2 +- .../{entity => }/attributes/AttributeInstance.java | 2 +- .../common/{entity => }/attributes/AttributeMap.java | 3 ++- .../{entity => }/attributes/AttributeModifier.java | 2 +- .../src/common/{entity => }/attributes/Attributes.java | 2 +- common/src/common/entity/EntityTrackerEntry.java | 4 ++-- common/src/common/entity/animal/EntityChicken.java | 2 +- common/src/common/entity/animal/EntityCow.java | 2 +- common/src/common/entity/animal/EntityHorse.java | 4 ++-- common/src/common/entity/animal/EntityMouse.java | 4 ++-- common/src/common/entity/animal/EntityOcelot.java | 2 +- common/src/common/entity/animal/EntityPig.java | 2 +- common/src/common/entity/animal/EntityRabbit.java | 2 +- common/src/common/entity/animal/EntitySheep.java | 2 +- common/src/common/entity/animal/EntityWolf.java | 2 +- common/src/common/entity/npc/EntityChaosMarine.java | 2 +- common/src/common/entity/npc/EntityFlyingNPC.java | 2 +- common/src/common/entity/npc/EntityGargoyle.java | 2 +- common/src/common/entity/npc/EntityGoblin.java | 2 +- common/src/common/entity/npc/EntityHaunter.java | 2 +- common/src/common/entity/npc/EntityHoveringNPC.java | 2 +- common/src/common/entity/npc/EntityMage.java | 4 ++-- common/src/common/entity/npc/EntityMobNPC.java | 4 ++-- common/src/common/entity/npc/EntityNPC.java | 4 ++-- common/src/common/entity/npc/EntityOrc.java | 2 +- common/src/common/entity/npc/EntityPrimarch.java | 2 +- common/src/common/entity/npc/EntitySlime.java | 2 +- common/src/common/entity/npc/EntitySpaceMarine.java | 2 +- common/src/common/entity/npc/EntityTiefling.java | 2 +- common/src/common/entity/npc/EntityUndead.java | 2 +- common/src/common/entity/npc/EntityVampire.java | 2 +- common/src/common/entity/npc/EntityZombie.java | 4 ++-- common/src/common/entity/types/EntityLiving.java | 10 +++++----- common/src/common/inventory/ContainerPlayer.java | 2 +- common/src/common/item/Item.java | 4 ++-- common/src/common/item/ItemArmor.java | 6 +++--- common/src/common/item/ItemBucketMilk.java | 6 +++--- common/src/common/item/ItemMetal.java | 6 +++--- common/src/common/item/ItemMetalBlock.java | 6 +++--- common/src/common/item/ItemPotion.java | 4 ++-- common/src/common/item/ItemStack.java | 6 +++--- common/src/common/item/ItemSword.java | 6 +++--- common/src/common/item/ItemTool.java | 6 +++--- .../src/common/packet/S20PacketEntityProperties.java | 4 ++-- common/src/common/pathfinding/PathNavigate.java | 4 ++-- common/src/common/potion/Potion.java | 10 +++++----- .../{entity/attributes => util}/LowerStringMap.java | 2 +- 51 files changed, 90 insertions(+), 89 deletions(-) rename common/src/common/{entity => }/attributes/Attribute.java (98%) rename common/src/common/{entity => }/attributes/AttributeInstance.java (99%) rename common/src/common/{entity => }/attributes/AttributeMap.java (98%) rename common/src/common/{entity => }/attributes/AttributeModifier.java (99%) rename common/src/common/{entity => }/attributes/Attributes.java (99%) rename common/src/common/{entity/attributes => util}/LowerStringMap.java (98%) diff --git a/client/src/client/network/ClientPlayer.java b/client/src/client/network/ClientPlayer.java index e8d1e1f..217ff52 100755 --- a/client/src/client/network/ClientPlayer.java +++ b/client/src/client/network/ClientPlayer.java @@ -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; diff --git a/common/src/common/ai/EntityAIFindEntityNearest.java b/common/src/common/ai/EntityAIFindEntityNearest.java index ee34588..87eb994 100755 --- a/common/src/common/ai/EntityAIFindEntityNearest.java +++ b/common/src/common/ai/EntityAIFindEntityNearest.java @@ -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 diff --git a/common/src/common/ai/EntityAITarget.java b/common/src/common/ai/EntityAITarget.java index 2c6b33b..58d7769 100755 --- a/common/src/common/ai/EntityAITarget.java +++ b/common/src/common/ai/EntityAITarget.java @@ -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; diff --git a/common/src/common/ai/EntityMoveHelper.java b/common/src/common/ai/EntityMoveHelper.java index 1528c0e..74f4f40 100755 --- a/common/src/common/ai/EntityMoveHelper.java +++ b/common/src/common/ai/EntityMoveHelper.java @@ -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; diff --git a/common/src/common/entity/attributes/Attribute.java b/common/src/common/attributes/Attribute.java similarity index 98% rename from common/src/common/entity/attributes/Attribute.java rename to common/src/common/attributes/Attribute.java index 3e56630..ed6c7e9 100755 --- a/common/src/common/entity/attributes/Attribute.java +++ b/common/src/common/attributes/Attribute.java @@ -1,4 +1,4 @@ -package common.entity.attributes; +package common.attributes; import java.util.Map; diff --git a/common/src/common/entity/attributes/AttributeInstance.java b/common/src/common/attributes/AttributeInstance.java similarity index 99% rename from common/src/common/entity/attributes/AttributeInstance.java rename to common/src/common/attributes/AttributeInstance.java index 7204633..299161b 100755 --- a/common/src/common/entity/attributes/AttributeInstance.java +++ b/common/src/common/attributes/AttributeInstance.java @@ -1,4 +1,4 @@ -package common.entity.attributes; +package common.attributes; import java.util.Collection; import java.util.Map; diff --git a/common/src/common/entity/attributes/AttributeMap.java b/common/src/common/attributes/AttributeMap.java similarity index 98% rename from common/src/common/entity/attributes/AttributeMap.java rename to common/src/common/attributes/AttributeMap.java index a19fcba..c859fd3 100755 --- a/common/src/common/entity/attributes/AttributeMap.java +++ b/common/src/common/attributes/AttributeMap.java @@ -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; diff --git a/common/src/common/entity/attributes/AttributeModifier.java b/common/src/common/attributes/AttributeModifier.java similarity index 99% rename from common/src/common/entity/attributes/AttributeModifier.java rename to common/src/common/attributes/AttributeModifier.java index 9081bd1..ba4d937 100755 --- a/common/src/common/entity/attributes/AttributeModifier.java +++ b/common/src/common/attributes/AttributeModifier.java @@ -1,4 +1,4 @@ -package common.entity.attributes; +package common.attributes; import common.rng.Random; diff --git a/common/src/common/entity/attributes/Attributes.java b/common/src/common/attributes/Attributes.java similarity index 99% rename from common/src/common/entity/attributes/Attributes.java rename to common/src/common/attributes/Attributes.java index c23c629..6a1ccc6 100755 --- a/common/src/common/entity/attributes/Attributes.java +++ b/common/src/common/attributes/Attributes.java @@ -1,4 +1,4 @@ -package common.entity.attributes; +package common.attributes; import java.util.Collection; diff --git a/common/src/common/entity/EntityTrackerEntry.java b/common/src/common/entity/EntityTrackerEntry.java index f70867f..9b3a96f 100755 --- a/common/src/common/entity/EntityTrackerEntry.java +++ b/common/src/common/entity/EntityTrackerEntry.java @@ -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; diff --git a/common/src/common/entity/animal/EntityChicken.java b/common/src/common/entity/animal/EntityChicken.java index c809c9f..aaec6ab 100755 --- a/common/src/common/entity/animal/EntityChicken.java +++ b/common/src/common/entity/animal/EntityChicken.java @@ -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; diff --git a/common/src/common/entity/animal/EntityCow.java b/common/src/common/entity/animal/EntityCow.java index cadd0a3..4d3df31 100755 --- a/common/src/common/entity/animal/EntityCow.java +++ b/common/src/common/entity/animal/EntityCow.java @@ -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; diff --git a/common/src/common/entity/animal/EntityHorse.java b/common/src/common/entity/animal/EntityHorse.java index ed9d625..7352c24 100755 --- a/common/src/common/entity/animal/EntityHorse.java +++ b/common/src/common/entity/animal/EntityHorse.java @@ -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; diff --git a/common/src/common/entity/animal/EntityMouse.java b/common/src/common/entity/animal/EntityMouse.java index 8456057..e304a0f 100755 --- a/common/src/common/entity/animal/EntityMouse.java +++ b/common/src/common/entity/animal/EntityMouse.java @@ -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; diff --git a/common/src/common/entity/animal/EntityOcelot.java b/common/src/common/entity/animal/EntityOcelot.java index 78acf63..12d53c2 100755 --- a/common/src/common/entity/animal/EntityOcelot.java +++ b/common/src/common/entity/animal/EntityOcelot.java @@ -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; diff --git a/common/src/common/entity/animal/EntityPig.java b/common/src/common/entity/animal/EntityPig.java index b094e99..52e04b3 100755 --- a/common/src/common/entity/animal/EntityPig.java +++ b/common/src/common/entity/animal/EntityPig.java @@ -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; diff --git a/common/src/common/entity/animal/EntityRabbit.java b/common/src/common/entity/animal/EntityRabbit.java index a8f319a..93ce36f 100755 --- a/common/src/common/entity/animal/EntityRabbit.java +++ b/common/src/common/entity/animal/EntityRabbit.java @@ -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; diff --git a/common/src/common/entity/animal/EntitySheep.java b/common/src/common/entity/animal/EntitySheep.java index 2c2ab93..cf4ee54 100755 --- a/common/src/common/entity/animal/EntitySheep.java +++ b/common/src/common/entity/animal/EntitySheep.java @@ -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; diff --git a/common/src/common/entity/animal/EntityWolf.java b/common/src/common/entity/animal/EntityWolf.java index c99ffad..caa4b4a 100755 --- a/common/src/common/entity/animal/EntityWolf.java +++ b/common/src/common/entity/animal/EntityWolf.java @@ -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; diff --git a/common/src/common/entity/npc/EntityChaosMarine.java b/common/src/common/entity/npc/EntityChaosMarine.java index cccb1b3..13790fa 100755 --- a/common/src/common/entity/npc/EntityChaosMarine.java +++ b/common/src/common/entity/npc/EntityChaosMarine.java @@ -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; diff --git a/common/src/common/entity/npc/EntityFlyingNPC.java b/common/src/common/entity/npc/EntityFlyingNPC.java index 9827f40..c83c3ab 100755 --- a/common/src/common/entity/npc/EntityFlyingNPC.java +++ b/common/src/common/entity/npc/EntityFlyingNPC.java @@ -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; diff --git a/common/src/common/entity/npc/EntityGargoyle.java b/common/src/common/entity/npc/EntityGargoyle.java index 0f6b358..6b5e72a 100755 --- a/common/src/common/entity/npc/EntityGargoyle.java +++ b/common/src/common/entity/npc/EntityGargoyle.java @@ -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; diff --git a/common/src/common/entity/npc/EntityGoblin.java b/common/src/common/entity/npc/EntityGoblin.java index 3b0db10..b80ef9a 100755 --- a/common/src/common/entity/npc/EntityGoblin.java +++ b/common/src/common/entity/npc/EntityGoblin.java @@ -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; diff --git a/common/src/common/entity/npc/EntityHaunter.java b/common/src/common/entity/npc/EntityHaunter.java index 4f1e389..e076393 100755 --- a/common/src/common/entity/npc/EntityHaunter.java +++ b/common/src/common/entity/npc/EntityHaunter.java @@ -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; diff --git a/common/src/common/entity/npc/EntityHoveringNPC.java b/common/src/common/entity/npc/EntityHoveringNPC.java index d35b423..0d8390f 100755 --- a/common/src/common/entity/npc/EntityHoveringNPC.java +++ b/common/src/common/entity/npc/EntityHoveringNPC.java @@ -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; diff --git a/common/src/common/entity/npc/EntityMage.java b/common/src/common/entity/npc/EntityMage.java index 09c4134..4abe982 100755 --- a/common/src/common/entity/npc/EntityMage.java +++ b/common/src/common/entity/npc/EntityMage.java @@ -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; diff --git a/common/src/common/entity/npc/EntityMobNPC.java b/common/src/common/entity/npc/EntityMobNPC.java index e36c35f..4504a52 100755 --- a/common/src/common/entity/npc/EntityMobNPC.java +++ b/common/src/common/entity/npc/EntityMobNPC.java @@ -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; diff --git a/common/src/common/entity/npc/EntityNPC.java b/common/src/common/entity/npc/EntityNPC.java index f261a8b..cf4e573 100755 --- a/common/src/common/entity/npc/EntityNPC.java +++ b/common/src/common/entity/npc/EntityNPC.java @@ -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; diff --git a/common/src/common/entity/npc/EntityOrc.java b/common/src/common/entity/npc/EntityOrc.java index e6cc4c0..96cdb66 100755 --- a/common/src/common/entity/npc/EntityOrc.java +++ b/common/src/common/entity/npc/EntityOrc.java @@ -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; diff --git a/common/src/common/entity/npc/EntityPrimarch.java b/common/src/common/entity/npc/EntityPrimarch.java index b20a047..e4c29f8 100755 --- a/common/src/common/entity/npc/EntityPrimarch.java +++ b/common/src/common/entity/npc/EntityPrimarch.java @@ -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; diff --git a/common/src/common/entity/npc/EntitySlime.java b/common/src/common/entity/npc/EntitySlime.java index da31cab..ee08d9c 100755 --- a/common/src/common/entity/npc/EntitySlime.java +++ b/common/src/common/entity/npc/EntitySlime.java @@ -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; diff --git a/common/src/common/entity/npc/EntitySpaceMarine.java b/common/src/common/entity/npc/EntitySpaceMarine.java index 9bc645f..566360c 100755 --- a/common/src/common/entity/npc/EntitySpaceMarine.java +++ b/common/src/common/entity/npc/EntitySpaceMarine.java @@ -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; diff --git a/common/src/common/entity/npc/EntityTiefling.java b/common/src/common/entity/npc/EntityTiefling.java index 7a075df..f3134f1 100755 --- a/common/src/common/entity/npc/EntityTiefling.java +++ b/common/src/common/entity/npc/EntityTiefling.java @@ -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; diff --git a/common/src/common/entity/npc/EntityUndead.java b/common/src/common/entity/npc/EntityUndead.java index d35adeb..c87135b 100755 --- a/common/src/common/entity/npc/EntityUndead.java +++ b/common/src/common/entity/npc/EntityUndead.java @@ -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; diff --git a/common/src/common/entity/npc/EntityVampire.java b/common/src/common/entity/npc/EntityVampire.java index 374a691..0733ab9 100755 --- a/common/src/common/entity/npc/EntityVampire.java +++ b/common/src/common/entity/npc/EntityVampire.java @@ -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; diff --git a/common/src/common/entity/npc/EntityZombie.java b/common/src/common/entity/npc/EntityZombie.java index bdd5734..5d8b152 100755 --- a/common/src/common/entity/npc/EntityZombie.java +++ b/common/src/common/entity/npc/EntityZombie.java @@ -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; diff --git a/common/src/common/entity/types/EntityLiving.java b/common/src/common/entity/types/EntityLiving.java index c99cbb5..58347ac 100755 --- a/common/src/common/entity/types/EntityLiving.java +++ b/common/src/common/entity/types/EntityLiving.java @@ -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; diff --git a/common/src/common/inventory/ContainerPlayer.java b/common/src/common/inventory/ContainerPlayer.java index 2a1253d..1512068 100755 --- a/common/src/common/inventory/ContainerPlayer.java +++ b/common/src/common/inventory/ContainerPlayer.java @@ -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; diff --git a/common/src/common/item/Item.java b/common/src/common/item/Item.java index 9212ab5..f968ee9 100755 --- a/common/src/common/item/Item.java +++ b/common/src/common/item/Item.java @@ -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; diff --git a/common/src/common/item/ItemArmor.java b/common/src/common/item/ItemArmor.java index 0529e9a..4fc425c 100755 --- a/common/src/common/item/ItemArmor.java +++ b/common/src/common/item/ItemArmor.java @@ -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; diff --git a/common/src/common/item/ItemBucketMilk.java b/common/src/common/item/ItemBucketMilk.java index ada9fb5..7eaecfa 100755 --- a/common/src/common/item/ItemBucketMilk.java +++ b/common/src/common/item/ItemBucketMilk.java @@ -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; diff --git a/common/src/common/item/ItemMetal.java b/common/src/common/item/ItemMetal.java index 9d798b3..9962259 100755 --- a/common/src/common/item/ItemMetal.java +++ b/common/src/common/item/ItemMetal.java @@ -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; diff --git a/common/src/common/item/ItemMetalBlock.java b/common/src/common/item/ItemMetalBlock.java index 4a6a37e..c43e4f2 100755 --- a/common/src/common/item/ItemMetalBlock.java +++ b/common/src/common/item/ItemMetalBlock.java @@ -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; diff --git a/common/src/common/item/ItemPotion.java b/common/src/common/item/ItemPotion.java index 40aa95f..a254127 100755 --- a/common/src/common/item/ItemPotion.java +++ b/common/src/common/item/ItemPotion.java @@ -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; diff --git a/common/src/common/item/ItemStack.java b/common/src/common/item/ItemStack.java index a25e49c..0088c3c 100755 --- a/common/src/common/item/ItemStack.java +++ b/common/src/common/item/ItemStack.java @@ -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; diff --git a/common/src/common/item/ItemSword.java b/common/src/common/item/ItemSword.java index 9ae7bc8..0c616a2 100755 --- a/common/src/common/item/ItemSword.java +++ b/common/src/common/item/ItemSword.java @@ -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; diff --git a/common/src/common/item/ItemTool.java b/common/src/common/item/ItemTool.java index 4c58202..2970a58 100755 --- a/common/src/common/item/ItemTool.java +++ b/common/src/common/item/ItemTool.java @@ -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; diff --git a/common/src/common/packet/S20PacketEntityProperties.java b/common/src/common/packet/S20PacketEntityProperties.java index 0d0a1f0..f3ca49a 100755 --- a/common/src/common/packet/S20PacketEntityProperties.java +++ b/common/src/common/packet/S20PacketEntityProperties.java @@ -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; diff --git a/common/src/common/pathfinding/PathNavigate.java b/common/src/common/pathfinding/PathNavigate.java index ee406dd..0d8fb09 100755 --- a/common/src/common/pathfinding/PathNavigate.java +++ b/common/src/common/pathfinding/PathNavigate.java @@ -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; diff --git a/common/src/common/potion/Potion.java b/common/src/common/potion/Potion.java index cf03a29..c2eab2f 100755 --- a/common/src/common/potion/Potion.java +++ b/common/src/common/potion/Potion.java @@ -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; diff --git a/common/src/common/entity/attributes/LowerStringMap.java b/common/src/common/util/LowerStringMap.java similarity index 98% rename from common/src/common/entity/attributes/LowerStringMap.java rename to common/src/common/util/LowerStringMap.java index 091cc27..b445a3d 100755 --- a/common/src/common/entity/attributes/LowerStringMap.java +++ b/common/src/common/util/LowerStringMap.java @@ -1,4 +1,4 @@ -package common.entity.attributes; +package common.util; import java.util.Collection; import java.util.Map;