This commit is contained in:
Sollace 2023-08-07 16:42:51 +01:00
parent f6857e2452
commit c62fe7564a
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
8 changed files with 9 additions and 9 deletions

View file

@ -36,7 +36,7 @@ public class BubbleSpell extends AbstractSpell implements TimedSpell,
new EntityAttributeModifier(UUID.fromString("9dc7818b-927b-46e0-acbe-48d31a28128f"), "Bubble Floating", 0.01D - 1D, Operation.MULTIPLY_TOTAL); new EntityAttributeModifier(UUID.fromString("9dc7818b-927b-46e0-acbe-48d31a28128f"), "Bubble Floating", 0.01D - 1D, Operation.MULTIPLY_TOTAL);
private static final Map<EntityAttribute, EntityAttributeModifier> MODIFIERS = Map.of( private static final Map<EntityAttribute, EntityAttributeModifier> MODIFIERS = Map.of(
UEntityAttributes.ENTITY_GRAVTY_MODIFIER, GRAVITY_MODIFIER, UEntityAttributes.ENTITY_GRAVITY_MODIFIER, GRAVITY_MODIFIER,
UEntityAttributes.EXTENDED_REACH_DISTANCE, GRAVITY_MODIFIER, UEntityAttributes.EXTENDED_REACH_DISTANCE, GRAVITY_MODIFIER,
UEntityAttributes.EXTENDED_ATTACK_DISTANCE, GRAVITY_MODIFIER, UEntityAttributes.EXTENDED_ATTACK_DISTANCE, GRAVITY_MODIFIER,
EntityAttributes.GENERIC_MOVEMENT_SPEED, SPEED_MODIFIER, EntityAttributes.GENERIC_MOVEMENT_SPEED, SPEED_MODIFIER,

View file

@ -133,9 +133,9 @@ public class ModifierTooltipRenderer implements ItemTooltipCallback {
if (baseAdjusted) { if (baseAdjusted) {
lines.add(Text.literal(" ").append(getModifierLineBase("equals", displayValue, op, attribute, Formatting.DARK_GREEN))); lines.add(Text.literal(" ").append(getModifierLineBase("equals", displayValue, op, attribute, Formatting.DARK_GREEN)));
} else if (value > 0) { } else if (value > 0) {
lines.add(getModifierLineBase("plus", displayValue, op, attribute, attribute == UEntityAttributes.ENTITY_GRAVTY_MODIFIER ? Formatting.RED : Formatting.BLUE)); lines.add(getModifierLineBase("plus", displayValue, op, attribute, attribute == UEntityAttributes.ENTITY_GRAVITY_MODIFIER ? Formatting.RED : Formatting.BLUE));
} else if (value < 0) { } else if (value < 0) {
lines.add(getModifierLineBase("take", -displayValue, op, attribute, attribute == UEntityAttributes.ENTITY_GRAVTY_MODIFIER ? Formatting.BLUE : Formatting.RED)); lines.add(getModifierLineBase("take", -displayValue, op, attribute, attribute == UEntityAttributes.ENTITY_GRAVITY_MODIFIER ? Formatting.BLUE : Formatting.RED));
} }
} }

View file

@ -187,7 +187,7 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned.Mutabl
public static void registerAttributes(DefaultAttributeContainer.Builder builder) { public static void registerAttributes(DefaultAttributeContainer.Builder builder) {
builder.add(EntityAttributes.GENERIC_ATTACK_DAMAGE); builder.add(EntityAttributes.GENERIC_ATTACK_DAMAGE);
builder.add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK); builder.add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK);
builder.add(UEntityAttributes.ENTITY_GRAVTY_MODIFIER); builder.add(UEntityAttributes.ENTITY_GRAVITY_MODIFIER);
} }
@Override @Override

View file

@ -143,7 +143,7 @@ public class EntityPhysics<T extends Entity> implements Physics, Copyable<Entity
return 1; return 1;
} }
return getBaseGravityModifier() * (float)((LivingEntity)entity).getAttributeValue(UEntityAttributes.ENTITY_GRAVTY_MODIFIER); return getBaseGravityModifier() * (float)((LivingEntity)entity).getAttributeValue(UEntityAttributes.ENTITY_GRAVITY_MODIFIER);
} }
return getBaseGravityModifier(); return getBaseGravityModifier();

