Fixed Port to 1.21

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Cache Gradle packages
         uses: actions/cache@v3

Forge/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
     id 'org.spongepowered.mixin' version '0.7.+'
 }
 
@@ -34,7 +34,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(java_version)
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
     mappings channel: mapping_channel, version: mapping_version
-
+    reobf = false
     copyIdeResources = true
 
     runs {
@@ -80,6 +80,7 @@ dependencies {
     //runtimeOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}")
     runtimeOnly "curse.maven:geckolib-388172:${geckolib_file}"
     compileOnly "curse.maven:geckolib-388172:${geckolib_file}"
+    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }
 
 tasks.named('processResources', ProcessResources).configure {

Forge/src/main/java/software/bluelib/event/ReloadEventHandler.java

@@ -65,8 +65,8 @@ public class ReloadEventHandler {
      * @since 1.0.0
      */
     protected static void registerEntityVariants(MinecraftServer pServer, String pEntityName, String pModID, String pModPathLocation, String pDataPathLocation) {
-        ResourceLocation modLocation = new ResourceLocation(pModID, pModPathLocation);
-        ResourceLocation dataLocation = new ResourceLocation(pModID, pDataPathLocation);
+        ResourceLocation modLocation = ResourceLocation.fromNamespaceAndPath(pModID, pModPathLocation);
+        ResourceLocation dataLocation = ResourceLocation.fromNamespaceAndPath(pModID, pDataPathLocation);
         try {
             VariantLoader.loadVariants(modLocation, dataLocation, pServer, pEntityName);
         } catch (JsonParseException pException) {

Forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java

@@ -11,13 +11,14 @@
 import net.minecraft.world.entity.*;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ServerLevelAccessor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import software.bernie.geckolib.animatable.GeoEntity;
-import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache;
-import software.bernie.geckolib.core.animation.AnimatableManager;
+import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache;
+import software.bernie.geckolib.animation.AnimatableManager;
 import software.bernie.geckolib.util.GeckoLibUtil;
 import software.bluelib.interfaces.variant.IVariantEntity;
 import software.bluelib.utils.ParameterUtils;
@@ -33,10 +34,10 @@
  * <p>
  * Key Methods:
  * <ul>
- *   <li>{@link #defineSynchedData()} - Defines the synchronized data for the dragon entity, including its variant.</li>
+ *   <li>{@link #defineSynchedData(SynchedEntityData.Builder)} - Defines the synchronized data for the dragon entity, including its variant.</li>
  *   <li>{@link #addAdditionalSaveData(CompoundTag)} - Adds custom data to the entity's NBT for saving.</li>
  *   <li>{@link #readAdditionalSaveData(CompoundTag)} - Reads custom data from the entity's NBT for loading.</li>
- *   <li>{@link #finalizeSpawn(ServerLevelAccessor, DifficultyInstance, MobSpawnType, SpawnGroupData, CompoundTag)} - Finalizes the spawning process and sets up parameters.</li>
+ *   <li>{@link #finalizeSpawn(ServerLevelAccessor, DifficultyInstance, MobSpawnType, SpawnGroupData)} - Finalizes the spawning process and sets up parameters.</li>
  *   <li>{@link #setVariantName(String)} - Sets the variant name of the dragon.</li>
  *   <li>{@link #getVariantName()} - Retrieves the current variant name of the dragon.</li>
  * </ul>
@@ -89,9 +90,9 @@ public DragonEntity(EntityType<? extends TamableAnimal> pEntityType, Level pLeve
      * @Co-author Dan
      */
     @Override
-    protected void defineSynchedData() {
-        super.defineSynchedData();
-        this.entityData.define(VARIANT, "normal");
+    protected void defineSynchedData(SynchedEntityData.@NotNull Builder pBuilder) {
+        super.defineSynchedData(pBuilder);
+        pBuilder.define(VARIANT, "normal");
     }
 
     /**
@@ -140,15 +141,14 @@ public void readAdditionalSaveData(@NotNull CompoundTag pCompound) {
      * @param pDifficulty {@link DifficultyInstance} - The difficulty instance for spawning.
      * @param pReason {@link MobSpawnType} - The reason for spawning the entity.
      * @param pSpawnData {@link SpawnGroupData} - Data related to the spawn.
-     * @param pDataTag {@link CompoundTag} - Additional data for spawning.
      * @return {@link SpawnGroupData} - Updated spawn data.
      *
      * @since 1.0.0
      * @author MeAlam
      * @Co-author Dan
      */
     @Override
-    public SpawnGroupData finalizeSpawn(@NotNull ServerLevelAccessor pLevel, @NotNull DifficultyInstance pDifficulty, @NotNull MobSpawnType pReason, @Nullable SpawnGroupData pSpawnData, @Nullable CompoundTag pDataTag) {
+    public SpawnGroupData finalizeSpawn(@NotNull ServerLevelAccessor pLevel, @NotNull DifficultyInstance pDifficulty, @NotNull MobSpawnType pReason, @Nullable SpawnGroupData pSpawnData) {
         if (getVariantName() == null || getVariantName().isEmpty()) {
             this.setVariantName(getRandomVariant(getEntityVariants(entityName), "normal"));
             ParameterUtils.ParameterBuilder.forVariant(entityName,this.getVariantName())
@@ -158,7 +158,7 @@ public SpawnGroupData finalizeSpawn(@NotNull ServerLevelAccessor pLevel, @NotNul
                     .withParameter("array")
                     .connect();
         }
-        return super.finalizeSpawn(pLevel, pDifficulty, pReason, pSpawnData, pDataTag);
+        return super.finalizeSpawn(pLevel, pDifficulty, pReason, pSpawnData);
     }
 
     /**
@@ -217,4 +217,9 @@ public AnimatableInstanceCache getAnimatableInstanceCache() {
     public AgeableMob getBreedOffspring(@NotNull ServerLevel pLevel, @NotNull AgeableMob pOtherParent) {
         return null;
     }
+
+    @Override
+    public boolean isFood(@NotNull ItemStack pItemStack) {
+        return false;
+    }
 }

Forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java

@@ -12,7 +12,7 @@ public class DragonModel extends GeoModel<DragonEntity> {
     // Get the Model Location
     @Override
     public ResourceLocation getModelResource(DragonEntity pObject) {
-        return new ResourceLocation(BlueLib.MODID, "geo/dragon.geo.json");
+        return ResourceLocation.fromNamespaceAndPath(BlueLib.MODID, "geo/dragon.geo.json");
     }
 
     // Get the Texture Location
@@ -24,6 +24,6 @@ public ResourceLocation getTextureResource(DragonEntity pObject) {
     // Get the Animation Location
     @Override
     public ResourceLocation getAnimationResource(DragonEntity pAnimatable) {
-        return new ResourceLocation(BlueLib.MODID, "animations/dragon.animation.json");
+        return ResourceLocation.fromNamespaceAndPath(BlueLib.MODID, "animations/dragon.animation.json");
     }
 }

Forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java

@@ -11,13 +11,14 @@
 import net.minecraft.world.entity.*;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ServerLevelAccessor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import software.bernie.geckolib.animatable.GeoEntity;
-import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache;
-import software.bernie.geckolib.core.animation.AnimatableManager;
+import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache;
+import software.bernie.geckolib.animation.AnimatableManager;
 import software.bernie.geckolib.util.GeckoLibUtil;
 import software.bluelib.interfaces.variant.IVariantEntity;
 import software.bluelib.utils.ParameterUtils;
@@ -26,19 +27,19 @@
  * A {@code RexEntity} class representing a Rex entity in the game, which extends {@link TamableAnimal}
  * and implements {@link IVariantEntity} and {@link GeoEntity}.
  * <p>
- * This class manages the rex's variant system, its data synchronization, and integrates with the GeckoLib
+ * This class manages the Rex's variant system, its data synchronization, and integrates with the GeckoLib
  * animation system.
  * </p>
  *
  * <p>
  * Key Methods:
  * <ul>
- *   <li>{@link #defineSynchedData()} - Defines the synchronized data for the rex entity, including its variant.</li>
+ *   <li>{@link #defineSynchedData(SynchedEntityData.Builder)} - Defines the synchronized data for the Rex entity, including its variant.</li>
  *   <li>{@link #addAdditionalSaveData(CompoundTag)} - Adds custom data to the entity's NBT for saving.</li>
  *   <li>{@link #readAdditionalSaveData(CompoundTag)} - Reads custom data from the entity's NBT for loading.</li>
- *   <li>{@link #finalizeSpawn(ServerLevelAccessor, DifficultyInstance, MobSpawnType, SpawnGroupData, CompoundTag)} - Finalizes the spawning process and sets up parameters.</li>
- *   <li>{@link #setVariantName(String)} - Sets the variant name of the rex.</li>
- *   <li>{@link #getVariantName()} - Retrieves the current variant name of the rex.</li>
+ *   <li>{@link #finalizeSpawn(ServerLevelAccessor, DifficultyInstance, MobSpawnType, SpawnGroupData)} - Finalizes the spawning process and sets up parameters.</li>
+ *   <li>{@link #setVariantName(String)} - Sets the variant name of the Rex.</li>
+ *   <li>{@link #getVariantName()} - Retrieves the current variant name of the Rex.</li>
  * </ul>
  * </p>
  *
@@ -48,7 +49,7 @@
  */
 public class RexEntity extends TamableAnimal implements IVariantEntity, GeoEntity {
     /**
-     * Entity data accessor for the variant of the rex.
+     * Entity data accessor for the variant of the Rex.
      * <p>
      * This is used to store and retrieve the variant data for synchronization between server and client.
      * </p>
@@ -79,7 +80,7 @@ public RexEntity(EntityType<? extends TamableAnimal> pEntityType, Level pLevel)
     }
 
     /**
-     * Defines the synchronized data for this rex entity, including the variant.
+     * Defines the synchronized data for this Rex entity, including the variant.
      * <p>
      * This method initializes the {@link EntityDataAccessor} to handle the variant data.
      * </p>
@@ -89,9 +90,9 @@ public RexEntity(EntityType<? extends TamableAnimal> pEntityType, Level pLevel)
      * @Co-author Dan
      */
     @Override
-    protected void defineSynchedData() {
-        super.defineSynchedData();
-        this.entityData.define(VARIANT, "normal");
+    protected void defineSynchedData(SynchedEntityData.@NotNull Builder pBuilder) {
+        super.defineSynchedData(pBuilder);
+        pBuilder.define(VARIANT, "normal");
     }
 
     /**
@@ -131,7 +132,7 @@ public void readAdditionalSaveData(@NotNull CompoundTag pCompound) {
     }
 
     /**
-     * Finalizes the spawning of the rex entity.
+     * Finalizes the spawning of the Rex entity.
      * <p>
      * This method sets up the variant for the entity and connects parameters if needed.
      * </p>
@@ -140,15 +141,14 @@ public void readAdditionalSaveData(@NotNull CompoundTag pCompound) {
      * @param pDifficulty {@link DifficultyInstance} - The difficulty instance for spawning.
      * @param pReason {@link MobSpawnType} - The reason for spawning the entity.
      * @param pSpawnData {@link SpawnGroupData} - Data related to the spawn.
-     * @param pDataTag {@link CompoundTag} - Additional data for spawning.
      * @return {@link SpawnGroupData} - Updated spawn data.
      *
      * @since 1.0.0
      * @author MeAlam
      * @Co-author Dan
      */
     @Override
-    public SpawnGroupData finalizeSpawn(@NotNull ServerLevelAccessor pLevel, @NotNull DifficultyInstance pDifficulty, @NotNull MobSpawnType pReason, @Nullable SpawnGroupData pSpawnData, @Nullable CompoundTag pDataTag) {
+    public SpawnGroupData finalizeSpawn(@NotNull ServerLevelAccessor pLevel, @NotNull DifficultyInstance pDifficulty, @NotNull MobSpawnType pReason, @Nullable SpawnGroupData pSpawnData) {
         if (getVariantName() == null || getVariantName().isEmpty()) {
             this.setVariantName(getRandomVariant(getEntityVariants(entityName), "normal"));
             ParameterUtils.ParameterBuilder.forVariant(entityName,this.getVariantName())
@@ -158,11 +158,11 @@ public SpawnGroupData finalizeSpawn(@NotNull ServerLevelAccessor pLevel, @NotNul
                     .withParameter("array")
                     .connect();
         }
-        return super.finalizeSpawn(pLevel, pDifficulty, pReason, pSpawnData, pDataTag);
+        return super.finalizeSpawn(pLevel, pDifficulty, pReason, pSpawnData);
     }
 
     /**
-     * Sets the variant name for the rex entity.
+     * Sets the variant name for the Rex entity.
      *
      * @param pName {@link String} - The name of the variant to set.
      *
@@ -175,7 +175,7 @@ public void setVariantName(String pName) {
     }
 
     /**
-     * Retrieves the current variant name of the rex entity.
+     * Retrieves the current variant name of the Rex entity.
      *
      * @return {@link String} - The current variant name.
      *
@@ -217,4 +217,9 @@ public AnimatableInstanceCache getAnimatableInstanceCache() {
     public AgeableMob getBreedOffspring(@NotNull ServerLevel pLevel, @NotNull AgeableMob pOtherParent) {
         return null;
     }
+
+    @Override
+    public boolean isFood(@NotNull ItemStack pItemStack) {
+        return false;
+    }
 }

Forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java

@@ -12,7 +12,7 @@ public class RexModel extends GeoModel<RexEntity> {
     // Get the Model Location
     @Override
     public ResourceLocation getModelResource(RexEntity pObject) {
-        return new ResourceLocation(BlueLib.MODID, "geo/rex.geo.json");
+        return ResourceLocation.fromNamespaceAndPath(BlueLib.MODID, "geo/rex.geo.json");
     }
 
     // Get the Texture Location
@@ -24,6 +24,6 @@ public ResourceLocation getTextureResource(RexEntity pObject) {
     // Get the Animation Location
     @Override
     public ResourceLocation getAnimationResource(RexEntity pAnimatable) {
-        return new ResourceLocation(BlueLib.MODID, "animations/rex.animation.json");
+        return ResourceLocation.fromNamespaceAndPath(BlueLib.MODID, "animations/rex.animation.json");
     }
 }

Forge/src/main/java/software/bluelib/example/init/ModEntities.java

@@ -25,7 +25,7 @@ public class ModEntities {
                     .setUpdateInterval(3)
                     .fireImmune()
                     .sized(0.6f, 1.8f)
-                    .build(new ResourceLocation(BlueLib.MODID, "dragon").toString()));
+                    .build(ResourceLocation.fromNamespaceAndPath(BlueLib.MODID, "dragon").toString()));
 
     public static final RegistryObject<EntityType<RexEntity>> REX =
             REGISTER.register("example_two", () -> EntityType.Builder.of(RexEntity::new, MobCategory.AMBIENT)
@@ -34,7 +34,7 @@ public class ModEntities {
                     .setUpdateInterval(3)
                     .fireImmune()
                     .sized(0.6f, 1.8f)
-                    .build(new ResourceLocation(BlueLib.MODID, "rex").toString()));
+                    .build(ResourceLocation.fromNamespaceAndPath(BlueLib.MODID, "rex").toString()));
 
     public static void register(IEventBus eventBus) {
         REGISTER.register(eventBus);

Forge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java

@@ -41,7 +41,7 @@ public interface IVariantEntityBase {
      * @since 1.0.0
      */
     default ResourceLocation getTextureLocation(String pModId, String pPath) {
-        return new ResourceLocation(pModId, pPath);
+        return ResourceLocation.fromNamespaceAndPath(pModId, pPath);
     }
 
     /**

Forge/src/main/resources/META-INF/mods.toml

@@ -6,8 +6,8 @@ license="${mod_license}"
 modId="${mod_id}"
 version="${mod_version}"
 displayName="${mod_name}"
-displayURL="https://github.com/MeAlam1/BlueLib/wiki"
-#logoFile="examplemod.png"
+displayURL="https://mealam1.github.io/BlueLib/"
+logoFile="bluelib.png"
 credits="Anyone who contributed to the Source Code of BlueLib!"
 authors="${mod_authors}" 
 description='''${mod_description}'''