update to 1.20.6

TeamLapen · May 2, 2024 · 1db6ec6 · 1db6ec6
1 parent f5f2d12
commit 1db6ec6
Show file tree

Hide file tree

Showing 408 changed files with 835 additions and 1,601 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'net.neoforged.gradle.userdev' version '7.+'
-    id "net.neoforged.gradle.mixin" version "7.+"
+    id 'net.neoforged.gradle.userdev' version '7.0.+'
+    id "net.neoforged.gradle.mixin" version "7.0.+"
     id 'com.matthewprenger.cursegradle' version '1.4.0'
     id "com.modrinth.minotaur" version "2.4.5"
     id 'de.undercouch.download' version '3.3.0'

diff --git a/gradle.properties b/gradle.properties
@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.debug=false
 
 # forge
-minecraft_version=1.20.5
-minecraft_version_range=[1.20.5,1.21)
-forge_version=20.5.15-beta
-forge_version_range=[20.5.15-beta,)
+minecraft_version=1.20.6
+minecraft_version_range=[1.20.6,1.21)
+forge_version=20.6.16-beta
+forge_version_range=[20.6.16-beta,)
 loader_version_range=[1,)
 parchment_minecraft_version=1.20.4
 parchment_mappings_version=2024.04.14
@@ -45,7 +45,7 @@ include_guideapi=false
 guideapi_version=1.20.1-2.2.6
 
 #terrablender setting
-include_terrablender=true
+include_terrablender=false
 terrablender_version=1.20.4-3.3.0.12
 
 #jade

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/api/java/de/teamlapen/vampirism/api/VReference.java b/src/api/java/de/teamlapen/vampirism/api/VReference.java
@@ -4,7 +4,6 @@
 import de.teamlapen.vampirism.api.entity.player.hunter.IHunterPlayer;
 import de.teamlapen.vampirism.api.entity.player.vampire.IVampirePlayer;
 import de.teamlapen.vampirism.api.entity.player.vampire.IVampireVision;
-import de.teamlapen.vampirism.api.items.IVampirismCrossbow;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.MobCategory;

diff --git a/src/api/java/de/teamlapen/vampirism/api/VampirismDataComponents.java b/src/api/java/de/teamlapen/vampirism/api/VampirismDataComponents.java
@@ -29,5 +29,7 @@ public static class Keys {
         public static final ResourceLocation VAMPIRE_SWORD = new ResourceLocation(VReference.MODID, "vampire_sword");
         public static final ResourceLocation TRAINING_CACHE = new ResourceLocation(VReference.MODID, "training_cache");
         public static final ResourceLocation SELECTED_AMMUNITION = new ResourceLocation(VReference.MODID, "selected_ammunition");
+        public static final ResourceLocation BLOOD_CHARGED = new ResourceLocation(VReference.MODID, "blood_charged");
+        public static final ResourceLocation BOTTLE_BLOOD = new ResourceLocation(VReference.MODID, "bottle_blood");
     }
 }
diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/convertible/Converter.java b/src/api/java/de/teamlapen/vampirism/api/entity/convertible/Converter.java
@@ -4,7 +4,6 @@
 import com.mojang.serialization.MapCodec;
 import de.teamlapen.vampirism.api.VampirismRegistries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.ExtraCodecs;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/effect/EffectInstanceWithSource.java b/src/api/java/de/teamlapen/vampirism/api/entity/effect/EffectInstanceWithSource.java