View file

@ -17,7 +17,7 @@ public interface UEntityAttributes {
EntityAttribute EXTENDED_REACH_DISTANCE = ReachEntityAttributes.REACH; EntityAttribute EXTENDED_REACH_DISTANCE = ReachEntityAttributes.REACH;
EntityAttribute EXTENDED_ATTACK_DISTANCE = ReachEntityAttributes.ATTACK_RANGE; EntityAttribute EXTENDED_ATTACK_DISTANCE = ReachEntityAttributes.ATTACK_RANGE;
EntityAttribute EXTRA_MINING_SPEED = register("earth.mining_speed", new ClampedEntityAttribute("player.miningSpeed", 1, 0, 5).setTracked(true)); EntityAttribute EXTRA_MINING_SPEED = register("earth.mining_speed", new ClampedEntityAttribute("player.miningSpeed", 1, 0, 5).setTracked(true));
EntityAttribute ENTITY_GRAVTY_MODIFIER = register("player.gravity", (new EntityAttribute("player.gravityModifier", 1) {}).setTracked(true)); EntityAttribute ENTITY_GRAVITY_MODIFIER = register("player.gravity", (new EntityAttribute("player.gravityModifier", 1) {}).setTracked(true));
private static EntityAttribute register(String name, EntityAttribute attribute) { private static EntityAttribute register(String name, EntityAttribute attribute) {
REGISTRY.add(attribute); REGISTRY.add(attribute);

View file

@ -198,7 +198,7 @@ public class EntityAppearance implements NbtSerialisable, PlayerDimensions.Provi
} }
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
((LivingEntity) entity).getAttributeInstance(UEntityAttributes.ENTITY_GRAVTY_MODIFIER).clearModifiers(); ((LivingEntity) entity).getAttributeInstance(UEntityAttributes.ENTITY_GRAVITY_MODIFIER).clearModifiers();
} }
if (source.isClient()) { if (source.isClient()) {

View file

@ -128,7 +128,7 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
public static void registerAttributes(DefaultAttributeContainer.Builder builder) { public static void registerAttributes(DefaultAttributeContainer.Builder builder) {
builder.add(UEntityAttributes.EXTRA_MINING_SPEED); builder.add(UEntityAttributes.EXTRA_MINING_SPEED);
builder.add(UEntityAttributes.ENTITY_GRAVTY_MODIFIER); builder.add(UEntityAttributes.ENTITY_GRAVITY_MODIFIER);
} }
@Deprecated @Deprecated

View file

@ -51,7 +51,7 @@ public interface UEnchantments {
* Alters gravity * Alters gravity
*/ */
Enchantment REPULSION = register("repulsion", new AttributedEnchantment(Options.create(EnchantmentTarget.ARMOR_FEET, EquipmentSlot.FEET).rarity(Rarity.VERY_RARE).maxLevel(3))) Enchantment REPULSION = register("repulsion", new AttributedEnchantment(Options.create(EnchantmentTarget.ARMOR_FEET, EquipmentSlot.FEET).rarity(Rarity.VERY_RARE).maxLevel(3)))
.addModifier(UEntityAttributes.ENTITY_GRAVTY_MODIFIER, (user, level) -> { .addModifier(UEntityAttributes.ENTITY_GRAVITY_MODIFIER, (user, level) -> {
return new EntityAttributeModifier(UUID.fromString("1734bbd6-1916-4124-b710-5450ea70fbdb"), "Anti Grav", (0.5F - (0.375 * (level - 1))) - 1, Operation.MULTIPLY_TOTAL); return new EntityAttributeModifier(UUID.fromString("1734bbd6-1916-4124-b710-5450ea70fbdb"), "Anti Grav", (0.5F - (0.375 * (level - 1))) - 1, Operation.MULTIPLY_TOTAL);
}); });