From 43800ad70547334e11f622df21df6815cb7c8de3 Mon Sep 17 00:00:00 2001 From: cheaterpaul Date: Fri, 12 Jul 2024 19:48:19 +0200 Subject: [PATCH] update to neoforge 21.0.86 --- gradle.properties | 4 ++-- .../vampirism/config/VampirismConfig.java | 2 +- .../vampirism/entity/minion/MinionEntity.java | 19 ++++++++----------- .../entity/player/vampire/VampirePlayer.java | 5 ++--- .../de/teamlapen/vampirism/sit/SitEntity.java | 4 ++-- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index d38e9f267..79ee5ca34 100755 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,8 @@ org.gradle.debug=false # forge minecraft_version=1.21 minecraft_version_range=[1.21,1.22) -forge_version=21.0.76-beta -forge_version_range=[21.0.76-beta,) +forge_version=21.0.86-beta +forge_version_range=[21.0.86-beta,) loader_version_range=[1,) parchment_minecraft_version=1.20.6 parchment_mappings_version=2024.05.01 diff --git a/src/main/java/de/teamlapen/vampirism/config/VampirismConfig.java b/src/main/java/de/teamlapen/vampirism/config/VampirismConfig.java index 3d66f5a00..0cbe9d2e4 100644 --- a/src/main/java/de/teamlapen/vampirism/config/VampirismConfig.java +++ b/src/main/java/de/teamlapen/vampirism/config/VampirismConfig.java @@ -60,7 +60,7 @@ public class VampirismConfig { BALANCE = new BalanceConfig(balanceBuilder); } - public static boolean isClientConfigSpec(IConfigSpec specs) { + public static boolean isClientConfigSpec(IConfigSpec specs) { return specs == clientSpec; } diff --git a/src/main/java/de/teamlapen/vampirism/entity/minion/MinionEntity.java b/src/main/java/de/teamlapen/vampirism/entity/minion/MinionEntity.java index 1b3b83958..7962ed97e 100644 --- a/src/main/java/de/teamlapen/vampirism/entity/minion/MinionEntity.java +++ b/src/main/java/de/teamlapen/vampirism/entity/minion/MinionEntity.java @@ -3,7 +3,6 @@ import com.mojang.authlib.GameProfile; import de.teamlapen.lib.HelperLib; import de.teamlapen.lib.lib.storage.ISyncable; -import de.teamlapen.vampirism.REFERENCE; import de.teamlapen.vampirism.VampirismMod; import de.teamlapen.vampirism.api.entity.minion.IMinionEntity; import de.teamlapen.vampirism.api.entity.minion.IMinionInventory; @@ -23,13 +22,11 @@ import de.teamlapen.vampirism.entity.minion.management.MinionTasks; import de.teamlapen.vampirism.entity.minion.management.PlayerMinionController; import de.teamlapen.vampirism.inventory.MinionContainer; -import de.teamlapen.vampirism.util.DamageHandler; import de.teamlapen.vampirism.util.IPlayerOverlay; import de.teamlapen.vampirism.util.Permissions; import de.teamlapen.vampirism.util.PlayerModelType; import de.teamlapen.vampirism.world.LevelDamage; import de.teamlapen.vampirism.world.MinionWorldData; -import de.teamlapen.vampirism.world.ModDamageSources; import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; @@ -211,9 +208,9 @@ public boolean doHurtTarget(Entity pEntity) { float f1 = this.getKnockback(pEntity, damagesource); if (f1 > 0.0F && pEntity instanceof LivingEntity livingentity) { livingentity.knockback( - (double)(f1 * 0.5F), - (double)Mth.sin(this.getYRot() * (float) (Math.PI / 180.0)), - (double)(-Mth.cos(this.getYRot() * (float) (Math.PI / 180.0))) + f1 * 0.5F, + Mth.sin(this.getYRot() * (float) (Math.PI / 180.0)), + -Mth.cos(this.getYRot() * (float) (Math.PI / 180.0)) ); this.setDeltaMovement(this.getDeltaMovement().multiply(0.6, 1.0, 0.6)); } @@ -360,20 +357,20 @@ public void markAsConverted() { } @Override - public void onAddedToWorld() { - super.onAddedToWorld(); + public void onAddedToLevel() { + super.onAddedToLevel(); checkoutMinionData(this.level().registryAccess()); } @Override - public void onRemovedFromWorld() { + public void onRemovedFromLevel() { if (playerMinionController != null) { playerMinionController.checkInMinion(this.minionId, this.token); this.minionData.updateEntityCaps(this.serializeMinionCaps(this.level().registryAccess())); this.minionData = null; this.playerMinionController = null; } - super.onRemovedFromWorld(); + super.onRemovedFromLevel(); } @NotNull @@ -586,7 +583,7 @@ public boolean canUse() { * Checkout the minion data from the playerMinionController (if available). * Call as early as possible but only if being added to world * Can be called from different locations. Only executes if not checkout already. - * Happens either in {@link net.minecraft.world.entity.Entity#onAddedToWorld()} or if tracking starts before during {@link MinionEntity#serializeUpdateNBT(net.minecraft.core.HolderLookup.Provider)} + * Happens either in {@link net.minecraft.world.entity.Entity#onAddedToLevel()} or if tracking starts before during {@link MinionEntity#serializeUpdateNBT(net.minecraft.core.HolderLookup.Provider)} */ private void checkoutMinionData(HolderLookup.Provider provider) { if (playerMinionController != null && minionData == null) { diff --git a/src/main/java/de/teamlapen/vampirism/entity/player/vampire/VampirePlayer.java b/src/main/java/de/teamlapen/vampirism/entity/player/vampire/VampirePlayer.java index 18fd6f369..b9333524c 100644 --- a/src/main/java/de/teamlapen/vampirism/entity/player/vampire/VampirePlayer.java +++ b/src/main/java/de/teamlapen/vampirism/entity/player/vampire/VampirePlayer.java @@ -41,7 +41,6 @@ import de.teamlapen.vampirism.entity.vampire.DrinkBloodContext; import de.teamlapen.vampirism.fluids.BloodHelper; import de.teamlapen.vampirism.items.HunterArmorItem; -import de.teamlapen.vampirism.mixin.accessor.ArmorItemAccessor; import de.teamlapen.vampirism.mixin.accessor.AttributeInstanceAccessor; import de.teamlapen.vampirism.modcompat.PlayerReviveHelper; import de.teamlapen.vampirism.network.ServerboundSimpleInputEvent; @@ -1477,7 +1476,7 @@ public void activate(@Nullable IVampireVision vision) { if (vision.isEnabled()) { this.vision = vision; this.vision.onActivated(VampirePlayer.this); - } else if (VampirePlayer.this.player.isAddedToWorld()) { + } else if (VampirePlayer.this.player.isAddedToLevel()) { VampirePlayer.this.player.displayClientMessage(Component.translatable("text.vampirism.vision_disabled_by_config"),true); } this.visionId = VampirismAPI.vampireVisionRegistry().getVisionId(vision); @@ -1486,7 +1485,7 @@ public void activate(@Nullable IVampireVision vision) { this.visionId = null; } - if (!isRemote() && player.isAddedToWorld()) { + if (!isRemote() && player.isAddedToLevel()) { CompoundTag tag = new CompoundTag(); tag.put(KEY_VISION, serializeUpdateNBT(VampirePlayer.this.asEntity().registryAccess())); VampirePlayer.this.sync(tag, false); diff --git a/src/main/java/de/teamlapen/vampirism/sit/SitEntity.java b/src/main/java/de/teamlapen/vampirism/sit/SitEntity.java index e822627bb..c85fcf8b5 100644 --- a/src/main/java/de/teamlapen/vampirism/sit/SitEntity.java +++ b/src/main/java/de/teamlapen/vampirism/sit/SitEntity.java @@ -61,8 +61,8 @@ public SitEntity(@NotNull EntityType type, @NotNull Level level) { } @Override - public void onAddedToWorld() { - super.onAddedToWorld(); + public void onAddedToLevel() { + super.onAddedToLevel(); SitUtil.addSitEntity(level(), blockPosition(), this); }