@@ -2,7 +2,6 @@
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffectInstance;
-import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
 /**

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/factions/IFactionEntity.java b/src/api/java/de/teamlapen/vampirism/api/entity/factions/IFactionEntity.java
@@ -1,9 +1,7 @@
 package de.teamlapen.vampirism.api.entity.factions;
 
 import de.teamlapen.vampirism.api.extensions.IEntity;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/factions/IFactionRegistry.java b/src/api/java/de/teamlapen/vampirism/api/entity/factions/IFactionRegistry.java
@@ -9,7 +9,6 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.neoforged.neoforge.attachment.AttachmentType;
-import net.neoforged.neoforge.common.util.NonNullSupplier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/factions/ILordPlayerBuilder.java b/src/api/java/de/teamlapen/vampirism/api/entity/factions/ILordPlayerBuilder.java
@@ -3,7 +3,6 @@
 import de.teamlapen.vampirism.api.entity.minion.IMinionData;
 import de.teamlapen.vampirism.api.entity.player.IFactionPlayer;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/factions/IPlayableFaction.java b/src/api/java/de/teamlapen/vampirism/api/entity/factions/IPlayableFaction.java
@@ -6,7 +6,6 @@
 import de.teamlapen.vampirism.api.entity.player.IFactionPlayer;
 import de.teamlapen.vampirism.api.items.IRefinementItem;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.entity.player.Player;

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/hunter/IVampirismCrossbowUser.java b/src/api/java/de/teamlapen/vampirism/api/entity/hunter/IVampirismCrossbowUser.java
@@ -24,18 +24,6 @@ default boolean canUseCrossbow(ItemStack stack){
         return true;
     }
 
-    @Override
-    default void performCrossbowAttack(@Nonnull LivingEntity entity, float speed) {
-        InteractionHand hand = ProjectileUtil.getWeaponHoldingHand(entity, IVampirismCrossbow.class::isInstance);
-        ItemStack itemstack = entity.getItemInHand(hand);
-        if (itemstack.getItem() instanceof IVampirismCrossbow) {
-            if (CrossbowItem.isCharged(itemstack)){
-                ((IVampirismCrossbow) itemstack.getItem()).performShootingMod(entity.level(), entity, hand, itemstack, speed, (float) (14 - entity.level().getDifficulty().getId() * 4));
-                this.onCrossbowAttackPerformed();
-            }
-        }
-    }
-
     enum ArmPose {
         NEUTRAL, CROSSBOW_HOLD, CROSSBOW_CHARGE
     }

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/IFactionPlayer.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/IFactionPlayer.java
@@ -10,7 +10,6 @@
 import de.teamlapen.vampirism.api.extensions.IPlayer;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/ILordPlayer.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/ILordPlayer.java
@@ -2,7 +2,6 @@
 
 import de.teamlapen.vampirism.api.entity.factions.IPlayableFaction;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/skills/ISkillManager.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/skills/ISkillManager.java
@@ -22,11 +22,6 @@ public interface ISkillManager {
      */
     <T extends IFactionPlayer<T>> List<ISkill<T>> getSkillsForFaction(IPlayableFaction<T> faction);
 
-    /**
-     * Get all available {@link de.teamlapen.vampirism.api.entity.player.skills.ISkillType}s that are registered
-     */
-    Collection<ISkillType> getSkillTypes();
-
     /**
      * Get a skill type registered to the given id
      *

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/skills/ISkillType.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/skills/ISkillType.java
@@ -9,8 +9,6 @@
 
 public interface ISkillType {
 
-    Codec<ISkillType> CODEC = ResourceLocation.CODEC.xmap(s -> VampirismAPI.skillManager().getSkillType(s), ISkillType::getRegistryName);
-
     /**
      * Creates an id for this skill type depending on the faction id.
      * <br>

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/skills/SkillType.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/skills/SkillType.java
diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/task/ITaskInstance.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/task/ITaskInstance.java
@@ -1,7 +1,6 @@
 package de.teamlapen.vampirism.api.entity.player.task;
 
 import net.minecraft.core.Registry;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/task/ITaskRewardInstance.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/task/ITaskRewardInstance.java
@@ -4,7 +4,6 @@
 import com.mojang.serialization.MapCodec;
 import de.teamlapen.vampirism.api.VampirismRegistries;
 import de.teamlapen.vampirism.api.entity.player.IFactionPlayer;
-import net.minecraft.util.ExtraCodecs;
 
 import java.util.function.Function;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/task/TaskRequirement.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/task/TaskRequirement.java
@@ -8,7 +8,6 @@
 import de.teamlapen.vampirism.api.entity.player.IFactionPlayer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.ExtraCodecs;
 import net.minecraft.util.StringRepresentable;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/task/TaskReward.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/task/TaskReward.java
@@ -5,7 +5,6 @@
 import de.teamlapen.vampirism.api.VampirismRegistries;
 import de.teamlapen.vampirism.api.entity.player.IFactionPlayer;
 import net.minecraft.network.chat.Component;
-import net.minecraft.util.ExtraCodecs;
 
 import java.util.function.Function;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/task/TaskUnlocker.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/task/TaskUnlocker.java
@@ -5,7 +5,6 @@
 import de.teamlapen.vampirism.api.VampirismRegistries;
 import de.teamlapen.vampirism.api.entity.player.IFactionPlayer;
 import net.minecraft.network.chat.Component;
-import net.minecraft.util.ExtraCodecs;
 
 import java.util.function.Function;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/items/ExtendedPotionMix.java b/src/api/java/de/teamlapen/vampirism/api/items/ExtendedPotionMix.java
@@ -5,9 +5,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.alchemy.Potion;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.neoforged.neoforge.common.util.Lazy;
-import net.neoforged.neoforge.common.util.NonNullLazy;
-import net.neoforged.neoforge.common.util.NonNullSupplier;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Supplier;

diff --git a/src/api/java/de/teamlapen/vampirism/api/items/IExtendedBrewingRecipeRegistry.java b/src/api/java/de/teamlapen/vampirism/api/items/IExtendedBrewingRecipeRegistry.java
@@ -4,7 +4,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.alchemy.PotionBrewing;
 import net.minecraft.world.level.Level;
-import net.neoforged.neoforge.common.brewing.BrewingRecipeRegistry;
 import org.apache.commons.lang3.tuple.Triple;
 
 import java.util.List;

diff --git a/src/api/java/de/teamlapen/vampirism/api/items/IFactionExclusiveItem.java b/src/api/java/de/teamlapen/vampirism/api/items/IFactionExclusiveItem.java
@@ -2,21 +2,15 @@
 
 import de.teamlapen.vampirism.api.VampirismAPI;
 import de.teamlapen.vampirism.api.VampirismDataComponents;
-import de.teamlapen.vampirism.api.VampirismRegistries;
 import de.teamlapen.vampirism.api.components.IAppliedOilContent;
 import de.teamlapen.vampirism.api.entity.factions.IFaction;
-import de.teamlapen.vampirism.api.items.oil.IApplicableOil;
-import de.teamlapen.vampirism.api.items.oil.IOil;
 import net.minecraft.ChatFormatting;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/items/IFactionLevelItem.java b/src/api/java/de/teamlapen/vampirism/api/items/IFactionLevelItem.java
@@ -12,7 +12,6 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/src/api/java/de/teamlapen/vampirism/api/items/IVampirismCrossbow.java b/src/api/java/de/teamlapen/vampirism/api/items/IVampirismCrossbow.java
@@ -1,6 +1,5 @@
 package de.teamlapen.vampirism.api.items;
 
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.Item;
@@ -17,13 +16,6 @@
  */
 public interface IVampirismCrossbow extends ItemLike {
 
-    /**
-     * modded variant of {@link net.minecraft.world.item.CrossbowItem#performShooting(net.minecraft.world.level.Level, net.minecraft.world.entity.LivingEntity, net.minecraft.world.InteractionHand, net.minecraft.world.item.ItemStack, float, float)} that is not static
-     *
-     * @return true if the crossbow is empty
-     */
-    boolean performShootingMod(Level level, LivingEntity shooter, InteractionHand hand, ItemStack stack, float speed, float angle);
-
     /**
      * gets the required charge duration for the given crossbow
      *

diff --git a/src/api/java/de/teamlapen/vampirism/api/items/IWeaponTableRecipe.java b/src/api/java/de/teamlapen/vampirism/api/items/IWeaponTableRecipe.java
@@ -4,7 +4,6 @@
 import de.teamlapen.vampirism.api.entity.player.skills.ISkill;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.NonNullList;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;

diff --git a/src/api/java/de/teamlapen/vampirism/api/items/oil/IOil.java b/src/api/java/de/teamlapen/vampirism/api/items/oil/IOil.java
@@ -5,7 +5,6 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;

diff --git a/src/api/java/de/teamlapen/vampirism/api/util/ItemOrdering.java b/src/api/java/de/teamlapen/vampirism/api/util/ItemOrdering.java
@@ -1,8 +1,6 @@
 package de.teamlapen.vampirism.api.util;
 
 import com.google.common.base.Preconditions;
-import com.google.errorprone.annotations.Immutable;
-import org.spongepowered.asm.mixin.Mutable;
 
 import java.util.ArrayList;
 import java.util.Collection;
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,8 +9,6 @@ @@
     public interface ISkillType {
-        Codec<ISkillType> CODEC = ResourceLocation.CODEC.xmap(s -> VampirismAPI.skillManager().getSkillType(s), ISkillType::getRegistryName);
         /**
          * Creates an id for this skill type depending on the faction id.
          * <br>
@@ Expand Down @@