From ee289d9e3d2c7643a5f1c8f6b72c5f3cbe759f75 Mon Sep 17 00:00:00 2001 From: Bluedude <68448043+Dan6335@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:03:45 +0200 Subject: [PATCH] Changed 1.16.X to use cursemaven as well (#30) --- Forge/build.gradle | 16 +- Forge/gradle.properties | 18 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../main/java/software/bluelib/BlueLib.java | 16 +- .../bluelib/entity/variant/VariantLoader.java | 6 +- .../entity/variant/VariantParameter.java | 2 +- .../bluelib/event/ReloadEventHandler.java | 2 +- .../example/entity/dragon/DragonEntity.java | 105 ++--- .../example/entity/dragon/DragonModel.java | 12 +- .../example/entity/dragon/DragonRender.java | 6 +- .../bluelib/example/entity/rex/RexEntity.java | 91 ++-- .../bluelib/example/entity/rex/RexModel.java | 12 +- .../bluelib/example/entity/rex/RexRender.java | 7 +- .../bluelib/example/event/ClientEvents.java | 6 +- .../bluelib/example/event/ReloadHandler.java | 9 +- .../bluelib/example/init/ModEntities.java | 26 +- .../interfaces/variant/IVariantEntity.java | 4 +- .../variant/base/IVariantEntityBase.java | 2 +- .../software/bluelib/json/JSONLoader.java | 33 +- .../bluelib/utils/ParameterUtils.java | 2 +- NeoForge/.gitignore | 26 -- NeoForge/build.gradle | 114 ----- NeoForge/changelog.txt | 0 NeoForge/gradle.properties | 22 - NeoForge/gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - NeoForge/gradlew | 252 ----------- NeoForge/gradlew.bat | 94 ----- NeoForge/settings.gradle | 11 - .../main/java/software/bluelib/BlueLib.java | 121 ------ .../bluelib/entity/variant/VariantLoader.java | 169 -------- .../entity/variant/VariantParameter.java | 131 ------ .../entity/variant/base/ParameterBase.java | 179 -------- .../bluelib/event/ReloadEventHandler.java | 78 ---- .../example/entity/dragon/DragonEntity.java | 220 ---------- .../example/entity/dragon/DragonModel.java | 29 -- .../example/entity/dragon/DragonRender.java | 14 - .../bluelib/example/entity/rex/RexEntity.java | 220 ---------- .../bluelib/example/entity/rex/RexModel.java | 29 -- .../bluelib/example/entity/rex/RexRender.java | 14 - .../bluelib/example/event/ClientEvents.java | 28 -- .../bluelib/example/event/ReloadHandler.java | 142 ------- .../bluelib/example/init/ModEntities.java | 40 -- .../bluelib/exception/CouldNotLoadJSON.java | 64 --- .../interfaces/variant/IVariantEntity.java | 56 --- .../variant/base/IVariantEntityBase.java | 65 --- .../software/bluelib/json/JSONLoader.java | 69 ---- .../software/bluelib/json/JSONMerger.java | 64 --- .../bluelib/utils/ParameterUtils.java | 181 -------- .../src/main/resources/META-INF/mods.toml | 31 -- .../bluelib/animations/dragon.animation.json | 63 --- .../bluelib/animations/rex.animation.json | 51 --- .../assets/bluelib/geo/dragon.geo.json | 93 ----- .../resources/assets/bluelib/geo/rex.geo.json | 390 ------------------ .../resources/assets/bluelib/lang/en_us.json | 4 - .../bluelib/textures/entity/dragon/bright.png | Bin 676 -> 0 bytes .../bluelib/textures/entity/dragon/dark.png | Bin 676 -> 0 bytes .../bluelib/textures/entity/rex/brown.png | Bin 3454 -> 0 bytes .../bluelib/textures/entity/rex/green.png | Bin 1531 -> 0 bytes .../data/bluelib/variant/entity/dragon.json | 24 -- .../data/bluelib/variant/entity/rex.json | 24 -- NeoForge/src/main/resources/pack.mcmeta | 6 - 62 files changed, 194 insertions(+), 3310 deletions(-) delete mode 100644 NeoForge/.gitignore delete mode 100644 NeoForge/build.gradle delete mode 100644 NeoForge/changelog.txt delete mode 100644 NeoForge/gradle.properties delete mode 100644 NeoForge/gradle/wrapper/gradle-wrapper.jar delete mode 100644 NeoForge/gradle/wrapper/gradle-wrapper.properties delete mode 100644 NeoForge/gradlew delete mode 100644 NeoForge/gradlew.bat delete mode 100644 NeoForge/settings.gradle delete mode 100644 NeoForge/src/main/java/software/bluelib/BlueLib.java delete mode 100644 NeoForge/src/main/java/software/bluelib/entity/variant/VariantLoader.java delete mode 100644 NeoForge/src/main/java/software/bluelib/entity/variant/VariantParameter.java delete mode 100644 NeoForge/src/main/java/software/bluelib/entity/variant/base/ParameterBase.java delete mode 100644 NeoForge/src/main/java/software/bluelib/event/ReloadEventHandler.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/entity/rex/RexModel.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/entity/rex/RexRender.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/event/ClientEvents.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/event/ReloadHandler.java delete mode 100644 NeoForge/src/main/java/software/bluelib/example/init/ModEntities.java delete mode 100644 NeoForge/src/main/java/software/bluelib/exception/CouldNotLoadJSON.java delete mode 100644 NeoForge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java delete mode 100644 NeoForge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java delete mode 100644 NeoForge/src/main/java/software/bluelib/json/JSONLoader.java delete mode 100644 NeoForge/src/main/java/software/bluelib/json/JSONMerger.java delete mode 100644 NeoForge/src/main/java/software/bluelib/utils/ParameterUtils.java delete mode 100644 NeoForge/src/main/resources/META-INF/mods.toml delete mode 100644 NeoForge/src/main/resources/assets/bluelib/animations/dragon.animation.json delete mode 100644 NeoForge/src/main/resources/assets/bluelib/animations/rex.animation.json delete mode 100644 NeoForge/src/main/resources/assets/bluelib/geo/dragon.geo.json delete mode 100644 NeoForge/src/main/resources/assets/bluelib/geo/rex.geo.json delete mode 100644 NeoForge/src/main/resources/assets/bluelib/lang/en_us.json delete mode 100644 NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png delete mode 100644 NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png delete mode 100644 NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png delete mode 100644 NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/green.png delete mode 100644 NeoForge/src/main/resources/data/bluelib/variant/entity/dragon.json delete mode 100644 NeoForge/src/main/resources/data/bluelib/variant/entity/rex.json delete mode 100644 NeoForge/src/main/resources/pack.mcmeta diff --git a/Forge/build.gradle b/Forge/build.gradle index cecdadaf..d0a32d46 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -26,7 +26,7 @@ base { archivesName = "${mod_id}-forge-${minecraft_version}" } -java.toolchain.languageVersion = JavaLanguageVersion.of(17) +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 { @@ -73,8 +73,10 @@ sourceSets.main.resources { srcDir 'src/generated/resources' } dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - compileOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}") - runtimeOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}") + //compileOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_version}") + //runtimeOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_version}") + runtimeOnly "curse.maven:geckolib-388172:${geckolib_file}" + compileOnly "curse.maven:geckolib-388172:${geckolib_file}" } tasks.named('processResources', ProcessResources).configure { @@ -121,8 +123,12 @@ eclipse { synchronizationTasks 'genEclipseRuns' } -sourceSets.each { +sourceSets.main.resources { + srcDir 'src/generated/resources' +} + +/*sourceSets.each { def dir = layout.buildDirectory.dir("sourcesSets/$it.name") it.output.resourcesDir = dir it.java.destinationDirectory = dir -} \ No newline at end of file +}*/ diff --git a/Forge/gradle.properties b/Forge/gradle.properties index 32738787..d1a5d749 100644 --- a/Forge/gradle.properties +++ b/Forge/gradle.properties @@ -3,14 +3,16 @@ org.gradle.daemon=false ## Environment Properties -minecraft_version=1.20.4 -minecraft_version_range=[1.20.4,1.21) -forge_version=49.1.4 -forge_version_range=[0,) -loader_version_range=[0,) +minecraft_version=1.16.5 +minecraft_version_range=[1.16,1.22) +forge_version=36.2.34 +forge_version_range=[36,) +loader_version_range=[36,) mapping_channel=official -mapping_version=1.20.4 -geckolib_version=4.4.4 +mapping_version=1.16.5 +geckolib_version=1.16.5:3.0.106 +geckolib_file=4182600 +java_version=8 ## Mod Properties @@ -20,4 +22,4 @@ mod_license=MIT License mod_version=1.0.0 mod_group_id=software.bluelib mod_authors=Dan, Aram -mod_description=BlueLib is an All round Minecraft mod library that offers data-driven features, allowing users to implement and customize its features with full freedom. \nIt supports both Resource and Datapacks, ensuring seamless integration and flexibility. \ No newline at end of file +mod_description=BlueLib is an All round Minecraft mod library that offers data-driven features, allowing users to implement and customize its features with full freedom. \nIt supports both Resource and Datapacks, ensuring seamless integration and flexibility. diff --git a/Forge/gradle/wrapper/gradle-wrapper.properties b/Forge/gradle/wrapper/gradle-wrapper.properties index 309b4e18..54f3c9ac 100644 --- a/Forge/gradle/wrapper/gradle-wrapper.properties +++ b/Forge/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Tue Sep 03 15:47:51 SAST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Forge/src/main/java/software/bluelib/BlueLib.java b/Forge/src/main/java/software/bluelib/BlueLib.java index 1b47ff5e..a90941ed 100644 --- a/Forge/src/main/java/software/bluelib/BlueLib.java +++ b/Forge/src/main/java/software/bluelib/BlueLib.java @@ -110,15 +110,15 @@ private void setupComplete(final FMLLoadCompleteEvent event) { public void onLoadComplete(FMLLoadCompleteEvent pEvent) { if (isDeveloperMode()) { scheduler.schedule(() -> { - System.out.println(""" + System.out.println( + "**************************************************\n" + + "* *\n" + + "* Thank you for using BlueLib! *\n" + + "* We appreciate your support. *\n" + + "* *\n" + + "**************************************************" + ); - ************************************************** - * * - * Thank you for using BlueLib! * - * We appreciate your support. * - * * - ************************************************** - """); scheduler.shutdown(); }, 3, TimeUnit.SECONDS); } diff --git a/Forge/src/main/java/software/bluelib/entity/variant/VariantLoader.java b/Forge/src/main/java/software/bluelib/entity/variant/VariantLoader.java index 3dc0034b..01be1ee2 100644 --- a/Forge/src/main/java/software/bluelib/entity/variant/VariantLoader.java +++ b/Forge/src/main/java/software/bluelib/entity/variant/VariantLoader.java @@ -5,9 +5,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.IResourceManager; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.util.ResourceLocation; import software.bluelib.interfaces.variant.base.IVariantEntityBase; import software.bluelib.json.JSONLoader; import software.bluelib.json.JSONMerger; @@ -67,7 +67,7 @@ public class VariantLoader implements IVariantEntityBase { */ public static void loadVariants(ResourceLocation pJSONLocationMod, ResourceLocation pJSONLocationData, MinecraftServer pServer, String pEntityName) { clearVariantsForEntity(pEntityName); - ResourceManager resourceManager = pServer.getResourceManager(); + IResourceManager resourceManager = pServer.getResourceManager(); JsonObject mergedJsonObject = new JsonObject(); JsonObject modJson = jsonLoader.loadJson(pJSONLocationMod, resourceManager); diff --git a/Forge/src/main/java/software/bluelib/entity/variant/VariantParameter.java b/Forge/src/main/java/software/bluelib/entity/variant/VariantParameter.java index db3d3319..d0584e28 100644 --- a/Forge/src/main/java/software/bluelib/entity/variant/VariantParameter.java +++ b/Forge/src/main/java/software/bluelib/entity/variant/VariantParameter.java @@ -70,7 +70,7 @@ public VariantParameter(String pJsonKey, JsonObject pJsonObject) { } else if (element.isJsonArray()) { StringBuilder arrayValues = new StringBuilder(); element.getAsJsonArray().forEach(e -> arrayValues.append(e.getAsString()).append(",")); - if (!arrayValues.isEmpty()) { + if (arrayValues.length() > 0) { arrayValues.setLength(arrayValues.length() - 1); } addParameter(entry.getKey(), arrayValues.toString()); diff --git a/Forge/src/main/java/software/bluelib/event/ReloadEventHandler.java b/Forge/src/main/java/software/bluelib/event/ReloadEventHandler.java index 9a095c52..f76135fc 100644 --- a/Forge/src/main/java/software/bluelib/event/ReloadEventHandler.java +++ b/Forge/src/main/java/software/bluelib/event/ReloadEventHandler.java @@ -3,8 +3,8 @@ package software.bluelib.event; import com.google.gson.JsonParseException; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ResourceLocation; import software.bluelib.entity.variant.VariantLoader; /** diff --git a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java b/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java index 00e15560..a7be228d 100644 --- a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java +++ b/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java @@ -2,29 +2,33 @@ package software.bluelib.example.entity.dragon; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.server.level.ServerLevel; +import net.minecraft.entity.AgeableEntity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.ILivingEntityData; +import net.minecraft.entity.SpawnReason; +import net.minecraft.entity.ai.attributes.AttributeModifierMap; +import net.minecraft.entity.ai.attributes.Attributes; +import net.minecraft.entity.passive.TameableEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.DifficultyInstance; -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.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.util.GeckoLibUtil; +import net.minecraft.world.IServerWorld; +import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; +import software.bernie.geckolib3.core.IAnimatable; +import software.bernie.geckolib3.core.manager.AnimationData; +import software.bernie.geckolib3.core.manager.AnimationFactory; +import software.bernie.geckolib3.util.GeckoLibUtil; import software.bluelib.interfaces.variant.IVariantEntity; import software.bluelib.utils.ParameterUtils; +import javax.annotation.Nullable; + /** - * A {@code DragonEntity} class representing a dragon entity in the game, which extends {@link TamableAnimal} - * and implements {@link IVariantEntity} and {@link GeoEntity}. + * A {@code DragonEntity} class representing a dragon entity in the game, which extends {@link TameableEntity} + * and implements {@link IVariantEntity} and {@link IAnimatable}. *

* This class manages the dragon's variant system, its data synchronization, and integrates with the GeckoLib * animation system. @@ -34,9 +38,9 @@ * Key Methods: *

@@ -46,7 +50,7 @@ * @Co-author Dan * @since 1.0.0 */ -public class DragonEntity extends TamableAnimal implements IVariantEntity, GeoEntity { +public class DragonEntity extends TameableEntity implements IVariantEntity, IAnimatable { /** * Entity data accessor for the variant of the dragon. *

@@ -55,7 +59,7 @@ public class DragonEntity extends TamableAnimal implements IVariantEntity, GeoEn * @Co-author MeAlam, Dan * @since 1.0.0 */ - public static final EntityDataAccessor VARIANT = SynchedEntityData.defineId(DragonEntity.class, EntityDataSerializers.STRING); + public static final DataParameter VARIANT = EntityDataManager.defineId(DragonEntity.class, DataSerializers.STRING); /** * The name of the entity. @@ -68,20 +72,20 @@ public class DragonEntity extends TamableAnimal implements IVariantEntity, GeoEn * Constructs a new {@link DragonEntity} instance with the specified entity type and level. * * @param pEntityType {@link EntityType} - The type of the entity. - * @param pLevel {@link Level} - The level in which the entity is created. + * @param pLevel {@link World} - The level in which the entity is created. * * @since 1.0.0 * @author MeAlam * @Co-author Dan */ - public DragonEntity(EntityType pEntityType, Level pLevel) { + public DragonEntity(EntityType pEntityType, World pLevel) { super(pEntityType, pLevel); } /** * Defines the synchronized data for this dragon entity, including the variant. *

- * This method initializes the {@link EntityDataAccessor} to handle the variant data. + * This method initializes the {@link DataParameter} to handle the variant data. *

* * @since 1.0.0 @@ -100,14 +104,14 @@ protected void defineSynchedData() { * This method stores the variant name in the NBT data so it can be restored when loading the entity. *

* - * @param pCompound {@link CompoundTag} - The NBT tag to which data should be added. + * @param pCompound {@link CompoundNBT} - The NBT tag to which data should be added. * * @since 1.0.0 * @author MeAlam * @Co-author Dan */ @Override - public void addAdditionalSaveData(@NotNull CompoundTag pCompound) { + public void addAdditionalSaveData(CompoundNBT pCompound) { super.addAdditionalSaveData(pCompound); pCompound.putString("Variant", getVariantName()); } @@ -118,14 +122,14 @@ public void addAdditionalSaveData(@NotNull CompoundTag pCompound) { * This method retrieves the variant name from the NBT data and sets it for the entity. *

* - * @param pCompound {@link CompoundTag} - The NBT tag from which data should be read. + * @param pCompound {@link CompoundNBT} - The NBT tag from which data should be read. * * @since 1.0.0 * @author MeAlam * @Co-author Dan */ @Override - public void readAdditionalSaveData(@NotNull CompoundTag pCompound) { + public void readAdditionalSaveData(CompoundNBT pCompound) { super.readAdditionalSaveData(pCompound); this.setVariantName(pCompound.getString("Variant")); } @@ -136,19 +140,19 @@ public void readAdditionalSaveData(@NotNull CompoundTag pCompound) { * This method sets up the variant for the entity and connects parameters if needed. *

* - * @param pLevel {@link ServerLevelAccessor} - The level in which the entity is spawned. + * @param pLevel {@link IServerWorld} - The level in which the entity is spawned. * @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. + * @param pReason {@link SpawnReason} - The reason for spawning the entity. + * @param pSpawnData {@link ILivingEntityData} - Data related to the spawn. + * @param pDataTag {@link CompoundNBT} - Additional data for spawning. + * @return {@link ILivingEntityData} - 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 ILivingEntityData finalizeSpawn(IServerWorld pLevel, DifficultyInstance pDifficulty, SpawnReason pReason, @Nullable ILivingEntityData pSpawnData, @Nullable CompoundNBT pDataTag) { if (getVariantName() == null || getVariantName().isEmpty()) { this.setVariantName(getRandomVariant(getEntityVariants(entityName), "normal")); ParameterUtils.ParameterBuilder.forVariant(entityName,this.getVariantName()) @@ -191,30 +195,27 @@ public String getVariantName() { * All Code below this Fragment is not Library Related!!! */ - private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); + public AnimationFactory factory = GeckoLibUtil.createFactory(this); - public static AttributeSupplier.Builder createAttributes() { - return Mob.createMobAttributes() - .add(Attributes.MOVEMENT_SPEED, 0.3) - .add(Attributes.MAX_HEALTH, 10) - .add(Attributes.ARMOR, 0) - .add(Attributes.ATTACK_DAMAGE, 3) - .add(Attributes.FOLLOW_RANGE, 16) - .add(Attributes.FLYING_SPEED, 0.3); + public static AttributeModifierMap.MutableAttribute createAttributes() { + return TameableEntity.createMobAttributes() + .add(Attributes.MAX_HEALTH, 10.0D) + .add(Attributes.MOVEMENT_SPEED, 0.3D) + .add(Attributes.FLYING_SPEED, 0.3D) + .add(Attributes.FOLLOW_RANGE, 16.0D); } + @Nullable @Override - public void registerControllers(AnimatableManager.ControllerRegistrar pControllerRegistrar) { + public AgeableEntity getBreedOffspring(ServerWorld serverWorld, AgeableEntity ageableEntity) { + return null; } @Override - public AnimatableInstanceCache getAnimatableInstanceCache() { - return cache; - } + public void registerControllers(AnimationData data) {} - @Nullable @Override - public AgeableMob getBreedOffspring(@NotNull ServerLevel pLevel, @NotNull AgeableMob pOtherParent) { - return null; + public AnimationFactory getFactory() { + return factory; } } diff --git a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java b/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java index 67091901..2bfba12f 100644 --- a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java +++ b/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java @@ -2,28 +2,28 @@ package software.bluelib.example.entity.dragon; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.model.GeoModel; +import net.minecraft.util.ResourceLocation; +import software.bernie.geckolib3.model.AnimatedGeoModel; import software.bluelib.BlueLib; -public class DragonModel extends GeoModel { +public class DragonModel extends AnimatedGeoModel { // Get the Model Location @Override - public ResourceLocation getModelResource(DragonEntity pObject) { + public ResourceLocation getModelLocation(DragonEntity pObject) { return new ResourceLocation(BlueLib.MODID, "geo/dragon.geo.json"); } // Get the Texture Location @Override - public ResourceLocation getTextureResource(DragonEntity pObject) { + public ResourceLocation getTextureLocation(DragonEntity pObject) { return pObject.getTextureLocation(BlueLib.MODID, "textures/entity/" + pObject.entityName + "/" + pObject.getVariantName() + ".png"); } // Get the Animation Location @Override - public ResourceLocation getAnimationResource(DragonEntity pAnimatable) { + public ResourceLocation getAnimationFileLocation(DragonEntity pAnimatable) { return new ResourceLocation(BlueLib.MODID, "animations/dragon.animation.json"); } } diff --git a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java b/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java index c770ac48..05be2d19 100644 --- a/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java +++ b/Forge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java @@ -2,13 +2,13 @@ package software.bluelib.example.entity.dragon; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.renderer.GeoEntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import software.bernie.geckolib3.renderers.geo.GeoEntityRenderer; public class DragonRender extends GeoEntityRenderer { // Render the entity - public DragonRender(EntityRendererProvider.Context pRenderManager) { + public DragonRender(EntityRendererManager pRenderManager) { super(pRenderManager, new DragonModel()); } } diff --git a/Forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java b/Forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java index fcb85a52..cbdc9d07 100644 --- a/Forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java +++ b/Forge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java @@ -2,29 +2,33 @@ package software.bluelib.example.entity.rex; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.server.level.ServerLevel; +import net.minecraft.entity.AgeableEntity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.ILivingEntityData; +import net.minecraft.entity.SpawnReason; +import net.minecraft.entity.ai.attributes.AttributeModifierMap; +import net.minecraft.entity.ai.attributes.Attributes; +import net.minecraft.entity.passive.TameableEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.DifficultyInstance; -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.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.util.GeckoLibUtil; +import net.minecraft.world.IServerWorld; +import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; +import software.bernie.geckolib3.core.IAnimatable; +import software.bernie.geckolib3.core.manager.AnimationData; +import software.bernie.geckolib3.core.manager.AnimationFactory; +import software.bernie.geckolib3.util.GeckoLibUtil; import software.bluelib.interfaces.variant.IVariantEntity; import software.bluelib.utils.ParameterUtils; +import javax.annotation.Nullable; + /** - * A {@code RexEntity} class representing a Rex entity in the game, which extends {@link TamableAnimal} - * and implements {@link IVariantEntity} and {@link GeoEntity}. + * A {@code RexEntity} class representing a Rex entity in the game, which extends {@link TameableEntity} + * and implements {@link IVariantEntity} and {@link IAnimatable}. *

* This class manages the rex's variant system, its data synchronization, and integrates with the GeckoLib * animation system. @@ -34,9 +38,9 @@ * Key Methods: *

    *
  • {@link #defineSynchedData()} - Defines the synchronized data for the rex entity, including its variant.
  • - *
  • {@link #addAdditionalSaveData(CompoundTag)} - Adds custom data to the entity's NBT for saving.
  • - *
  • {@link #readAdditionalSaveData(CompoundTag)} - Reads custom data from the entity's NBT for loading.
  • - *
  • {@link #finalizeSpawn(ServerLevelAccessor, DifficultyInstance, MobSpawnType, SpawnGroupData, CompoundTag)} - Finalizes the spawning process and sets up parameters.
  • + *
  • {@link #addAdditionalSaveData(CompoundNBT)} - Adds custom data to the entity's NBT for saving.
  • + *
  • {@link #readAdditionalSaveData(CompoundNBT)} - Reads custom data from the entity's NBT for loading.
  • + *
  • {@link #finalizeSpawn(IServerWorld, DifficultyInstance, SpawnReason, ILivingEntityData, CompoundNBT)} - Finalizes the spawning process and sets up parameters.
  • *
  • {@link #setVariantName(String)} - Sets the variant name of the rex.
  • *
  • {@link #getVariantName()} - Retrieves the current variant name of the rex.
  • *
@@ -46,7 +50,7 @@ * @Co-author Dan * @since 1.0.0 */ -public class RexEntity extends TamableAnimal implements IVariantEntity, GeoEntity { +public class RexEntity extends TameableEntity implements IVariantEntity, IAnimatable { /** * Entity data accessor for the variant of the rex. *

@@ -55,7 +59,7 @@ public class RexEntity extends TamableAnimal implements IVariantEntity, GeoEntit * @Co-author MeAlam, Dan * @since 1.0.0 */ - public static final EntityDataAccessor VARIANT = SynchedEntityData.defineId(RexEntity.class, EntityDataSerializers.STRING); + public static final DataParameter VARIANT = EntityDataManager.defineId(RexEntity.class, DataSerializers.STRING); /** * The name of the entity. @@ -68,20 +72,20 @@ public class RexEntity extends TamableAnimal implements IVariantEntity, GeoEntit * Constructs a new {@link RexEntity} instance with the specified entity type and level. * * @param pEntityType {@link EntityType} - The type of the entity. - * @param pLevel {@link Level} - The level in which the entity is created. + * @param pLevel {@link World} - The level in which the entity is created. * * @since 1.0.0 * @author MeAlam * @Co-author Dan */ - public RexEntity(EntityType pEntityType, Level pLevel) { + public RexEntity(EntityType pEntityType, World pLevel) { super(pEntityType, pLevel); } /** * Defines the synchronized data for this rex entity, including the variant. *

- * This method initializes the {@link EntityDataAccessor} to handle the variant data. + * This method initializes the {@link DataParameter} to handle the variant data. *

* * @since 1.0.0 @@ -100,14 +104,14 @@ protected void defineSynchedData() { * This method stores the variant name in the NBT data so it can be restored when loading the entity. *

* - * @param pCompound {@link CompoundTag} - The NBT tag to which data should be added. + * @param pCompound {@link CompoundNBT} - The NBT tag to which data should be added. * * @since 1.0.0 * @author MeAlam * @Co-author Dan */ @Override - public void addAdditionalSaveData(@NotNull CompoundTag pCompound) { + public void addAdditionalSaveData(CompoundNBT pCompound) { super.addAdditionalSaveData(pCompound); pCompound.putString("Variant", getVariantName()); } @@ -118,14 +122,14 @@ public void addAdditionalSaveData(@NotNull CompoundTag pCompound) { * This method retrieves the variant name from the NBT data and sets it for the entity. *

* - * @param pCompound {@link CompoundTag} - The NBT tag from which data should be read. + * @param pCompound {@link CompoundNBT} - The NBT tag from which data should be read. * * @since 1.0.0 * @author MeAlam * @Co-author Dan */ @Override - public void readAdditionalSaveData(@NotNull CompoundTag pCompound) { + public void readAdditionalSaveData(CompoundNBT pCompound) { super.readAdditionalSaveData(pCompound); this.setVariantName(pCompound.getString("Variant")); } @@ -136,19 +140,19 @@ public void readAdditionalSaveData(@NotNull CompoundTag pCompound) { * This method sets up the variant for the entity and connects parameters if needed. *

* - * @param pLevel {@link ServerLevelAccessor} - The level in which the entity is spawned. + * @param pLevel {@link IServerWorld} - The level in which the entity is spawned. * @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. + * @param pReason {@link SpawnReason} - The reason for spawning the entity. + * @param pSpawnData {@link ILivingEntityData} - Data related to the spawn. + * @param pDataTag {@link CompoundNBT} - Additional data for spawning. + * @return {@link ILivingEntityData} - 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 ILivingEntityData finalizeSpawn(IServerWorld pLevel, DifficultyInstance pDifficulty, SpawnReason pReason, @Nullable ILivingEntityData pSpawnData, @Nullable CompoundNBT pDataTag) { if (getVariantName() == null || getVariantName().isEmpty()) { this.setVariantName(getRandomVariant(getEntityVariants(entityName), "normal")); ParameterUtils.ParameterBuilder.forVariant(entityName,this.getVariantName()) @@ -191,10 +195,10 @@ public String getVariantName() { * All Code below this Fragment is not Library Related!!! */ - private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); + public AnimationFactory factory = GeckoLibUtil.createFactory(this); - public static AttributeSupplier.Builder createAttributes() { - return Mob.createMobAttributes() + public static AttributeModifierMap.MutableAttribute createAttributes() { + return TameableEntity.createMobAttributes() .add(Attributes.MOVEMENT_SPEED, 0.3) .add(Attributes.MAX_HEALTH, 10) .add(Attributes.ARMOR, 0) @@ -204,17 +208,16 @@ public static AttributeSupplier.Builder createAttributes() { } @Override - public void registerControllers(AnimatableManager.ControllerRegistrar pControllerRegistrar) { - } + public void registerControllers(AnimationData data) {} @Override - public AnimatableInstanceCache getAnimatableInstanceCache() { - return cache; + public AnimationFactory getFactory() { + return factory; } @Nullable @Override - public AgeableMob getBreedOffspring(@NotNull ServerLevel pLevel, @NotNull AgeableMob pOtherParent) { + public AgeableEntity getBreedOffspring(ServerWorld serverWorld, AgeableEntity ageableEntity) { return null; } } diff --git a/Forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java b/Forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java index 6084892c..c65b1e38 100644 --- a/Forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java +++ b/Forge/src/main/java/software/bluelib/example/entity/rex/RexModel.java @@ -2,28 +2,28 @@ package software.bluelib.example.entity.rex; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.model.GeoModel; +import net.minecraft.util.ResourceLocation; +import software.bernie.geckolib3.model.AnimatedGeoModel; import software.bluelib.BlueLib; -public class RexModel extends GeoModel { +public class RexModel extends AnimatedGeoModel { // Get the Model Location @Override - public ResourceLocation getModelResource(RexEntity pObject) { + public ResourceLocation getModelLocation(RexEntity pObject) { return new ResourceLocation(BlueLib.MODID, "geo/rex.geo.json"); } // Get the Texture Location @Override - public ResourceLocation getTextureResource(RexEntity pObject) { + public ResourceLocation getTextureLocation(RexEntity pObject) { return pObject.getTextureLocation(BlueLib.MODID, "textures/entity/" + pObject.entityName + "/" + pObject.getVariantName() + ".png"); } // Get the Animation Location @Override - public ResourceLocation getAnimationResource(RexEntity pAnimatable) { + public ResourceLocation getAnimationFileLocation(RexEntity pAnimatable) { return new ResourceLocation(BlueLib.MODID, "animations/rex.animation.json"); } } diff --git a/Forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java b/Forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java index 776c5920..8220b4cb 100644 --- a/Forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java +++ b/Forge/src/main/java/software/bluelib/example/entity/rex/RexRender.java @@ -2,13 +2,12 @@ package software.bluelib.example.entity.rex; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.renderer.GeoEntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import software.bernie.geckolib3.renderers.geo.GeoEntityRenderer; public class RexRender extends GeoEntityRenderer { - // Render the entity - public RexRender(EntityRendererProvider.Context pRenderManager) { + public RexRender(EntityRendererManager pRenderManager) { super(pRenderManager, new RexModel()); } } diff --git a/Forge/src/main/java/software/bluelib/example/event/ClientEvents.java b/Forge/src/main/java/software/bluelib/example/event/ClientEvents.java index 187fc9ab..ac48aa2f 100644 --- a/Forge/src/main/java/software/bluelib/example/event/ClientEvents.java +++ b/Forge/src/main/java/software/bluelib/example/event/ClientEvents.java @@ -2,8 +2,8 @@ package software.bluelib.example.event; -import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.Mod; import software.bluelib.BlueLib; import software.bluelib.example.entity.dragon.DragonRender; @@ -15,7 +15,7 @@ public class ClientEvents { public static void registerRenderers() { // Register the renderer for all the Entities - EntityRenderers.register(ModEntities.DRAGON.get(), DragonRender::new); - EntityRenderers.register(ModEntities.REX.get(), RexRender::new); + RenderingRegistry.registerEntityRenderingHandler(ModEntities.DRAGON.get(), DragonRender::new); + RenderingRegistry.registerEntityRenderingHandler(ModEntities.REX.get(), RexRender::new); } } diff --git a/Forge/src/main/java/software/bluelib/example/event/ReloadHandler.java b/Forge/src/main/java/software/bluelib/example/event/ReloadHandler.java index 24ed12b0..257878ce 100644 --- a/Forge/src/main/java/software/bluelib/example/event/ReloadHandler.java +++ b/Forge/src/main/java/software/bluelib/example/event/ReloadHandler.java @@ -4,9 +4,8 @@ import net.minecraft.server.MinecraftServer; import net.minecraftforge.event.AddReloadListenerEvent; -import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import software.bluelib.BlueLib; import software.bluelib.event.ReloadEventHandler; @@ -26,7 +25,7 @@ *

* Key Methods: *

    - *
  • {@link #onServerStart(ServerStartingEvent)} - Handles server starting events to initialize entity variants.
  • + *
  • {@link #onServerStart(FMLServerStartingEvent)} - Handles server starting events to initialize entity variants.
  • *
  • {@link #onReload(AddReloadListenerEvent)} - Handles reload events to refresh entity variants.
  • *
  • {@link #LoadEntityVariants(MinecraftServer)} - Loads entity variants from JSON files into the server.
  • *
@@ -53,14 +52,14 @@ public class ReloadHandler extends ReloadEventHandler { * Handles the server starting event to initialize the {@link MinecraftServer} instance * and load entity variants. * - * @param pEvent {@link ServerStartingEvent} - The event triggered when the server starts. + * @param pEvent {@link FMLServerStartingEvent} - The event triggered when the server starts. * * @since 1.0.0 * @author MeAlam * @Co-author Dan */ @SubscribeEvent - public static void onServerStart(ServerStartingEvent pEvent) { + public static void onServerStart(FMLServerStartingEvent pEvent) { server = pEvent.getServer(); ReloadHandler.LoadEntityVariants(server); } diff --git a/Forge/src/main/java/software/bluelib/example/init/ModEntities.java b/Forge/src/main/java/software/bluelib/example/init/ModEntities.java index 2825e2fe..8ee739dc 100644 --- a/Forge/src/main/java/software/bluelib/example/init/ModEntities.java +++ b/Forge/src/main/java/software/bluelib/example/init/ModEntities.java @@ -2,41 +2,35 @@ package software.bluelib.example.init; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; +import net.minecraft.entity.EntityClassification; +import net.minecraft.entity.EntityType; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; import software.bluelib.BlueLib; import software.bluelib.example.entity.dragon.DragonEntity; import software.bluelib.example.entity.rex.RexEntity; +@Mod.EventBusSubscriber(modid = BlueLib.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public class ModEntities { public static final DeferredRegister> REGISTER = - DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, BlueLib.MODID); + DeferredRegister.create(ForgeRegistries.ENTITIES, BlueLib.MODID); // List of Entities public static final RegistryObject> DRAGON = - REGISTER.register("example_one", () -> EntityType.Builder.of(DragonEntity::new, MobCategory.AMBIENT) - .setShouldReceiveVelocityUpdates(true) - .setTrackingRange(64) - .setUpdateInterval(3) - .fireImmune() + REGISTER.register("dragon", () -> EntityType.Builder.of(DragonEntity::new, EntityClassification.CREATURE) .sized(0.6f, 1.8f) .build(new ResourceLocation(BlueLib.MODID, "dragon").toString())); public static final RegistryObject> REX = - REGISTER.register("example_two", () -> EntityType.Builder.of(RexEntity::new, MobCategory.AMBIENT) - .setShouldReceiveVelocityUpdates(true) - .setTrackingRange(64) - .setUpdateInterval(3) - .fireImmune() + REGISTER.register("rex", () -> EntityType.Builder.of(RexEntity::new, EntityClassification.CREATURE) .sized(0.6f, 1.8f) .build(new ResourceLocation(BlueLib.MODID, "rex").toString())); public static void register(IEventBus eventBus) { REGISTER.register(eventBus); } -} +} \ No newline at end of file diff --git a/Forge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java b/Forge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java index 5273ec4e..e62ae544 100644 --- a/Forge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java +++ b/Forge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java @@ -4,6 +4,8 @@ import software.bluelib.interfaces.variant.base.IVariantEntityBase; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Random; @@ -47,7 +49,7 @@ public interface IVariantEntity extends IVariantEntityBase { * @since 1.0.0 */ default String getRandomVariant(List pVariantNamesList, String pDefaultVariant) { - List spawnableVariants = List.copyOf(pVariantNamesList); + List spawnableVariants = Collections.unmodifiableList(new ArrayList<>(pVariantNamesList)); if (!spawnableVariants.isEmpty()) { return spawnableVariants.get(random.nextInt(spawnableVariants.size())); } diff --git a/Forge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java b/Forge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java index 3b905d28..b3b31e69 100644 --- a/Forge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java +++ b/Forge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java @@ -2,7 +2,7 @@ package software.bluelib.interfaces.variant.base; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.ResourceLocation; import software.bluelib.entity.variant.VariantLoader; import software.bluelib.entity.variant.VariantParameter; diff --git a/Forge/src/main/java/software/bluelib/json/JSONLoader.java b/Forge/src/main/java/software/bluelib/json/JSONLoader.java index f046903c..41dbfee7 100644 --- a/Forge/src/main/java/software/bluelib/json/JSONLoader.java +++ b/Forge/src/main/java/software/bluelib/json/JSONLoader.java @@ -4,16 +4,17 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.Resource; -import net.minecraft.server.packs.resources.ResourceManager; +import com.google.gson.JsonSyntaxException; +import net.minecraft.resources.IResource; +import net.minecraft.resources.IResourceManager; +import net.minecraft.util.ResourceLocation; import software.bluelib.exception.CouldNotLoadJSON; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import java.util.Optional; /** * The {@code JSONLoader} class is responsible for loading and parsing JSON data from @@ -22,7 +23,7 @@ *

* Key methods: *

    - *
  • {@link #loadJson(ResourceLocation, ResourceManager)} - Loads a JSON resource.
  • + *
  • {@link #loadJson(ResourceLocation, IResourceManager)} - Loads a JSON resource.
  • *
* @author MeAlam * @Co-author Dan @@ -42,28 +43,30 @@ public class JSONLoader { * in a Minecraft mod environment. *

* @param pResourceLocation {@link ResourceLocation} - The {@link ResourceLocation} of the JSON resource. - * @param pResourceManager {@link ResourceManager} - The {@link ResourceManager} to load the resource. + * @param pResourceManager {@link IResourceManager} - The {@link IResourceManager} to load the resource. * @return The loaded {@link JsonObject}. * @throws CouldNotLoadJSON If the JSON could not be loaded. * @author MeAlam * @Co-author Dan * @since 1.0.0 */ - public JsonObject loadJson(ResourceLocation pResourceLocation, ResourceManager pResourceManager) throws CouldNotLoadJSON { + public JsonObject loadJson(ResourceLocation pResourceLocation, IResourceManager pResourceManager) throws CouldNotLoadJSON { try { - Optional resource = pResourceManager.getResource(pResourceLocation); + IResource resource = pResourceManager.getResource(pResourceLocation); - if (resource.isEmpty()) { - return new JsonObject(); - } - - try (InputStream inputStream = resource.get().open(); + try (InputStream inputStream = resource.getInputStream(); InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) { return gson.fromJson(reader, JsonObject.class); } - } catch (IOException pException) { - throw new CouldNotLoadJSON("Failed to load JSON from resource: " + pResourceLocation + ". Error: " + pException.getMessage(), pResourceLocation.toString()); + } catch (IOException e) { + if (e instanceof FileNotFoundException) { + return new JsonObject(); // Return an empty JsonObject if the file is not found + } else { + throw new CouldNotLoadJSON("Failed to load JSON from resource: " + pResourceLocation + ". Error: " + e.getMessage(), pResourceLocation.toString()); + } + } catch (JsonSyntaxException e) { + throw new CouldNotLoadJSON("Malformed JSON at resource: " + pResourceLocation + ". Error: " + e.getMessage(), pResourceLocation.toString()); } } } diff --git a/Forge/src/main/java/software/bluelib/utils/ParameterUtils.java b/Forge/src/main/java/software/bluelib/utils/ParameterUtils.java index 3994cdf5..69e90b4d 100644 --- a/Forge/src/main/java/software/bluelib/utils/ParameterUtils.java +++ b/Forge/src/main/java/software/bluelib/utils/ParameterUtils.java @@ -2,8 +2,8 @@ package software.bluelib.utils; -import software.bluelib.entity.variant.VariantParameter; import software.bluelib.entity.variant.VariantLoader; +import software.bluelib.entity.variant.VariantParameter; import java.util.HashMap; import java.util.Map; diff --git a/NeoForge/.gitignore b/NeoForge/.gitignore deleted file mode 100644 index 31d25505..00000000 --- a/NeoForge/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -# eclipse -bin -*.launch -.settings -.metadata -.classpath -.project - -# idea -out -*.ipr -*.iws -*.iml -.idea - -# gradle -build -.gradle - -# other -eclipse -run -runs -run-data - -repo \ No newline at end of file diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle deleted file mode 100644 index 9277256f..00000000 --- a/NeoForge/build.gradle +++ /dev/null @@ -1,114 +0,0 @@ - plugins { - id 'java-library' - id 'eclipse' - id 'idea' - id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.97' -} - -version = mod_version -group = mod_group_id - -repositories { - maven { - url "https://cursemaven.com" - } - mavenCentral() - mavenLocal() -} - -base { - archivesName = "${mod_id}-neoforge-${minecraft_version}" -} - -java.toolchain.languageVersion = JavaLanguageVersion.of(17) - -//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') -//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager - -runs { - configureEach { - systemProperty 'forge.logging.markers', 'REGISTRIES' - - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - systemProperty 'forge.logging.console.level', 'debug' - - modSource project.sourceSets.main - } - - client { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id - } - - server { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id - programArgument '--nogui' - } - - gameTestServer { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id - } - - data { - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() - } -} - -sourceSets.main.resources { srcDir 'src/generated/resources' } - -configurations { - runtimeClasspath.extendsFrom localRuntime -} - -dependencies { - implementation "net.neoforged:neoforge:${neo_version}" - runtimeOnly "curse.maven:geckolib-388172:5188406" - compileOnly "curse.maven:geckolib-388172:5188406" -} - -jar { - manifest { - attributes([ - "Specification-Title" : mod_name, - "Specification-Vendor" : mod_authors, - "Specification-Version" : mod_version, - "Implementation-Title" : mod_name, - "Implementation-Version" : mod_version, - "Implementation-Vendor" : mod_authors, - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - ]) - } -} - -// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html -tasks.withType(ProcessResources).configureEach { - var replaceProperties = [ - minecraft_version : minecraft_version, - minecraft_version_range: minecraft_version_range, - neo_version : neo_version, - neo_version_range : neo_version_range, - loader_version_range : loader_version_range, - mod_id : mod_id, - mod_name : mod_name, - mod_license : mod_license, - mod_version : mod_version, - mod_authors : mod_authors, - mod_description : mod_description - ] - inputs.properties replaceProperties - - filesMatching(['META-INF/mods.toml']) { - expand replaceProperties - } -} - -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' -} - -idea { - module { - downloadSources = true - downloadJavadoc = true - } -} diff --git a/NeoForge/changelog.txt b/NeoForge/changelog.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/NeoForge/gradle.properties b/NeoForge/gradle.properties deleted file mode 100644 index b6f428a5..00000000 --- a/NeoForge/gradle.properties +++ /dev/null @@ -1,22 +0,0 @@ -#org.gradle.jvmargs= -org.gradle.daemon=false -org.gradle.debug=false - -neogradle.subsystems.parchment.minecraftVersion=1.20.3 -neogradle.subsystems.parchment.mappingsVersion=2023.12.31 -minecraft_version=1.20.4 -minecraft_version_range=[1.20.4,1.21) -neo_version=20.4.237 -neo_version_range=[20.4,) -loader_version_range=[2,) -geckolib_version=4.4.4 - -## Mod Properties - -mod_id=bluelib -mod_name=BlueLib -mod_license=MIT License -mod_version=1.0.0 -mod_group_id=software.bluelib -mod_authors=Dan, Aram -mod_description=BlueLib is an All round Minecraft mod library that offers data-driven features, allowing users to implement and customize its features with full freedom. \nIt supports both Resource and Datapacks, ensuring seamless integration and flexibility. \ No newline at end of file diff --git a/NeoForge/gradle/wrapper/gradle-wrapper.jar b/NeoForge/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 2c3521197d7c4586c843d1d3e9090525f1898cde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) diff --git a/NeoForge/gradle/wrapper/gradle-wrapper.properties b/NeoForge/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 09523c0e..00000000 --- a/NeoForge/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/NeoForge/gradlew b/NeoForge/gradlew deleted file mode 100644 index f5feea6d..00000000 --- a/NeoForge/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/NeoForge/gradlew.bat b/NeoForge/gradlew.bat deleted file mode 100644 index 9d21a218..00000000 --- a/NeoForge/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/NeoForge/settings.gradle b/NeoForge/settings.gradle deleted file mode 100644 index ada876e2..00000000 --- a/NeoForge/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - maven { url = 'https://maven.neoforged.net/releases' } - } -} - -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' -} diff --git a/NeoForge/src/main/java/software/bluelib/BlueLib.java b/NeoForge/src/main/java/software/bluelib/BlueLib.java deleted file mode 100644 index e73d1c98..00000000 --- a/NeoForge/src/main/java/software/bluelib/BlueLib.java +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib; - -import net.neoforged.bus.api.IEventBus; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; -import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.neoforged.fml.loading.FMLEnvironment; -import software.bluelib.example.event.ClientEvents; -import software.bluelib.example.init.ModEntities; - -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -/** - * The main class of the {@link BlueLib} mod. - *

- * This class serves as the entry point for the {@link BlueLib} mod, handling initialization by registering event handlers - * and setting up necessary configurations. For more details, refer to the BlueLib Wiki. - *

- * - *

- * Key Methods: - *

    - *
  • {@link #BlueLib(IEventBus)} - Constructs the {@link BlueLib} instance and registers the mod event bus.
  • - *
  • {@link #onLoadComplete(FMLLoadCompleteEvent)} - Handles the event when the mod loading is complete and prints a thank-you message if in developer mode.
  • - *
  • {@link #isDeveloperMode()} - Determines if the mod is running in developer mode.
  • - *
- *

- * - * @see BlueLib Wiki - * @author MeAlam, Dan - * @Co-author All Contributors of BlueLib! - * @since 1.0.0 - */ -@Mod(BlueLib.MODID) -public class BlueLib { - - /** - * A {@link ScheduledExecutorService} used for scheduling tasks, such as printing messages after a delay. - *

- * This is initialized with a single-threaded pool to handle delayed tasks in a separate thread. - *

- * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); - - /** - * The Mod ID for {@link BlueLib}. This serves as a unique identifier for the mod. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - public static final String MODID = "bluelib"; - - // public static final Logger LOGGER = LogUtils.getLogger(); - - /** - * Constructs a new {@link BlueLib} instance and registers the mod event bus. - * - * @param pModEventBus {@link IEventBus} - The event bus to which the mod will register its event handlers. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public BlueLib(IEventBus pModEventBus) { - pModEventBus.register(this); - if (isDeveloperMode()) { - ModEntities.REGISTRY.register(pModEventBus); - - pModEventBus.addListener(ClientEvents::registerAttributes); - pModEventBus.addListener(ClientEvents::registerRenderers); - } - } - - /** - * Handles the {@link FMLLoadCompleteEvent}, which is triggered when the mod loading process is complete. - *

- * If the mod is running in developer mode, it schedules a task to print a thank-you message to the console after a short delay. - *

- * - * @param pEvent {@link FMLLoadCompleteEvent} - The event triggered upon the completion of the mod loading process. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - @SubscribeEvent - public void onLoadComplete(FMLLoadCompleteEvent pEvent) { - if (isDeveloperMode()) { - scheduler.schedule(() -> { - System.out.println(""" - - ************************************************** - * * - * Thank you for using BlueLib! * - * We appreciate your support. * - * * - ************************************************** - """); - scheduler.shutdown(); - }, 3, TimeUnit.SECONDS); - } - } - - /** - * Checks if the mod is running in developer mode. - *

- * Developer mode is determined by checking if the mod is not running in a production environment. - *

- * - * @return {@code true} if the mod is running in developer mode, {@code false} otherwise. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - static boolean isDeveloperMode() { - return !FMLEnvironment.production; - } -} diff --git a/NeoForge/src/main/java/software/bluelib/entity/variant/VariantLoader.java b/NeoForge/src/main/java/software/bluelib/entity/variant/VariantLoader.java deleted file mode 100644 index 3dc0034b..00000000 --- a/NeoForge/src/main/java/software/bluelib/entity/variant/VariantLoader.java +++ /dev/null @@ -1,169 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.entity.variant; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.packs.resources.ResourceManager; -import software.bluelib.interfaces.variant.base.IVariantEntityBase; -import software.bluelib.json.JSONLoader; -import software.bluelib.json.JSONMerger; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * A {@link VariantLoader} class that loads and manages {@link VariantParameter} for entities by merging JSON data from multiple sources. - *

- * Key Methods: - *

    - *
  • {@link #loadVariants(ResourceLocation, ResourceLocation, MinecraftServer, String)} - Loads and merges variant data from both the main mod and the latest datapack.
  • - *
  • {@link #getVariantsFromEntity(String)} - Retrieves the list of loaded {@link VariantParameter} for a specific entity.
  • - *
  • {@link #getVariantByName(String, String)} - Retrieves a specific {@link VariantParameter} by its name for a given entity.
  • - *
- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class VariantLoader implements IVariantEntityBase { - - /** - * A {@link Map} to store loaded {@link VariantParameter} for each entity type. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private static final Map> entityVariantsMap = new HashMap<>(); - - /** - * A {@link JSONLoader} instance to load JSON data. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private static final JSONLoader jsonLoader = new JSONLoader(); - - /** - * A {@link JSONMerger} instance to merge JSON data. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private static final JSONMerger jsonMerger = new JSONMerger(); - - /** - * A {@code void} method that loads and merges variant data from both the Main Mod and the Latest Datapack. - * Parses the merged data into {@link VariantParameter}. - * - * @param pJSONLocationMod {@link ResourceLocation} - The {@link ResourceLocation} of the Mod's JSON data. - * @param pJSONLocationData {@link ResourceLocation} - The {@link ResourceLocation} of the Latest DataPack's JSON data. - * @param pServer {@link MinecraftServer} - The {@link MinecraftServer} instance. - * @param pEntityName {@link String} - The name of the entity whose variants should be cleared before loading new ones. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public static void loadVariants(ResourceLocation pJSONLocationMod, ResourceLocation pJSONLocationData, MinecraftServer pServer, String pEntityName) { - clearVariantsForEntity(pEntityName); - ResourceManager resourceManager = pServer.getResourceManager(); - JsonObject mergedJsonObject = new JsonObject(); - - JsonObject modJson = jsonLoader.loadJson(pJSONLocationMod, resourceManager); - JsonObject dataJson = jsonLoader.loadJson(pJSONLocationData, resourceManager); - - jsonMerger.mergeJsonObjects(mergedJsonObject, modJson); - jsonMerger.mergeJsonObjects(mergedJsonObject, dataJson); - - parseVariants(mergedJsonObject); - } - - /** - * A {@code void} method that clears variants for a specific entity type from the map. - * - * @param pEntityName {@link String} - The name of the entity whose variants should be cleared. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - private static void clearVariantsForEntity(String pEntityName) { - entityVariantsMap.remove(pEntityName); - } - - /** - * A {@code void} method that parses the merged JSON data and converts it into {@link VariantParameter} instances. - * - * @param pJsonObject {@link JsonObject} - The merged {@link JsonObject} containing variant data. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - private static void parseVariants(JsonObject pJsonObject) { - for (Map.Entry entry : pJsonObject.entrySet()) { - String entityName = entry.getKey(); - JsonArray textureArray = entry.getValue().getAsJsonArray(); - - List variantList = entityVariantsMap.computeIfAbsent(entityName, k -> new ArrayList<>()); - - for (JsonElement variant : textureArray) { - VariantParameter newVariant = getEntityVariant(entityName, variant.getAsJsonObject()); - - boolean variantExists = variantList.stream() - .anyMatch(v -> v.equals(newVariant)); - - if (!variantExists) { - variantList.add(newVariant); - } - } - } - } - - /** - * A {@link VariantParameter} method that creates a new {@link VariantParameter} instance from a JSON object. - * - * @param pJsonKey {@link String} - The key associated with this variant. - * @param pJsonObject {@link JsonObject} - The {@link JsonObject} containing the variant data. - * @return A {@link VariantParameter} instance. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - private static VariantParameter getEntityVariant(String pJsonKey, JsonObject pJsonObject) { - return new VariantParameter(pJsonKey, pJsonObject); - } - - /** - * A {@link List} method that retrieves the {@link List} of loaded {@link VariantParameter} - * for a specific entity. - * - * @param pEntityName {@link String} - The name of the entity to retrieve variants for. - * @return A {@link List} of {@link VariantParameter} instances for the specified entity. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public static List getVariantsFromEntity(String pEntityName) { - return entityVariantsMap.getOrDefault(pEntityName, new ArrayList<>()); - } - - /** - * A {@link VariantParameter} method that retrieves a {@link VariantParameter} by its name for a specific entity. - * - * @param pEntityName {@link String} - The name of the entity to retrieve variants for. - * @param pVariantName {@link String} - The name of the variant to retrieve. - * @return The {@link VariantParameter} with the specified name, or {@code null} if not found. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public static VariantParameter getVariantByName(String pEntityName, String pVariantName) { - List variants = getVariantsFromEntity(pEntityName); - for (VariantParameter variant : variants) { - if (variant.getVariantName().equals(pVariantName)) { - return variant; - } - } - return null; - } -} diff --git a/NeoForge/src/main/java/software/bluelib/entity/variant/VariantParameter.java b/NeoForge/src/main/java/software/bluelib/entity/variant/VariantParameter.java deleted file mode 100644 index db3d3319..00000000 --- a/NeoForge/src/main/java/software/bluelib/entity/variant/VariantParameter.java +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.entity.variant; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import software.bluelib.entity.variant.base.ParameterBase; - -import java.util.Map; -import java.util.Set; - -/** - * A {@code VariantParameter} class that represents the parameters associated with a specific variant of an entity. - *

- * This class extends {@link ParameterBase} to store and manage variant-specific parameters parsed from a JSON object. - *

- * The class is designed to handle various JSON element types, including {@code JsonPrimitive}, {@code JsonArray}, and {@code JsonObject}. - *

- * Key Methods: - *
    - *
  • {@link #getJsonKey()} - Retrieves the key of the JSON object that identifies this entity.
  • - *
  • {@link #getVariantName()} - Retrieves the name of the variant.
  • - *
  • {@link #getParameter(String)} - Retrieves the value of a specific parameter by its key.
  • - *
- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class VariantParameter extends ParameterBase { - - /** - * A {@link String} that represents the key of the JSON object that identifies this entity. - *

- * This key is used to map the entity to its corresponding parameters within a {@link JsonObject}. - *

- * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private final String jsonKey; - - /** - * Constructs a new {@code VariantParameter} instance by extracting parameters from a given JSON object. - *

- * This constructor processes different types of {@link JsonElement} values: - *

    - *
  • {@code JsonPrimitive}: Stored directly as a string.
  • - *
  • {@code JsonArray}: Converts array elements into a single comma-separated string.
  • - *
  • {@code JsonObject}: Converts the nested JSON object to a string representation.
  • - *
  • {@code Other Types}: Stores "null" for unhandled JSON types.
  • - *
- *

- * @param pJsonKey {@link String} - The key that identifies this entity within the {@link JsonObject}. - * @param pJsonObject {@link JsonObject} - The {@link JsonObject} containing the variant parameters. - * @throws IllegalArgumentException if {@code pJsonKey} or {@code pJsonObject} is null. - * @see ParameterBase - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public VariantParameter(String pJsonKey, JsonObject pJsonObject) { - if (pJsonKey == null || pJsonObject == null) { - throw new IllegalArgumentException("JSON key and object must not be null"); - } - this.jsonKey = pJsonKey; - Set> entryMap = pJsonObject.entrySet(); - for (Map.Entry entry : entryMap) { - JsonElement element = entry.getValue(); - if (element.isJsonPrimitive()) { - addParameter(entry.getKey(), element.getAsString()); - } else if (element.isJsonArray()) { - StringBuilder arrayValues = new StringBuilder(); - element.getAsJsonArray().forEach(e -> arrayValues.append(e.getAsString()).append(",")); - if (!arrayValues.isEmpty()) { - arrayValues.setLength(arrayValues.length() - 1); - } - addParameter(entry.getKey(), arrayValues.toString()); - } else if (element.isJsonObject()) { - addParameter(entry.getKey(), element.toString()); - } else { - addParameter(entry.getKey(), "null"); - } - } - } - - /** - * A {@link String} method that returns the key of the {@link JsonObject} that identifies this entity. - *

- * This key is typically used to retrieve or map the entity within a broader data structure. - *

- * @return The key of the JSON object representing this entity. - * @throws IllegalStateException if the key is unexpectedly null. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public String getJsonKey() { - if (this.jsonKey == null) { - throw new IllegalStateException("JSON key should not be null"); - } - return this.jsonKey; - } - - /** - * A {@link String} method that retrieves the name of the variant. - *

- * The variant name is expected to be stored under the key {@code "variantName"} in the parameters/JSON Files. - *

- * @return The name of the variant, or {@code null} if the variant name is not found. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public String getVariantName() { - return getParameter("variantName"); - } - - /** - * A {@link String} method that retrieves the value of a specific parameter by its key. - *

- * This method looks up the parameter's value within the internal data structure. - *

- * @param pKey {@link String} - The key of the parameter to retrieve. - * @return The value of the parameter, or {@code null} if the key does not exist. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public String getParameter(String pKey) { - return (String) super.getParameter(pKey); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/entity/variant/base/ParameterBase.java b/NeoForge/src/main/java/software/bluelib/entity/variant/base/ParameterBase.java deleted file mode 100644 index 2f1af3a1..00000000 --- a/NeoForge/src/main/java/software/bluelib/entity/variant/base/ParameterBase.java +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.entity.variant.base; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * An {@code Abstract base class} for managing a collection of parameters. - *

- * Key Methods: - *

    - *
  • {@link #addParameter(String, Object)} - Adds a parameter to the collection.
  • - *
  • {@link #getParameter(String)} - Retrieves a parameter from the collection.
  • - *
  • {@link #removeParameter(String)} - Removes a parameter from the collection.
  • - *
  • {@link #getAllParameters()} - Returns all parameters in the collection.
  • - *
  • {@link #containsParameter(String)} - Checks if a parameter exists by its key.
  • - *
  • {@link #isEmpty()} - Checks if the collection of parameters is empty.
  • - *
  • {@link #clearParameters()} - Clears all parameters from the collection.
  • - *
  • {@link #getParameterCount()} - Returns the number of parameters in the collection.
  • - *
  • {@link #getParameterKeys()} - Returns a set of all parameter keys.
  • - *
  • {@link #getParameterValues()} - Returns a collection of all parameter values.
  • - *
  • {@link #updateParameter(String, Object)} - Updates the value of an existing parameter.
  • - *
- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public abstract class ParameterBase { - - /** - * A {@link Map} to store parameters as key-value pairs. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private final Map parameters = new HashMap<>(); - - /** - * A {@code void} method to add a parameter to the collection. - * - * @param pKey {@link String} - The key under which the parameter is stored. - * @param pValue {@link Object} - The value of the parameter. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected void addParameter(String pKey, Object pValue) { - parameters.put(pKey, pValue); - } - - /** - * An {@link Object} method to retrieve a parameter from the collection by its key. - * - * @param pKey {@link String} - The key of the parameter to retrieve. - * @return The value associated with the key, or {@code null} if the key does not exist. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected Object getParameter(String pKey) { - return parameters.get(pKey); - } - - /** - * A {@code Void} that removes a parameter from the collection by its key. - * - * @param pKey {@link String} - The key of the parameter to remove. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected void removeParameter(String pKey) { - parameters.remove(pKey); - } - - /** - * A {@link Map} method that returns all parameters in the collection. - * - * @return A {@link Map} containing all parameters. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected Map getAllParameters() { - return new HashMap<>(parameters); - } - - /** - * A {@link Boolean} method that checks if a parameter exists by its key. - * - * @param pKey {@link String} - The key of the parameter to check. - * @return {@code true} if the parameter exists, {@code false} otherwise. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected boolean containsParameter(String pKey) { - return parameters.containsKey(pKey); - } - - /** - * A {@link Boolean} method that checks if the collection of parameters is empty. - * - * @return {@code true} if the collection is empty, {@code false} otherwise. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected boolean isEmpty() { - return parameters.isEmpty(); - } - - /** - * A {@code void} method that clears all parameters from the collection. - * - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected void clearParameters() { - parameters.clear(); - } - - /** - * An {@link Integer} method that returns the number of parameters in the collection. - * - * @return The number of parameters in the collection. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected int getParameterCount() { - return parameters.size(); - } - - /** - * A {@link Set} method that returns a set of all parameter keys. - * - * @return A {@link Set} containing all parameter keys. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected Set getParameterKeys() { - return parameters.keySet(); - } - - /** - * A {@link Collection} method that returns a collection of all parameter values. - * - * @return A {@link Collection} containing all parameter values. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected Collection getParameterValues() { - return parameters.values(); - } - - /** - * A {@code void} method that updates the value of an existing parameter. - * - * @param pKey {@link String} - The key of the parameter to update. - * @param pNewValue {@link Object} - The new value to set for the parameter. - * @throws IllegalArgumentException if the key does not exist. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - protected void updateParameter(String pKey, Object pNewValue) { - if (parameters.containsKey(pKey)) { - parameters.put(pKey, pNewValue); - } else { - throw new IllegalArgumentException("Key does not exist: " + pKey); - } - } -} diff --git a/NeoForge/src/main/java/software/bluelib/event/ReloadEventHandler.java b/NeoForge/src/main/java/software/bluelib/event/ReloadEventHandler.java deleted file mode 100644 index 9a095c52..00000000 --- a/NeoForge/src/main/java/software/bluelib/event/ReloadEventHandler.java +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.event; - -import com.google.gson.JsonParseException; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import software.bluelib.entity.variant.VariantLoader; - -/** - * A {@code ReloadEventHandler} class responsible for handling events related to reloading entity variants. - *

- * This class includes methods for registering entity variants when the server starts. - *

- *

- * Key Features: - *

    - *
  • {@link #registerEntityVariants(MinecraftServer, String, String, String, String)} - Registers entity variants from specified locations.
  • - *
- *

- * @see VariantLoader - * @see MinecraftServer - * @see ResourceLocation - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class ReloadEventHandler { - - /** - * A {@code void} method that registers entity variants from specified locations. - *

- * This method attempts to load variants from both mod and datapack locations, providing status information - * and handling any exceptions that occur during the loading process. - *

- *

- * Parameters: - *

    - *
  • {@code pServer} - The server instance of the current world.
  • - *
  • {@code pEntityName} - The entity name to load.
  • - *
  • {@code pModID} - The mod ID used to locate the entity variant resources. (Use your Mod's ID)
  • - *
  • {@code pModPathLocation} - The path location within the mod where variants are stored.
  • - *
  • {@code pDataPathLocation} - The path location within the resource pack where variants are stored.
  • - *
- *

- *

- * Exception Handling: - *

    - *
  • {@code JsonParseException} - Thrown when there is an error parsing the JSON files.
  • - *
  • {@code RuntimeException} - Thrown for unexpected errors during the registration process.
  • - *
- *

- * @param pServer {@link MinecraftServer} - The server instance of the current world. - * @param pEntityName {@link String} - The entity name to load. - * @param pModID {@link String} - The mod ID used to locate the entity variant resources. (Use your Mod's ID) - * @param pModPathLocation {@link String} - The path location within the mod where variants are stored. - * @param pDataPathLocation {@link String} - The path location within the datapack where variants are stored. - * @throws JsonParseException if there is an error parsing the JSON files. - * @throws RuntimeException if an unexpected error occurs during the registration process. - * @see MinecraftServer - * @see ResourceLocation - * @see VariantLoader - * @author MeAlam - * @Co-author Dan - * @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); - try { - VariantLoader.loadVariants(modLocation, dataLocation, pServer, pEntityName); - } catch (JsonParseException pException) { - throw new RuntimeException("Failed to parse JSON(s) while registering entity variants for " + pEntityName + " from Mod with ModID: " + pModID, pException); - } catch (Exception pException) { - throw new RuntimeException("Unexpected error occurred while registering entity variants for " + pEntityName + " from Mod with ModID: " + pModID, pException); - } - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java b/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java deleted file mode 100644 index 00e15560..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonEntity.java +++ /dev/null @@ -1,220 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.entity.dragon; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.DifficultyInstance; -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.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.util.GeckoLibUtil; -import software.bluelib.interfaces.variant.IVariantEntity; -import software.bluelib.utils.ParameterUtils; - -/** - * A {@code DragonEntity} class representing a dragon entity in the game, which extends {@link TamableAnimal} - * and implements {@link IVariantEntity} and {@link GeoEntity}. - *

- * This class manages the dragon's variant system, its data synchronization, and integrates with the GeckoLib - * animation system. - *

- * - *

- * Key Methods: - *

    - *
  • {@link #defineSynchedData()} - Defines the synchronized data for the dragon entity, including its variant.
  • - *
  • {@link #addAdditionalSaveData(CompoundTag)} - Adds custom data to the entity's NBT for saving.
  • - *
  • {@link #readAdditionalSaveData(CompoundTag)} - Reads custom data from the entity's NBT for loading.
  • - *
  • {@link #finalizeSpawn(ServerLevelAccessor, DifficultyInstance, MobSpawnType, SpawnGroupData, CompoundTag)} - Finalizes the spawning process and sets up parameters.
  • - *
  • {@link #setVariantName(String)} - Sets the variant name of the dragon.
  • - *
  • {@link #getVariantName()} - Retrieves the current variant name of the dragon.
  • - *
- *

- * - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class DragonEntity extends TamableAnimal implements IVariantEntity, GeoEntity { - /** - * Entity data accessor for the variant of the dragon. - *

- * This is used to store and retrieve the variant data for synchronization between server and client. - *

- * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - public static final EntityDataAccessor VARIANT = SynchedEntityData.defineId(DragonEntity.class, EntityDataSerializers.STRING); - - /** - * The name of the entity. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - protected final String entityName = "dragon"; - - /** - * Constructs a new {@link DragonEntity} instance with the specified entity type and level. - * - * @param pEntityType {@link EntityType} - The type of the entity. - * @param pLevel {@link Level} - The level in which the entity is created. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public DragonEntity(EntityType pEntityType, Level pLevel) { - super(pEntityType, pLevel); - } - - /** - * Defines the synchronized data for this dragon entity, including the variant. - *

- * This method initializes the {@link EntityDataAccessor} to handle the variant data. - *

- * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @Override - protected void defineSynchedData() { - super.defineSynchedData(); - this.entityData.define(VARIANT, "normal"); - } - - /** - * Adds custom data to the entity's NBT tag for saving. - *

- * This method stores the variant name in the NBT data so it can be restored when loading the entity. - *

- * - * @param pCompound {@link CompoundTag} - The NBT tag to which data should be added. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @Override - public void addAdditionalSaveData(@NotNull CompoundTag pCompound) { - super.addAdditionalSaveData(pCompound); - pCompound.putString("Variant", getVariantName()); - } - - /** - * Reads custom data from the entity's NBT tag for loading. - *

- * This method retrieves the variant name from the NBT data and sets it for the entity. - *

- * - * @param pCompound {@link CompoundTag} - The NBT tag from which data should be read. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @Override - public void readAdditionalSaveData(@NotNull CompoundTag pCompound) { - super.readAdditionalSaveData(pCompound); - this.setVariantName(pCompound.getString("Variant")); - } - - /** - * Finalizes the spawning of the dragon entity. - *

- * This method sets up the variant for the entity and connects parameters if needed. - *

- * - * @param pLevel {@link ServerLevelAccessor} - The level in which the entity is spawned. - * @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) { - if (getVariantName() == null || getVariantName().isEmpty()) { - this.setVariantName(getRandomVariant(getEntityVariants(entityName), "normal")); - ParameterUtils.ParameterBuilder.forVariant(entityName,this.getVariantName()) - .withParameter("customParameter") - .withParameter("int") - .withParameter("bool") - .withParameter("array") - .connect(); - } - return super.finalizeSpawn(pLevel, pDifficulty, pReason, pSpawnData, pDataTag); - } - - /** - * Sets the variant name for the dragon entity. - * - * @param pName {@link String} - The name of the variant to set. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public void setVariantName(String pName) { - this.entityData.set(VARIANT, pName); - } - - /** - * Retrieves the current variant name of the dragon entity. - * - * @return {@link String} - The current variant name. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public String getVariantName() { - return this.entityData.get(VARIANT); - } - - /** - * All Code below this Fragment is not Library Related!!! - */ - - private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - - public static AttributeSupplier.Builder createAttributes() { - return Mob.createMobAttributes() - .add(Attributes.MOVEMENT_SPEED, 0.3) - .add(Attributes.MAX_HEALTH, 10) - .add(Attributes.ARMOR, 0) - .add(Attributes.ATTACK_DAMAGE, 3) - .add(Attributes.FOLLOW_RANGE, 16) - .add(Attributes.FLYING_SPEED, 0.3); - } - - @Override - public void registerControllers(AnimatableManager.ControllerRegistrar pControllerRegistrar) { - } - - @Override - public AnimatableInstanceCache getAnimatableInstanceCache() { - return cache; - } - - @Nullable - @Override - public AgeableMob getBreedOffspring(@NotNull ServerLevel pLevel, @NotNull AgeableMob pOtherParent) { - return null; - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java b/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java deleted file mode 100644 index 67091901..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonModel.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.entity.dragon; - -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.model.GeoModel; -import software.bluelib.BlueLib; - -public class DragonModel extends GeoModel { - - - // Get the Model Location - @Override - public ResourceLocation getModelResource(DragonEntity pObject) { - return new ResourceLocation(BlueLib.MODID, "geo/dragon.geo.json"); - } - - // Get the Texture Location - @Override - public ResourceLocation getTextureResource(DragonEntity pObject) { - return pObject.getTextureLocation(BlueLib.MODID, "textures/entity/" + pObject.entityName + "/" + pObject.getVariantName() + ".png"); - } - - // Get the Animation Location - @Override - public ResourceLocation getAnimationResource(DragonEntity pAnimatable) { - return new ResourceLocation(BlueLib.MODID, "animations/dragon.animation.json"); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java b/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java deleted file mode 100644 index c770ac48..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/entity/dragon/DragonRender.java +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.entity.dragon; - -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.renderer.GeoEntityRenderer; - -public class DragonRender extends GeoEntityRenderer { - - // Render the entity - public DragonRender(EntityRendererProvider.Context pRenderManager) { - super(pRenderManager, new DragonModel()); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java b/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java deleted file mode 100644 index fcb85a52..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexEntity.java +++ /dev/null @@ -1,220 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.entity.rex; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.DifficultyInstance; -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.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.util.GeckoLibUtil; -import software.bluelib.interfaces.variant.IVariantEntity; -import software.bluelib.utils.ParameterUtils; - -/** - * A {@code RexEntity} class representing a Rex entity in the game, which extends {@link TamableAnimal} - * and implements {@link IVariantEntity} and {@link GeoEntity}. - *

- * This class manages the rex's variant system, its data synchronization, and integrates with the GeckoLib - * animation system. - *

- * - *

- * Key Methods: - *

    - *
  • {@link #defineSynchedData()} - Defines the synchronized data for the rex entity, including its variant.
  • - *
  • {@link #addAdditionalSaveData(CompoundTag)} - Adds custom data to the entity's NBT for saving.
  • - *
  • {@link #readAdditionalSaveData(CompoundTag)} - Reads custom data from the entity's NBT for loading.
  • - *
  • {@link #finalizeSpawn(ServerLevelAccessor, DifficultyInstance, MobSpawnType, SpawnGroupData, CompoundTag)} - Finalizes the spawning process and sets up parameters.
  • - *
  • {@link #setVariantName(String)} - Sets the variant name of the rex.
  • - *
  • {@link #getVariantName()} - Retrieves the current variant name of the rex.
  • - *
- *

- * - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class RexEntity extends TamableAnimal implements IVariantEntity, GeoEntity { - /** - * Entity data accessor for the variant of the rex. - *

- * This is used to store and retrieve the variant data for synchronization between server and client. - *

- * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - public static final EntityDataAccessor VARIANT = SynchedEntityData.defineId(RexEntity.class, EntityDataSerializers.STRING); - - /** - * The name of the entity. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - protected final String entityName = "rex"; - - /** - * Constructs a new {@link RexEntity} instance with the specified entity type and level. - * - * @param pEntityType {@link EntityType} - The type of the entity. - * @param pLevel {@link Level} - The level in which the entity is created. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public RexEntity(EntityType pEntityType, Level pLevel) { - super(pEntityType, pLevel); - } - - /** - * Defines the synchronized data for this rex entity, including the variant. - *

- * This method initializes the {@link EntityDataAccessor} to handle the variant data. - *

- * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @Override - protected void defineSynchedData() { - super.defineSynchedData(); - this.entityData.define(VARIANT, "normal"); - } - - /** - * Adds custom data to the entity's NBT tag for saving. - *

- * This method stores the variant name in the NBT data so it can be restored when loading the entity. - *

- * - * @param pCompound {@link CompoundTag} - The NBT tag to which data should be added. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @Override - public void addAdditionalSaveData(@NotNull CompoundTag pCompound) { - super.addAdditionalSaveData(pCompound); - pCompound.putString("Variant", getVariantName()); - } - - /** - * Reads custom data from the entity's NBT tag for loading. - *

- * This method retrieves the variant name from the NBT data and sets it for the entity. - *

- * - * @param pCompound {@link CompoundTag} - The NBT tag from which data should be read. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @Override - public void readAdditionalSaveData(@NotNull CompoundTag pCompound) { - super.readAdditionalSaveData(pCompound); - this.setVariantName(pCompound.getString("Variant")); - } - - /** - * Finalizes the spawning of the rex entity. - *

- * This method sets up the variant for the entity and connects parameters if needed. - *

- * - * @param pLevel {@link ServerLevelAccessor} - The level in which the entity is spawned. - * @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) { - if (getVariantName() == null || getVariantName().isEmpty()) { - this.setVariantName(getRandomVariant(getEntityVariants(entityName), "normal")); - ParameterUtils.ParameterBuilder.forVariant(entityName,this.getVariantName()) - .withParameter("customParameter") - .withParameter("int") - .withParameter("bool") - .withParameter("array") - .connect(); - } - return super.finalizeSpawn(pLevel, pDifficulty, pReason, pSpawnData, pDataTag); - } - - /** - * Sets the variant name for the rex entity. - * - * @param pName {@link String} - The name of the variant to set. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public void setVariantName(String pName) { - this.entityData.set(VARIANT, pName); - } - - /** - * Retrieves the current variant name of the rex entity. - * - * @return {@link String} - The current variant name. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public String getVariantName() { - return this.entityData.get(VARIANT); - } - - /** - * All Code below this Fragment is not Library Related!!! - */ - - private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - - public static AttributeSupplier.Builder createAttributes() { - return Mob.createMobAttributes() - .add(Attributes.MOVEMENT_SPEED, 0.3) - .add(Attributes.MAX_HEALTH, 10) - .add(Attributes.ARMOR, 0) - .add(Attributes.ATTACK_DAMAGE, 3) - .add(Attributes.FOLLOW_RANGE, 16) - .add(Attributes.FLYING_SPEED, 0.3); - } - - @Override - public void registerControllers(AnimatableManager.ControllerRegistrar pControllerRegistrar) { - } - - @Override - public AnimatableInstanceCache getAnimatableInstanceCache() { - return cache; - } - - @Nullable - @Override - public AgeableMob getBreedOffspring(@NotNull ServerLevel pLevel, @NotNull AgeableMob pOtherParent) { - return null; - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexModel.java b/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexModel.java deleted file mode 100644 index 6084892c..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexModel.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.entity.rex; - -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.model.GeoModel; -import software.bluelib.BlueLib; - -public class RexModel extends GeoModel { - - - // Get the Model Location - @Override - public ResourceLocation getModelResource(RexEntity pObject) { - return new ResourceLocation(BlueLib.MODID, "geo/rex.geo.json"); - } - - // Get the Texture Location - @Override - public ResourceLocation getTextureResource(RexEntity pObject) { - return pObject.getTextureLocation(BlueLib.MODID, "textures/entity/" + pObject.entityName + "/" + pObject.getVariantName() + ".png"); - } - - // Get the Animation Location - @Override - public ResourceLocation getAnimationResource(RexEntity pAnimatable) { - return new ResourceLocation(BlueLib.MODID, "animations/rex.animation.json"); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexRender.java b/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexRender.java deleted file mode 100644 index 776c5920..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/entity/rex/RexRender.java +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.entity.rex; - -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.renderer.GeoEntityRenderer; - -public class RexRender extends GeoEntityRenderer { - - // Render the entity - public RexRender(EntityRendererProvider.Context pRenderManager) { - super(pRenderManager, new RexModel()); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/event/ClientEvents.java b/NeoForge/src/main/java/software/bluelib/example/event/ClientEvents.java deleted file mode 100644 index 8d3a63de..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/event/ClientEvents.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.event; - -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.neoforge.client.event.EntityRenderersEvent; -import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent; -import software.bluelib.example.entity.dragon.DragonEntity; -import software.bluelib.example.entity.dragon.DragonRender; -import software.bluelib.example.entity.rex.RexEntity; -import software.bluelib.example.entity.rex.RexRender; -import software.bluelib.example.init.ModEntities; - -public class ClientEvents { - @SubscribeEvent - public static void registerRenderers(final EntityRenderersEvent.RegisterRenderers pEvent) { - // Register the renderer for all the Entities - pEvent.registerEntityRenderer(ModEntities.DRAGON.get(), DragonRender::new); - pEvent.registerEntityRenderer(ModEntities.REX.get(), RexRender::new); - } - - // Register the Attributes - @SubscribeEvent - public static void registerAttributes(EntityAttributeCreationEvent pEvent) { - pEvent.put(ModEntities.DRAGON.get(), DragonEntity.createAttributes().build()); - pEvent.put(ModEntities.REX.get(), RexEntity.createAttributes().build()); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/event/ReloadHandler.java b/NeoForge/src/main/java/software/bluelib/example/event/ReloadHandler.java deleted file mode 100644 index 5c6bacca..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/event/ReloadHandler.java +++ /dev/null @@ -1,142 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.event; - -import net.minecraft.server.MinecraftServer; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; -import net.neoforged.neoforge.event.AddReloadListenerEvent; -import net.neoforged.neoforge.event.server.ServerStartingEvent; -import software.bluelib.BlueLib; -import software.bluelib.event.ReloadEventHandler; - -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -/** - * A {@code ReloadHandler} class that handles server start and reload events related to entity variants. - *

- * This class extends {@link ReloadEventHandler} and implements event handling for server starting and reloading, - * ensuring that entity variant data is properly loaded and refreshed. - *

- * - *

- * Key Methods: - *

    - *
  • {@link #onServerStart(ServerStartingEvent)} - Handles server starting events to initialize entity variants.
  • - *
  • {@link #onReload(AddReloadListenerEvent)} - Handles reload events to refresh entity variants.
  • - *
  • {@link #LoadEntityVariants(MinecraftServer)} - Loads entity variants from JSON files into the server.
  • - *
- *

- * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ -@Mod.EventBusSubscriber -public class ReloadHandler extends ReloadEventHandler { - - /** - * The {@link MinecraftServer} instance for the server handling the events. - *

- * This is initialized when the server starts and used to load entity variants. - *

- * - * @since 1.0.0 - * @Co-author MeAlam, Dan - */ - private static MinecraftServer server; - - /** - * Handles the server starting event to initialize the {@link MinecraftServer} instance - * and load entity variants. - * - * @param pEvent {@link ServerStartingEvent} - The event triggered when the server starts. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @SubscribeEvent - public static void onServerStart(ServerStartingEvent pEvent) { - server = pEvent.getServer(); - ReloadHandler.LoadEntityVariants(server); - } - - /** - * The {@link ScheduledExecutorService} used to schedule tasks for reloading entity variants. - * - * @since 1.0.0 - * @Co-author MeAlam, Dan - */ - private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); - - /** - * Handles the reload event by scheduling a task to reload entity variants. - *

- * This method schedules the {@code LoadEntityVariants} method to run after a short delay. - *

- * - * @param pEvent {@link AddReloadListenerEvent} - The event triggered when a reload occurs. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - @SubscribeEvent - public static void onReload(AddReloadListenerEvent pEvent) { - if (server != null) { - scheduler.schedule(() -> { - server.execute(() -> { - ReloadHandler.LoadEntityVariants(server); - }); - }, 1, TimeUnit.SECONDS); - } - } - - /** - * The base path for entity variant JSON files. - *

- * This path is used to locate the files that contain variant data for entities. - *

- * - * @since 1.0.0 - * @Co-author MeAlam, Dan - */ - private static final String basePath = "variant/entity/"; - - /** - * A {@link List} of entity names for which variants will be loaded. - *

- * This list defines which entities will have their variants loaded from JSON files. - *

- * - * @since 1.0.0 - * @Co-author MeAlam, Dan - */ - private static final List entityNames = Arrays.asList("dragon", "rex"); - - /** - * Loads entity variants from JSON files into the {@link MinecraftServer}. - *

- * This method iterates through the list of entity names, constructs file paths, and registers - * entity variants using the {@link ReloadEventHandler}. - *

- * - * @param pServer {@link MinecraftServer} - The server on which the entity variants will be loaded. - * - * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public static void LoadEntityVariants(MinecraftServer pServer) { - for (String entityName : entityNames) { - String modPath = basePath + entityName + ".json"; - String dataPath = basePath + entityName + "data.json"; - ReloadEventHandler.registerEntityVariants(pServer, entityName, BlueLib.MODID, modPath, dataPath); - } - } -} diff --git a/NeoForge/src/main/java/software/bluelib/example/init/ModEntities.java b/NeoForge/src/main/java/software/bluelib/example/init/ModEntities.java deleted file mode 100644 index a1e80d1d..00000000 --- a/NeoForge/src/main/java/software/bluelib/example/init/ModEntities.java +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.example.init; - -import net.minecraft.core.registries.Registries; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredRegister; -import software.bluelib.BlueLib; -import software.bluelib.example.entity.dragon.DragonEntity; -import software.bluelib.example.entity.rex.RexEntity; - -public class ModEntities { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(Registries.ENTITY_TYPE, BlueLib.MODID); - - // List of Entities - public static final DeferredHolder, EntityType> DRAGON = register( - "example_one", - EntityType.Builder.of(DragonEntity::new, MobCategory.AMBIENT) - .setShouldReceiveVelocityUpdates(true) - .setTrackingRange(64) - .setUpdateInterval(3) - .fireImmune() - .sized(0.6f, 1.8f)); - - public static final DeferredHolder, EntityType> REX = register( - "example_two", - EntityType.Builder.of(RexEntity::new, MobCategory.AMBIENT) - .setShouldReceiveVelocityUpdates(true) - .setTrackingRange(64) - .setUpdateInterval(3) - .fireImmune() - .sized(0.6f, 1.8f)); - - private static DeferredHolder, EntityType> register(String pRegistryName, EntityType.Builder pEntityTypeBuilder) { - return REGISTRY.register(pRegistryName, () -> pEntityTypeBuilder.build(pRegistryName)); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/exception/CouldNotLoadJSON.java b/NeoForge/src/main/java/software/bluelib/exception/CouldNotLoadJSON.java deleted file mode 100644 index c93d1015..00000000 --- a/NeoForge/src/main/java/software/bluelib/exception/CouldNotLoadJSON.java +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.exception; - -/** - * A {@code RuntimeException} that represents an error when a JSON file could not be loaded. - *

- * This exception provides additional context by including the {@link #getResourceId()} of the JSON file that failed to load. - *

- *

- * Key Features: - *

    - *
  • {@link #getResourceId()} - Retrieves the ID of the resource that could not be loaded.
  • - *
- *

- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class CouldNotLoadJSON extends RuntimeException { - - /** - * A {@link String} that represents the ID of the resource that could not be loaded. - *

- * This ID is used to provide additional context for the error. - *

- * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private final String resourceId; - - /** - * Constructs a new {@code CouldNotLoadJSON} exception with the specified detail message and resource ID. - *

- * The detail message provides information about the nature of the error, while the resource ID indicates - * which specific resource could not be loaded. - *

- * - * @param pMessage {@link String} - The detail message explaining the reason for the exception. - * @param pResourceId {@link String} - The ID of the resource that could not be loaded. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public CouldNotLoadJSON(String pMessage, String pResourceId) { - super(pMessage); - this.resourceId = pResourceId; - } - - /** - * A {@link String} that retrieves the resource ID of the JSON file that could not be loaded. - *

- * This method provides access to the ID of the resource that caused the exception. - *

- * - * @return The resource ID as a {@link String}. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public String getResourceId() { - return resourceId; - } -} diff --git a/NeoForge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java b/NeoForge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java deleted file mode 100644 index a9bf1919..00000000 --- a/NeoForge/src/main/java/software/bluelib/interfaces/variant/IVariantEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.interfaces.variant; - -import net.minecraft.util.RandomSource; -import software.bluelib.interfaces.variant.base.IVariantEntityBase; - -import java.util.List; - -/** - * An {@code Interface} representing an entity that supports multiple variants. - *

- * This interface extends {@link IVariantEntityBase} to include methods specific to handling entity variants, including - * random selection of variants. - *

- *

- * Key Methods: - *

    - *
  • {@link #getRandomVariant(List, String)} - Retrieves a random variant name from a provided list or defaults if the list is empty.
  • - *
- *

- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public interface IVariantEntity extends IVariantEntityBase { - - /** - * A {@link RandomSource} instance used for generating random variants. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - RandomSource random = RandomSource.create(); - - /** - * A {@link String} that selects a random variant name from the provided list of variant names. - *

- * This method uses the {@link RandomSource} to pick a random variant from the list. If the list is empty, the default - * variant name is returned. - *

- * - * @param pVariantNamesList {@link List} - A {@link List} of variant names available for the entity. - * @param pDefaultVariant {@link String} - The default variant name to return if {@code pVariantNamesList} is empty. - * @return A random variant name from the list, or the default variant if the list is empty. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - default String getRandomVariant(List pVariantNamesList, String pDefaultVariant) { - List spawnableVariants = pVariantNamesList.stream().toList(); - if (!spawnableVariants.isEmpty()) { - return spawnableVariants.get(this.random.nextInt(spawnableVariants.size())); - } - return pDefaultVariant; - } -} diff --git a/NeoForge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java b/NeoForge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java deleted file mode 100644 index 3b905d28..00000000 --- a/NeoForge/src/main/java/software/bluelib/interfaces/variant/base/IVariantEntityBase.java +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.interfaces.variant.base; - -import net.minecraft.resources.ResourceLocation; -import software.bluelib.entity.variant.VariantLoader; -import software.bluelib.entity.variant.VariantParameter; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * A {@code base Interface} providing fundamental methods for handling entity variants. - *

- * This interface defines methods for retrieving texture locations and variant names associated with entities. - *

- *

- * Key Methods: - *

    - *
  • {@link #getTextureLocation(String, String)} - Retrieves the {@link ResourceLocation} for the entity texture.
  • - *
  • {@link #getEntityVariants(String)} - Retrieves a {@link List} of variant names for a specified entity.
  • - *
- *

- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public interface IVariantEntityBase { - - /** - * A {@link ResourceLocation} that points to the texture of an entity. - *

- * This method constructs a {@link ResourceLocation} using the provided mod ID and texture path. - *

- * - * @param pModId {@link String} - The mod ID used to locate the texture. - * @param pPath {@link String} - The path to the texture within the mod. - * @return A {@link ResourceLocation} pointing to the specified texture. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - default ResourceLocation getTextureLocation(String pModId, String pPath) { - return new ResourceLocation(pModId, pPath); - } - - /** - * A {@link List} of variant names associated with the specified entity. - *

- * This method retrieves the names of all variants for a given entity by querying the {@link VariantLoader}. - *

- * - * @param pEntityName {@link String} - The name of the entity whose variant names are to be retrieved. - * @return A {@link List} containing the names of variants associated with the specified entity. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - default List getEntityVariants(String pEntityName) { - List variants = VariantLoader.getVariantsFromEntity(pEntityName); - return variants.stream() - .map(VariantParameter::getVariantName) - .collect(Collectors.toList()); - } -} diff --git a/NeoForge/src/main/java/software/bluelib/json/JSONLoader.java b/NeoForge/src/main/java/software/bluelib/json/JSONLoader.java deleted file mode 100644 index f046903c..00000000 --- a/NeoForge/src/main/java/software/bluelib/json/JSONLoader.java +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.json; - -import com.google.gson.Gson; -import com.google.gson.JsonObject; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.Resource; -import net.minecraft.server.packs.resources.ResourceManager; -import software.bluelib.exception.CouldNotLoadJSON; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.util.Optional; - -/** - * The {@code JSONLoader} class is responsible for loading and parsing JSON data from - * resources defined by {@link ResourceLocation} within a Minecraft mod environment.
- * It uses the {@link Gson} library to convert JSON strings into {@link JsonObject} instances. - *

- * Key methods: - *

    - *
  • {@link #loadJson(ResourceLocation, ResourceManager)} - Loads a JSON resource.
  • - *
- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class JSONLoader { - - /** - * A {@link Gson} instance for parsing JSON data. - * @Co-author MeAlam, Dan - */ - private static final Gson gson = new Gson(); - - /** - * A {@link JsonObject} that loads JSON data from a {@link ResourceLocation}.
- * This method is typically used to load configuration files or other JSON-based resources - * in a Minecraft mod environment. - *

- * @param pResourceLocation {@link ResourceLocation} - The {@link ResourceLocation} of the JSON resource. - * @param pResourceManager {@link ResourceManager} - The {@link ResourceManager} to load the resource. - * @return The loaded {@link JsonObject}. - * @throws CouldNotLoadJSON If the JSON could not be loaded. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public JsonObject loadJson(ResourceLocation pResourceLocation, ResourceManager pResourceManager) throws CouldNotLoadJSON { - try { - Optional resource = pResourceManager.getResource(pResourceLocation); - - if (resource.isEmpty()) { - return new JsonObject(); - } - - try (InputStream inputStream = resource.get().open(); - InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) { - - return gson.fromJson(reader, JsonObject.class); - } - } catch (IOException pException) { - throw new CouldNotLoadJSON("Failed to load JSON from resource: " + pResourceLocation + ". Error: " + pException.getMessage(), pResourceLocation.toString()); - } - } -} diff --git a/NeoForge/src/main/java/software/bluelib/json/JSONMerger.java b/NeoForge/src/main/java/software/bluelib/json/JSONMerger.java deleted file mode 100644 index 918ed2cf..00000000 --- a/NeoForge/src/main/java/software/bluelib/json/JSONMerger.java +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.json; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import java.util.Map; - -/** - * A {@code Class} responsible for merging JSON data from a source {@link JsonObject} into a target {@link JsonObject}. - *

- * This class provides functionality to combine JSON data where overlapping keys result in merging arrays, - * and non-overlapping keys are simply added to the target. - *

- * - *

- * Key Methods: - *

    - *
  • {@link #mergeJsonObjects(JsonObject, JsonObject)} - Merges the data from the source JSON object into the target JSON object.
  • - *
- *

- * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ -public class JSONMerger { - - /** - * Merges data from a source {@link JsonObject} into a target {@link JsonObject}. - *

- * If the target JSON object already contains a key present in the source JSON object, the values are merged if they are arrays. - * Otherwise, the source value is added to the target JSON object. - *

- * - * @param pTarget {@link JsonObject} - The target {@link JsonObject} to merge data into. This object will be modified by adding or updating its values. - * @param pSource {@link JsonObject} - The source {@link JsonObject} to merge data from. This object is not modified by the operation. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public void mergeJsonObjects(JsonObject pTarget, JsonObject pSource) { - for (Map.Entry entry : pSource.entrySet()) { - if (pTarget.has(entry.getKey())) { - JsonElement targetElement = pTarget.get(entry.getKey()); - JsonElement sourceElement = entry.getValue(); - - if (targetElement.isJsonArray() && sourceElement.isJsonArray()) { - JsonArray targetArray = targetElement.getAsJsonArray(); - JsonArray sourceArray = sourceElement.getAsJsonArray(); - - for (JsonElement element : sourceArray) { - targetArray.add(element); - } - } else { - pTarget.add(entry.getKey(), sourceElement); - } - } else { - pTarget.add(entry.getKey(), entry.getValue()); - } - } - } -} diff --git a/NeoForge/src/main/java/software/bluelib/utils/ParameterUtils.java b/NeoForge/src/main/java/software/bluelib/utils/ParameterUtils.java deleted file mode 100644 index 3994cdf5..00000000 --- a/NeoForge/src/main/java/software/bluelib/utils/ParameterUtils.java +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) BlueLib. Licensed under the MIT License. - -package software.bluelib.utils; - -import software.bluelib.entity.variant.VariantParameter; -import software.bluelib.entity.variant.VariantLoader; - -import java.util.HashMap; -import java.util.Map; -import java.util.NoSuchElementException; - -/** - * A {@code Class} for managing custom parameters associated with entity variants. - *

- * This class provides methods to retrieve custom parameters for variants and allows - * for building and connecting parameters to specific variants using the {@link ParameterBuilder}. - *

- *

- * Key Methods: - *

    - *
  • {@link #getParameter(String, String)} - Retrieves the value of a custom parameter for a specific variant.
  • - *
- *

- * Nested Classes: - *
    - *
  • {@link ParameterBuilder} - A builder class for creating and associating custom parameters with a specific variant.
  • - *
- *

- * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ -public class ParameterUtils { - - /** - * A {@link Map} holding custom parameters for each variant. - *

- * The outer map's key is the variant's name, and the inner map contains key-value pairs - * of custom parameters for that variant. - *

- * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private static final Map> variantParametersMap = new HashMap<>(); - - /** - * Retrieves the value of a custom parameter for a specific variant. - *

- * If the parameter is not found, "null" is returned. - *

- * - * @param pVariantName {@link String} - The name of the variant. - * @param pParameterKey {@link String} - The key of the parameter to retrieve. - * @return The value of the custom parameter for the specified variant. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public static String getParameter(String pVariantName, String pParameterKey) { - return variantParametersMap.getOrDefault(pVariantName, new HashMap<>()).getOrDefault(pParameterKey, "null"); - } - - /** - * A {@code Builder} class for creating and associating custom parameters with a specific variant. - *

- * This class allows chaining methods to build and connect parameters to a variant. - *

- * - *

- * Key Methods: - *

    - *
  • {@link #forVariant(String, String)} - Creates a new instance of {@link ParameterBuilder} for the specified entity and variant.
  • - *
  • {@link #withParameter(String)} - Adds a parameter to the parameters map with a default value of "null".
  • - *
  • {@link #connect()} - Adds parameters to the variant and updates the static {@link VariantParameter} with these parameters.
  • - *
- *

- *

- * **Note:** The "null" value is used only if the parameter is not specified in the JSON files. - *

- * @since 1.0.0 - * @author MeAlam - * @Co-author Dan - */ - public static class ParameterBuilder { - /** - * The name of the variant for which parameters are being built. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private final String variantName; - - /** - * The name of the entity for which parameters are being built. - * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private final String entityName; - - /** - * A {@link Map} to store parameters for the variant. - *

- * Each key-value pair represents a parameter name and its default value. - *

- * @Co-author MeAlam, Dan - * @since 1.0.0 - */ - private final Map parameters = new HashMap<>(); - - /** - * Constructor to initialize the builder with a specific entity name and variant name. - * - * @param pEntityName {@link String} - The name of the entity. - * @param pVariantName {@link String} - The name of the variant. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - private ParameterBuilder(String pEntityName, String pVariantName) { - this.variantName = pVariantName; - this.entityName = pEntityName; - } - - /** - * Creates a new instance of {@link ParameterBuilder} for the specified entity and variant. - * - * @param pEntityName {@link String} - The name of the entity. - * @param pVariantName {@link String} - The name of the variant. - * @return A new instance of {@link ParameterBuilder}. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public static ParameterBuilder forVariant(String pEntityName, String pVariantName) { - return new ParameterBuilder(pEntityName, pVariantName); - } - - /** - * Adds a parameter to the parameters map with a default value of "null".
- *

- * **Note:** The "null" value is used only if the parameter is not specified in the JSON files. - *

- * - * @param pParameter {@link String} - The key of the parameter to add. - * @return The current instance of {@link ParameterBuilder} for method chaining. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public ParameterBuilder withParameter(String pParameter) { - parameters.put(pParameter, "null"); - return this; - } - - /** - * Adds a parameter to the parameters map with a specified default value. - *

- * Connects the parameters built with this builder to the specified variant. - * Updates the static {@link VariantParameter} with the parameters for the specified variant. - *

- * - * @return The current instance of {@link ParameterBuilder} for method chaining. - * @throws NoSuchElementException if the specified variant is not found for the entity. - * @author MeAlam - * @Co-author Dan - * @since 1.0.0 - */ - public ParameterBuilder connect() { - VariantParameter variant = VariantLoader.getVariantByName(entityName, variantName); - if (variant != null) { - Map updatedParameters = new HashMap<>(); - for (String key : parameters.keySet()) { - updatedParameters.put(key, variant.getParameter(key)); - } - variantParametersMap.put(variantName, updatedParameters); - } else { - throw new NoSuchElementException("Variant '" + variantName + "' not found for entity '" + entityName + "'"); - } - return this; - } - } -} diff --git a/NeoForge/src/main/resources/META-INF/mods.toml b/NeoForge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 61897870..00000000 --- a/NeoForge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,31 +0,0 @@ -modLoader="javafml" -loaderVersion="${loader_version_range}" -license="${mod_license}" -issueTrackerURL="https://github.com/MeAlam1/BlueLib/issues" -[[mods]] -modId="${mod_id}" -version="${mod_version}" -displayName="${mod_name}" - -# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/ -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional -displayURL="https://github.com/MeAlam1/BlueLib/wiki" -#logoFile="examplemod.png" -credits="Anyone who contributed to the Source Code of BlueLib!" -authors="${mod_authors}" - - -description='''${mod_description}''' -[[dependencies.${mod_id}]] - modId="neoforge" - type="required" - versionRange="${neo_version_range}" - ordering="NONE" - side="BOTH" - -[[dependencies.${mod_id}]] - modId="minecraft" - type="required" - versionRange="${minecraft_version_range}" - ordering="NONE" - side="BOTH" \ No newline at end of file diff --git a/NeoForge/src/main/resources/assets/bluelib/animations/dragon.animation.json b/NeoForge/src/main/resources/assets/bluelib/animations/dragon.animation.json deleted file mode 100644 index 0b02f765..00000000 --- a/NeoForge/src/main/resources/assets/bluelib/animations/dragon.animation.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "test": { - "loop": true, - "bones": { - "Body": { - "rotation": { - "vector": [-20.44582, 11.73507, -4.3361], - "easing": "linear" - }, - "position": { - "vector": [0, -1, 0], - "easing": "linear" - } - }, - "leftleg": { - "rotation": { - "vector": [0, 22.5, 0], - "easing": "linear" - } - }, - "rightleg": { - "rotation": { - "vector": [0, -22.5, 0], - "easing": "linear" - } - }, - "rightwing1": { - "rotation": { - "vector": [0, 0, -20], - "easing": "linear" - } - }, - "leftwing": { - "rotation": { - "vector": [0, 0, -10], - "easing": "linear" - } - }, - "leftwing1": { - "rotation": { - "vector": [0, 0, 30], - "easing": "linear" - } - }, - "neck": { - "rotation": { - "vector": [-40, 0, 0], - "easing": "linear" - } - }, - "Head": { - "rotation": { - "vector": [72.5, 0, 0], - "easing": "linear" - } - } - } - } - }, - "geckolib_format_version": 2 -} \ No newline at end of file diff --git a/NeoForge/src/main/resources/assets/bluelib/animations/rex.animation.json b/NeoForge/src/main/resources/assets/bluelib/animations/rex.animation.json deleted file mode 100644 index 5d8891b4..00000000 --- a/NeoForge/src/main/resources/assets/bluelib/animations/rex.animation.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "animation2": { - "loop": true, - "bones": { - "body": { - "rotation": { - "vector": [0, -15, 0] - } - }, - "tail2": { - "rotation": { - "vector": [0, 20, 0] - } - }, - "tail3": { - "rotation": { - "vector": [0, 20, 0] - } - }, - "tail4": { - "rotation": { - "vector": [0, 20, 0] - } - }, - "tail5": { - "rotation": { - "vector": [0, 20, 0] - } - }, - "tail6": { - "rotation": { - "vector": [0, 20, 0] - } - }, - "neck": { - "rotation": { - "vector": [0, -2.5, 0] - } - }, - "head": { - "rotation": { - "vector": [0, -20, 0] - } - } - } - } - }, - "geckolib_format_version": 2 -} \ No newline at end of file diff --git a/NeoForge/src/main/resources/assets/bluelib/geo/dragon.geo.json b/NeoForge/src/main/resources/assets/bluelib/geo/dragon.geo.json deleted file mode 100644 index 8f038886..00000000 --- a/NeoForge/src/main/resources/assets/bluelib/geo/dragon.geo.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "format_version": "1.12.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.unknown", - "texture_width": 64, - "texture_height": 64, - "visible_bounds_width": 4, - "visible_bounds_height": 2.5, - "visible_bounds_offset": [0, 0.75, 0] - }, - "bones": [ - { - "name": "Body", - "pivot": [-0.16667, 5, -1], - "cubes": [ - {"origin": [-2, 4, 1], "size": [4, 2, 4], "uv": [17, 10]}, - {"origin": [-3, 4, -4], "size": [6, 2, 5], "uv": [0, 14]} - ] - }, - { - "name": "leftleg", - "parent": "Body", - "pivot": [1.5, 5, 5], - "cubes": [ - {"origin": [1.5, 3, 4.5], "size": [0, 4, 3], "pivot": [1.5, 5, 6], "rotation": [90, 0, 90], "uv": [0, 0]} - ] - }, - { - "name": "rightleg", - "parent": "Body", - "pivot": [-1.5, 5, 5], - "cubes": [ - {"origin": [-1.5, 3, 4.5], "size": [0, 4, 3], "pivot": [-1.5, 5, 6], "rotation": [90, 0, -90], "uv": [0, 0], "mirror": true} - ] - }, - { - "name": "rightwing", - "parent": "Body", - "pivot": [-2.5, 5, -3.5], - "cubes": [ - {"origin": [-10, 5, -5], "size": [7, 0, 7], "uv": [-7, 28], "mirror": true} - ] - }, - { - "name": "rightwing1", - "parent": "rightwing", - "pivot": [-9.5, 5, -1.5], - "cubes": [ - {"origin": [-17, 5, -5], "size": [7, 0, 7], "uv": [43, 0], "mirror": true} - ] - }, - { - "name": "leftwing", - "parent": "Body", - "pivot": [2.5, 5, -3.5], - "cubes": [ - {"origin": [3, 5, -5], "size": [7, 0, 7], "uv": [-7, 28]} - ] - }, - { - "name": "leftwing1", - "parent": "leftwing", - "pivot": [9.5, 5, -1.5], - "cubes": [ - {"origin": [10, 5, -5], "size": [7, 0, 7], "uv": [43, 0]} - ] - }, - { - "name": "neck", - "parent": "Body", - "pivot": [0, 5, -4], - "cubes": [ - {"origin": [-1, 4, -8], "size": [2, 2, 4], "uv": [10, 21]} - ] - }, - { - "name": "Head", - "parent": "neck", - "pivot": [0, 4.8, -7.5], - "cubes": [ - {"origin": [-1.5, 4, -12], "size": [3, 3, 4], "uv": [18, 17]}, - {"origin": [0, 6, -15], "size": [0, 3, 7], "uv": [0, 14]}, - {"origin": [-1, 4, -16], "size": [2, 2, 4], "uv": [21, 0]}, - {"origin": [-1, 3, -16], "size": [2, 1, 1], "uv": [29, 0]}, - {"origin": [0, 7, -8], "size": [0, 1, 3], "uv": [0, 23]} - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/NeoForge/src/main/resources/assets/bluelib/geo/rex.geo.json b/NeoForge/src/main/resources/assets/bluelib/geo/rex.geo.json deleted file mode 100644 index 3d18bac7..00000000 --- a/NeoForge/src/main/resources/assets/bluelib/geo/rex.geo.json +++ /dev/null @@ -1,390 +0,0 @@ -{ - "format_version": "1.12.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.unknown", - "texture_width": 512, - "texture_height": 512, - "visible_bounds_width": 29, - "visible_bounds_height": 7.5, - "visible_bounds_offset": [0, 3.25, 0] - }, - "bones": [ - { - "name": "Tyrannosaurus", - "pivot": [0, 0, 0] - }, - { - "name": "body", - "parent": "Tyrannosaurus", - "pivot": [0, 72, 0], - "cubes": [ - {"origin": [-19, 47, -8], "size": [38, 45, 34], "uv": [124, 51]}, - {"origin": [-15.475, 51.23327, -14.01496], "size": [31, 45, 35], "pivot": [0.025, 74.40827, 4.38504], "rotation": [-12.75, 0, 0], "uv": [130, 50]}, - {"origin": [-16, 40, -22.525], "size": [32, 16, 40], "inflate": -0.05, "pivot": [0, 72, 0.275], "rotation": [17.5, 0, 0], "uv": [0, 160]}, - {"origin": [-16, 54, -54], "size": [32, 37, 46], "uv": [1, 1]}, - {"origin": [-16, 71.46448, -54.53145], "size": [32, 30, 48], "inflate": -0.25, "pivot": [0, 89.46448, 3.46855], "rotation": [8.75, 0, 0], "uv": [-1, -1]}, - {"origin": [-16, 28.37894, -42.36923], "size": [32, 21, 49], "inflate": -0.025, "pivot": [0, 73.37894, 12.63077], "rotation": [-24, 0, 0], "uv": [0, 85]} - ] - }, - { - "name": "arm2", - "parent": "body", - "pivot": [13.56731, 58.46159, -45.9607], - "rotation": [29.07337, 19.05681, -20.20848], - "cubes": [ - {"origin": [12.56731, 47.46159, -47.9607], "size": [3, 11, 5], "uv": [111, 0]} - ] - }, - { - "name": "bone2", - "parent": "arm2", - "pivot": [15.06274, 49.29312, -45.32771], - "rotation": [-27.154, -2.96386, 4.54476], - "cubes": [ - {"origin": [13.13695, 39.306, -44.80271], "size": [2, 6, 2], "inflate": -0.075, "pivot": [14.11195, 46.806, -45.02771], "rotation": [0, 0, 15], "uv": [0, 0]}, - {"origin": [14.86195, 37.306, -44.75271], "size": [0, 3, 2], "pivot": [14.11195, 46.806, -45.02771], "rotation": [0, 0, 15], "uv": [36, 26]}, - {"origin": [12.13695, 44.306, -47.52771], "size": [3, 5, 5], "inflate": -0.125, "pivot": [14.11195, 46.806, -45.02771], "rotation": [0, 0, 15], "uv": [165, 257]} - ] - }, - { - "name": "bone3", - "parent": "bone2", - "pivot": [13.25685, 45.11756, -46.37771], - "rotation": [-14.50257, -2.95519, -2.10666], - "cubes": [ - {"origin": [13.13695, 41.306, -47.37771], "size": [2, 4, 2], "inflate": -0.075, "pivot": [14.11195, 46.806, -45.02771], "rotation": [0, 0, 15], "uv": [0, 28]}, - {"origin": [14.86195, 39.306, -47.37771], "size": [0, 3, 2], "pivot": [14.11195, 46.806, -45.02771], "rotation": [0, 0, 15], "uv": [36, 29]} - ] - }, - { - "name": "arm3", - "parent": "body", - "pivot": [-13.56731, 58.46159, -45.9607], - "rotation": [29.07337, -19.05681, 20.20848], - "cubes": [ - {"origin": [-15.56731, 47.46159, -47.9607], "size": [3, 11, 5], "uv": [111, 0], "mirror": true} - ] - }, - { - "name": "bone4", - "parent": "arm3", - "pivot": [-15.06274, 49.29312, -45.32771], - "rotation": [-27.154, 2.96386, -4.54476], - "cubes": [ - {"origin": [-15.13695, 39.306, -44.80271], "size": [2, 6, 2], "inflate": -0.075, "pivot": [-14.11195, 46.806, -45.02771], "rotation": [0, 0, -15], "uv": [0, 0], "mirror": true}, - {"origin": [-14.86195, 37.306, -44.75271], "size": [0, 3, 2], "pivot": [-14.11195, 46.806, -45.02771], "rotation": [0, 0, -15], "uv": [36, 26], "mirror": true}, - {"origin": [-15.13695, 44.306, -47.52771], "size": [3, 5, 5], "inflate": -0.125, "pivot": [-14.11195, 46.806, -45.02771], "rotation": [0, 0, -15], "uv": [165, 257], "mirror": true} - ] - }, - { - "name": "bone5", - "parent": "bone4", - "pivot": [-13.25685, 45.11756, -46.37771], - "rotation": [-14.50257, 2.95519, 2.10666], - "cubes": [ - {"origin": [-15.13695, 41.306, -47.37771], "size": [2, 4, 2], "inflate": -0.075, "pivot": [-14.11195, 46.806, -45.02771], "rotation": [0, 0, -15], "uv": [0, 28], "mirror": true}, - {"origin": [-14.86195, 39.306, -47.37771], "size": [0, 3, 2], "pivot": [-14.11195, 46.806, -45.02771], "rotation": [0, 0, -15], "uv": [36, 29], "mirror": true} - ] - }, - { - "name": "tail1", - "parent": "body", - "pivot": [0, 82.97049, 21.3522], - "cubes": [ - {"origin": [-15, 55.74549, 21.0272], "size": [30, 30, 39], "uv": [123, 128]}, - {"origin": [-15, 71.63781, 17.37365], "size": [30, 28, 35], "inflate": -0.2, "pivot": [0, 60.21281, -16.55135], "rotation": [-10.75, 0, 0], "uv": [127, 132]}, - {"origin": [-15, 39.02049, 26.7772], "size": [30, 13, 37], "inflate": -0.025, "pivot": [0, 30.97049, 1.3522], "rotation": [16, 0, 0], "uv": [159, 1]} - ] - }, - { - "name": "tail2", - "parent": "tail1", - "pivot": [0, 82.97049, 56.3522], - "cubes": [ - {"origin": [-10, 62.97049, 56.3522], "size": [20, 21, 38], "uv": [106, 199]}, - {"origin": [-9, 41.02049, 63.3522], "size": [18, 14, 35], "inflate": -0.025, "pivot": [0, 30.97049, 1.3522], "rotation": [13, 0, 0], "uv": [173, 3]} - ] - }, - { - "name": "tail3", - "parent": "tail2", - "pivot": [0, 82.97049, 93.3522], - "cubes": [ - {"origin": [-7, 66.97049, 93.3522], "size": [14, 14, 37], "uv": [0, 216]}, - {"origin": [-7, 54.52049, 94.3522], "size": [14, 7, 38], "inflate": -0.025, "pivot": [0, 30.97049, 1.3522], "rotation": [5.5, 0, 0], "uv": [174, 0]} - ] - }, - { - "name": "tail4", - "parent": "tail3", - "pivot": [0, 82.97049, 129.3522], - "cubes": [ - {"origin": [-5, 69.97049, 129.3522], "size": [10, 9, 37], "uv": [255, 14]}, - {"origin": [-5, 64.82049, 132.6022], "size": [10, 4, 37], "inflate": -0.025, "pivot": [0, 30.97049, 109.3522], "rotation": [4.75, 0, 0], "uv": [255, 14]} - ] - }, - { - "name": "tail5", - "parent": "tail4", - "pivot": [0, 82.97049, 158.3522], - "cubes": [ - {"origin": [-3, 70.97049, 158.3522], "size": [6, 6, 37], "uv": [149, 257]}, - {"origin": [-3, 69.22961, 165.59014], "size": [6, 3, 30], "inflate": -0.1, "pivot": [0, 70.15461, 147.99014], "rotation": [0.5, 0, 0], "uv": [266, 21]} - ] - }, - { - "name": "tail6", - "parent": "tail5", - "pivot": [0, 82.97049, 182.3522], - "cubes": [ - {"origin": [-2, 71.97049, 182.3522], "size": [4, 4, 37], "uv": [0, 285]}, - {"origin": [-2, 66.99549, 197.7022], "size": [4, 4, 25], "inflate": -0.175, "pivot": [0, 30.97049, 162.3522], "rotation": [4.75, 0, 0], "uv": [12, 297]} - ] - }, - { - "name": "neck", - "parent": "body", - "pivot": [0, 74.22605, -48.50511], - "cubes": [ - {"origin": [-15, 55, -67], "size": [30, 31, 17], "uv": [251, 113]}, - {"origin": [-14.25, 80.39311, -64.98257], "size": [30, 11, 17], "inflate": -1, "pivot": [0.75, 82.39311, -53.98257], "rotation": [24.25, 0, 0], "uv": [251, 113]}, - {"origin": [-10, 66.05, -70.125], "size": [20, 34, 25], "inflate": -0.225, "pivot": [0, 87.575, -69.125], "rotation": [-39.25, 0, 0], "uv": [221, 200]}, - {"origin": [-10, 59.575, -78.125], "size": [20, 13, 25], "inflate": -1.325, "pivot": [0, 87.575, -69.125], "rotation": [-14.25, 0, 0], "uv": [235, 259]}, - {"origin": [-9, 71.2, -85.125], "size": [18, 19, 24], "inflate": -0.325, "pivot": [0, 85.2, -69.125], "rotation": [7.5, 0, 0], "uv": [268, 61]}, - {"origin": [-8, 83.89159, -88.09601], "size": [16, 12, 13], "inflate": -0.275, "pivot": [0, 89.89159, -79.09601], "rotation": [42.5, 0, 0], "uv": [198, 259]}, - {"origin": [-8, 86.39159, -80.39601], "size": [16, 11, 19], "inflate": -0.25, "pivot": [0, 89.89159, -68.09601], "rotation": [2.5, 0, 0], "uv": [111, 0]} - ] - }, - { - "name": "head", - "parent": "neck", - "pivot": [0, 83.05369, -83.57238], - "cubes": [ - {"origin": [-8.725, 71, -101], "size": [17, 19, 19], "uv": [286, 165]}, - {"origin": [-8.775, 84, -101], "size": [17, 2, 7], "inflate": 0.225, "uv": [104, 155]}, - {"origin": [-7, 93.5819, -99.5906], "size": [14, 5, 10], "inflate": -0.05, "pivot": [0, 90.5819, -77.5906], "rotation": [21.5, 0, 0], "uv": [0, 111]}, - {"origin": [-7, 81.46532, -93.49693], "size": [14, 5, 9], "inflate": -0.075, "pivot": [0, 78.46532, -74.49693], "rotation": [-25, 0, 0], "uv": [111, 30]}, - {"origin": [-7, 88.64032, -92.02193], "size": [14, 5, 4], "inflate": -0.125, "uv": [0, 191]}, - {"origin": [9, 86, -102], "size": [4, 3, 13], "inflate": -0.025, "pivot": [7, 80.5, -90.5], "rotation": [0, 0, -17.5], "uv": [149, 277]}, - {"origin": [4.59053, 84.6097, -93.1055], "size": [4, 3, 9], "inflate": -0.05, "pivot": [2.59053, 79.1097, -81.6055], "rotation": [0, -27.5, -17.5], "uv": [255, 23]}, - {"origin": [-8.59053, 84.6097, -93.1055], "size": [4, 3, 9], "inflate": -0.05, "pivot": [-2.59053, 79.1097, -81.6055], "rotation": [0, 27.5, 17.5], "uv": [184, 225]}, - {"origin": [12.62776, 90.52364, -107.52067], "size": [4, 3, 11], "inflate": -0.1, "pivot": [10.62776, 85.02364, -91.02067], "rotation": [27.87149, 36.42355, -5.95346], "uv": [0, 239]}, - {"origin": [-16.62776, 90.52364, -107.52067], "size": [4, 3, 11], "inflate": -0.1, "pivot": [-10.62776, 85.02364, -91.02067], "rotation": [27.87149, -36.42355, 5.95346], "uv": [162, 0]}, - {"origin": [-13, 86, -102], "size": [4, 3, 13], "inflate": -0.025, "pivot": [-7, 80.5, -90.5], "rotation": [0, 0, 17.5], "uv": [109, 216]}, - {"origin": [-7, 78.725, -121], "size": [14, 10, 16], "inflate": -0.05, "pivot": [0, 81.725, -99], "rotation": [27.5, 0, 0], "uv": [300, 243]}, - {"origin": [-7, 78.35, -106], "size": [14, 11, 11], "pivot": [0, 81.35, -99], "rotation": [33.5, 0, 0], "uv": [286, 203]}, - {"origin": [-7, 69.519, -125.21974], "size": [14, 11, 7.85], "inflate": -0.075, "pivot": [0, 72.519, -118.21974], "rotation": [90, 0, 0], "uv": [259, 165]}, - {"origin": [-6, 78.519, -128.21974], "size": [11, 0, 7.85], "pivot": [0, 72.519, -118.21974], "rotation": [90, 0, 0], "uv": [141, 30]}, - {"origin": [5, 61.519, -128.21974], "size": [0, 17, 6.85], "pivot": [-2, 72.519, -118.21974], "rotation": [90, 0, 0], "uv": [234, 45]}, - {"origin": [-5, 61.519, -128.21974], "size": [0, 17, 6.85], "pivot": [2, 72.519, -118.21974], "rotation": [90, 0, 0], "uv": [28, 154]}, - {"origin": [-7, 73.394, -115.21974], "size": [14, 10, 6.85], "inflate": -0.1, "pivot": [0, 74.394, -109.21974], "rotation": [110.5, 0, 0], "uv": [65, 237]}, - {"origin": [-7, 84.31148, -108.92962], "size": [14, 4, 6.85], "inflate": -0.15, "pivot": [0, 79.31148, -102.92962], "rotation": [128, 0, 0], "uv": [272, 0]}, - {"origin": [-7, 74.31148, -110.92962], "size": [14, 9, 8.85], "inflate": -0.175, "pivot": [0, 79.31148, -102.92962], "rotation": [88, 0, 0], "uv": [0, 28]}, - {"origin": [-7, 69.019, -122.66974], "size": [14, 10, 7], "inflate": -0.125, "pivot": [0, 72.019, -117.66974], "rotation": [47.5, 0, 0], "uv": [0, 267]} - ] - }, - { - "name": "jaw", - "parent": "head", - "pivot": [0, 73.374, -85.20224], - "cubes": [ - {"origin": [-9.125, 61.47673, -99.81697], "size": [18, 13, 12], "inflate": 0.025, "uv": [184, 200]}, - {"origin": [-9.15, 64.14383, -89.12484], "size": [18, 12, 7], "inflate": 0.075, "pivot": [-3, 73.14383, -68.12484], "rotation": [7.5, 0, 0], "uv": [312, 0]}, - {"origin": [7.8, 70.81044, -97.91351], "size": [1, 6, 9], "uv": [104, 179]}, - {"origin": [7.85, 63.60089, -93.15375], "size": [1, 6, 7], "pivot": [-2.975, 63.60089, -72.15375], "rotation": [-22.5, 0, 0], "uv": [65, 216]}, - {"origin": [-7.125, 72.47673, -98.81697], "size": [14, 14, 16], "inflate": 0.025, "uv": [219, 297]}, - {"origin": [6.375, 68.47673, -105.81697], "size": [0, 18, 14], "uv": [0, 159]}, - {"origin": [-6.625, 68.47673, -105.81697], "size": [0, 18, 14], "uv": [0, 141]}, - {"origin": [7.875, 65.38327, -112.3007], "size": [1, 8, 15], "inflate": -0.05, "pivot": [0, 73.88327, -104.8007], "rotation": [27.5, 0, 0], "uv": [255, 0]}, - {"origin": [-9.125, 65.38327, -112.3007], "size": [1, 8, 15], "inflate": -0.05, "pivot": [0, 73.88327, -104.8007], "rotation": [27.5, 0, 0], "uv": [0, 216]}, - {"origin": [-9.05, 70.81044, -97.91351], "size": [1, 6, 9], "uv": [104, 164]}, - {"origin": [-9.1, 63.60089, -93.15375], "size": [1, 6, 7], "pivot": [2.975, 63.60089, -72.15375], "rotation": [-22.5, 0, 0], "uv": [17, 216]}, - {"origin": [-9.125, 64.31864, -111.04094], "size": [18, 8, 15], "inflate": -0.025, "pivot": [0, 70.56864, -103.54094], "rotation": [17.5, 0, 0], "uv": [149, 300]}, - {"origin": [-6.125, 66.9078, -126.60427], "size": [12, 5, 15], "pivot": [0, 72.4078, -104.10427], "rotation": [15, 0, 0], "uv": [126, 257]}, - {"origin": [-6.125, 71.5078, -125.60427], "size": [12, 5, 0], "pivot": [0, 72.4078, -104.10427], "rotation": [15, 0, 0], "uv": [62, 155]}, - {"origin": [5.725, 71.5078, -125.60427], "size": [0, 5, 17], "pivot": [0, 72.4078, -104.10427], "rotation": [15, 0, 0], "uv": [28, 138]}, - {"origin": [-5.975, 71.5078, -125.60427], "size": [0, 5, 17], "pivot": [0, 72.4078, -104.10427], "rotation": [15, 0, 0], "uv": [0, 109]}, - {"origin": [-6.125, 60.70962, -124.43479], "size": [12, 5, 15], "inflate": -0.05, "pivot": [0, 63.78462, -115.43479], "rotation": [-3.5, 0, 0], "uv": [234, 61]}, - {"origin": [-7.125, 61.71743, -111.29498], "size": [14, 5, 16], "inflate": -0.025, "pivot": [0, 66.69243, -101.79498], "rotation": [9.25, 0, 0], "uv": [65, 216]} - ] - }, - { - "name": "leg_left", - "parent": "Tyrannosaurus", - "pivot": [20.42923, 70.7324, 8.85434], - "rotation": [-15.09173, -1.85092, -0.08398], - "cubes": [ - {"origin": [12.54366, 41.02086, -4.25109], "size": [12.875, 42.825, 23.725], "uv": [79, 257]} - ] - }, - { - "name": "leg_left2", - "parent": "leg_left", - "pivot": [21.99279, 43.52539, 1.69711], - "cubes": [ - {"origin": [12.844, 24.19389, 3.09297], "size": [12.4, 20.375, 15.95], "pivot": [21.944, 35.38139, 0.96797], "rotation": [34, 0, 0], "uv": [279, 297]} - ] - }, - { - "name": "leg_left3", - "parent": "leg_left2", - "pivot": [19.76532, 33.92692, 13.90262], - "rotation": [55, 0, 0], - "cubes": [ - {"origin": [14.22989, 14.97535, 9.92239], "size": [10, 19, 9], "inflate": -0.1, "uv": [0, 0]} - ] - }, - { - "name": "leg_left4", - "parent": "leg_left3", - "pivot": [19.76532, 14.92692, 13.90262], - "rotation": [-60, 0, 0], - "cubes": [ - {"origin": [14.22989, 2.41759, 7.14887], "size": [10, 17, 9], "inflate": 0.375, "uv": [0, 85]} - ] - }, - { - "name": "Claw5", - "parent": "leg_left4", - "pivot": [18.03922, 11.69239, 7.72125], - "rotation": [3.25353, -39.92899, -4.10228], - "cubes": [ - {"origin": [19.68942, 7.60244, 18.32118], "size": [2, 5, 6], "inflate": -0.2, "pivot": [20.68942, 10.90244, 16.32118], "rotation": [4, 5, 0], "uv": [19, 239]}, - {"origin": [15.96316, 8.07744, 15.28926], "size": [2, 3, 4], "inflate": 0.5, "pivot": [20.4918, 5.40696, 3.40745], "rotation": [2.31336, 4.43385, 27.58957], "uv": [29, 0]} - ] - }, - { - "name": "leg_left5", - "parent": "leg_left4", - "pivot": [19.76532, 2.72669, 9.58045], - "rotation": [32.5, 0, 0], - "cubes": [ - {"origin": [14.22989, -4.78265, 7.2517], "size": [10, 8, 8], "inflate": 0.35, "uv": [42, 267]} - ] - }, - { - "name": "Claw3", - "parent": "leg_left5", - "pivot": [14.03922, -1.93376, 9.83799], - "rotation": [-11.28559, 36.03256, -29.0792], - "cubes": [ - {"origin": [15.68942, -5.02371, -6.76194], "size": [2, 4, 9], "inflate": -0.2, "pivot": [16.68942, -2.72371, 1.23806], "rotation": [-4, -5, 0], "uv": [78, 267]}, - {"origin": [11.96316, -5.54871, -1.73002], "size": [2, 3, 12], "inflate": 0.5, "pivot": [16.4918, -8.21919, 14.15179], "rotation": [-2.31336, -4.43385, 27.58957], "uv": [45, 298]}, - {"origin": [13.86316, -1.04871, -0.45502], "size": [2, 3, 12], "inflate": 0.4, "pivot": [18.3918, -3.71919, 15.42679], "rotation": [14.70847, -5.40113, 27.33492], "uv": [263, 297]} - ] - }, - { - "name": "Claw2", - "parent": "leg_left5", - "pivot": [18.00128, -1.52657, 8.77203], - "rotation": [6.46283, 10.46681, -26.49382], - "cubes": [ - {"origin": [19.65148, -4.61652, -7.8279], "size": [2, 4, 9], "inflate": -0.2, "pivot": [20.65148, -2.31652, 0.1721], "rotation": [-8.25367, -3.37646, 28.00254], "uv": [259, 183]}, - {"origin": [15.92522, -5.14152, -2.79598], "size": [2, 3, 12], "inflate": 0.5, "pivot": [20.45386, -7.812, 13.08583], "rotation": [-2.31336, -4.43385, 27.58957], "uv": [0, 284]}, - {"origin": [17.82522, -0.64152, -1.52098], "size": [2, 3, 12], "inflate": 0.4, "pivot": [22.35386, -3.312, 14.36083], "rotation": [14.70847, -5.40113, 27.33492], "uv": [45, 283]} - ] - }, - { - "name": "Claw4", - "parent": "leg_left5", - "pivot": [25.00339, -1.78444, 9.60342], - "rotation": [-6.62428, -31.83686, 25.40349], - "cubes": [ - {"origin": [21.35319, -4.87439, -6.99651], "size": [2, 4, 9], "inflate": -0.2, "pivot": [22.35319, -2.57439, 1.00349], "rotation": [-4, 5, 0], "uv": [172, 21]}, - {"origin": [25.07945, -5.39939, -1.96459], "size": [2, 3, 12], "inflate": 0.5, "pivot": [22.55081, -8.06987, 13.91722], "rotation": [-2.31336, 4.43385, -27.58957], "uv": [222, 145]}, - {"origin": [23.17945, -0.89939, -0.68959], "size": [2, 3, 12], "inflate": 0.4, "pivot": [20.65081, -3.56987, 15.19222], "rotation": [14.70847, 5.40113, -27.33492], "uv": [222, 130]} - ] - }, - { - "name": "leg_right", - "parent": "Tyrannosaurus", - "pivot": [-20.42923, 70.7324, 8.85434], - "rotation": [-15.09173, 1.85092, 0.08398], - "cubes": [ - {"origin": [-25.41866, 41.02086, -4.25109], "size": [12.875, 42.825, 23.725], "uv": [79, 257], "mirror": true} - ] - }, - { - "name": "leg_right2", - "parent": "leg_right", - "pivot": [-21.99279, 43.52539, 1.69711], - "cubes": [ - {"origin": [-25.244, 24.19389, 3.09297], "size": [12.4, 20.375, 15.95], "pivot": [-21.944, 35.38139, 0.96797], "rotation": [34, 0, 0], "uv": [279, 297], "mirror": true} - ] - }, - { - "name": "leg_right3", - "parent": "leg_right2", - "pivot": [-19.76532, 33.92692, 13.90262], - "rotation": [55, 0, 0], - "cubes": [ - {"origin": [-24.22989, 14.97535, 9.92239], "size": [10, 19, 9], "inflate": -0.1, "uv": [0, 0], "mirror": true} - ] - }, - { - "name": "leg_right4", - "parent": "leg_right3", - "pivot": [-19.76532, 14.92692, 13.90262], - "rotation": [-60, 0, 0], - "cubes": [ - {"origin": [-24.22989, 2.41759, 7.14887], "size": [10, 17, 9], "inflate": 0.375, "uv": [0, 85], "mirror": true} - ] - }, - { - "name": "Claw6", - "parent": "leg_right4", - "pivot": [-18.03922, 11.69239, 7.72125], - "rotation": [3.25353, 39.92899, 4.10228], - "cubes": [ - {"origin": [-21.68942, 7.60244, 18.32118], "size": [2, 5, 6], "inflate": -0.2, "pivot": [-20.68942, 10.90244, 16.32118], "rotation": [4, -5, 0], "uv": [19, 239], "mirror": true}, - {"origin": [-17.96316, 8.07744, 15.28926], "size": [2, 3, 4], "inflate": 0.5, "pivot": [-20.4918, 5.40696, 3.40745], "rotation": [2.31336, -4.43385, -27.58957], "uv": [29, 0], "mirror": true} - ] - }, - { - "name": "leg_right5", - "parent": "leg_right4", - "pivot": [-19.76532, 2.72669, 9.58045], - "rotation": [32.5, 0, 0], - "cubes": [ - {"origin": [-24.22989, -4.78265, 7.2517], "size": [10, 8, 8], "inflate": 0.35, "uv": [42, 267], "mirror": true} - ] - }, - { - "name": "Claw7", - "parent": "leg_right5", - "pivot": [-14.03922, -1.93376, 9.83799], - "rotation": [-11.28559, -36.03256, 29.0792], - "cubes": [ - {"origin": [-17.68942, -5.02371, -6.76194], "size": [2, 4, 9], "inflate": -0.2, "pivot": [-16.68942, -2.72371, 1.23806], "rotation": [-4, 5, 0], "uv": [78, 267], "mirror": true}, - {"origin": [-13.96316, -5.54871, -1.73002], "size": [2, 3, 12], "inflate": 0.5, "pivot": [-16.4918, -8.21919, 14.15179], "rotation": [-2.31336, 4.43385, -27.58957], "uv": [45, 298], "mirror": true}, - {"origin": [-15.86316, -1.04871, -0.45502], "size": [2, 3, 12], "inflate": 0.4, "pivot": [-18.3918, -3.71919, 15.42679], "rotation": [14.70847, 5.40113, -27.33492], "uv": [263, 297], "mirror": true} - ] - }, - { - "name": "Claw8", - "parent": "leg_right5", - "pivot": [-18.00128, -1.52657, 8.77203], - "rotation": [6.46283, -10.46681, 26.49382], - "cubes": [ - {"origin": [-21.65148, -4.61652, -7.8279], "size": [2, 4, 9], "inflate": -0.2, "pivot": [-20.65148, -2.31652, 0.1721], "rotation": [-8.25367, 3.37646, -28.00254], "uv": [259, 183], "mirror": true}, - {"origin": [-17.92522, -5.14152, -2.79598], "size": [2, 3, 12], "inflate": 0.5, "pivot": [-20.45386, -7.812, 13.08583], "rotation": [-2.31336, 4.43385, -27.58957], "uv": [0, 284], "mirror": true}, - {"origin": [-19.82522, -0.64152, -1.52098], "size": [2, 3, 12], "inflate": 0.4, "pivot": [-22.35386, -3.312, 14.36083], "rotation": [14.70847, 5.40113, -27.33492], "uv": [45, 283], "mirror": true} - ] - }, - { - "name": "Claw9", - "parent": "leg_right5", - "pivot": [-25.00339, -1.78444, 9.60342], - "rotation": [-6.62428, 31.83686, -25.40349], - "cubes": [ - {"origin": [-23.35319, -4.87439, -6.99651], "size": [2, 4, 9], "inflate": -0.2, "pivot": [-22.35319, -2.57439, 1.00349], "rotation": [-4, -5, 0], "uv": [172, 21], "mirror": true}, - {"origin": [-27.07945, -5.39939, -1.96459], "size": [2, 3, 12], "inflate": 0.5, "pivot": [-22.55081, -8.06987, 13.91722], "rotation": [-2.31336, -4.43385, 27.58957], "uv": [222, 145], "mirror": true}, - {"origin": [-25.17945, -0.89939, -0.68959], "size": [2, 3, 12], "inflate": 0.4, "pivot": [-20.65081, -3.56987, 15.19222], "rotation": [14.70847, -5.40113, 27.33492], "uv": [222, 130], "mirror": true} - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/NeoForge/src/main/resources/assets/bluelib/lang/en_us.json b/NeoForge/src/main/resources/assets/bluelib/lang/en_us.json deleted file mode 100644 index 8371c823..00000000 --- a/NeoForge/src/main/resources/assets/bluelib/lang/en_us.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "entity.bluelib.example_one": "Example", - "entity.bluelib.example_two": "Example" -} \ No newline at end of file diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png b/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/bright.png deleted file mode 100644 index e7ebe1318d4146bb10dca6e53c6a815e9ec4f0c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8pkQEtPlzj!&W-dj)XETq4p!hyw%*PB>6gHc&$n9=U$y$Y z=ULGFkm<(URR6k*f9~ifPORfQ8{fFN_3La2ewpdrfjf9l==L1Ewstv_XZ2P)c>&If zo7udFLmZS{`L3Ee6k9MnkvtTx<8Wy&hjW9I+WA{b=XXy`<=Mx-{D3oOZFPXx*MkqX zopgEQ%)BO|P0GxO`=7DhTSkX`)|Ov;_wF(JQ^qRb6;Z{!LrZLd&fRoXz1eGZZiJTX zm%F)N?!wuueJ>b}9}~N|e}$?_Y?+eN-boqvB=;!je&qhsWu|1$&{>iw>T&p)O5eGP z?&bGy2-@$?61i~7>)RH^=4TPFrtI4gsia;z^O)Hum9@`z9DjUbLid4H8UCA;o~gcI z;9{45H}4Xg_xk>?q7EhJ|FdO$xh>$s{He+0%H_s(BaX|Ao~)CalRmvyb&z|yU*ey9 qACrmXntbLwZDRvwC@P5A$Jpe($}z8};3Y8L89ZJ6T-G@yGywpxb1(q_ diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png b/NeoForge/src/main/resources/assets/bluelib/textures/entity/dragon/dark.png deleted file mode 100644 index 56c9452f64ef0b1e71cecef3b4d07f56ae847633..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8pkQEtPlzj!mKPJ^=Hz5!W#wdNPn^2p^s67*vJwUgQb~?#2X}7uGm#gP zQ06^oDwgx$fq}uR<%$^@8TFMVidv2~UU@d+Y|c^~DgvxPb0$Wc7}!LuS~IT`$dN7y z@(X78j}sipEHVW;@~EeaV@SoEw^wiHEjAEfdvHHFiDPf3^4f2I61s;NV<1;Z1`L*Y6Om-ccvH#n)Czom43_rz45ef-N0ICIuk2Y7uw_+Z;f zmp9JLYa-gD%#67I8QZ;ObjW9I`L%cN9-}{HtO8yURm?lI#1`n>O;^>My;kQ&Xvu!L zoBQQ1oXy(zg5mfvv77r>sH()4DLL((lyOgTkAm(;?mt~-O7;w$C5fUQho7nRovY|x ze*cD`{q8K03#YukZBcA~7V&Dzz73H|>a{bEnSD}O`+Udo$0sIqA6S*)ze(wt>I()g zcKLVnF0py9@Bb?5P;&l1TgI2$0zS;2noO=-ZfrN=xXkFuI;lD7(|c71xu^Rj{>k?- onMkh5XU@|$HeiOLf|z}bP2Q^<^Lh$i0^^;*)78&qol`;+0O_S2&j0`b diff --git a/NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png b/NeoForge/src/main/resources/assets/bluelib/textures/entity/rex/brown.png deleted file mode 100644 index f2956d0504901ccd33fb2067b7631ba08471c5ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3454 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 or57IkfgP>p|9}4H3?K* zd$|Vy0Lxt%z&JT@wO!)n0A&PtxcTWHMQ;CCUK+VbR@PgIE_Q-#4VZ+o>m>4&1Ni!+e7d%l_n? zxZ~ZcB#F9yLg{*Zse~b2F@UYst7MK&{iUQ_aG5EvBgvGNXSSOn&)a!Pwl4YxCIRZr zrAF;ib-vH8++2$fyhbC(n*6E`H_m9e5j)dx#4vTTIM(N7SJ&DT!#AwbRgg-JQwN5Q zx5emxTfD z<_{FgIf}z3c0d4#tD#w9mk5BOP9zjaEKzEgPdNzdq+Fv8RiifJ6`& zvx`(knW5m^Q7YzIDsK%yoEEKP*to+aayaWS%U7eh^5KPKEi0l+qpb>Sj3-;5;D+Kv zHlYL-i|VI}v!0##+8Tmz3N3|4)Zp-ePN_qE;D;FvD1ULzXKSxNHqSj&!)yt!U%(h8{>l>X*3G z4Q~FW@*G8)!++>u?i3VOvVR^=a}as+}U{ny5{`LCt;Y zkO{jf(STt?eR~A|C|L*A`=Jo@0c(8qWjZ!ts%wf4*qe=-BnD9I5Y1D}^z#BBF%pE) zl>}R84GSTDkh!q8L5V|p^W~sxAbO7}5@Gd2@dack6VEW$o1FSADwp;WBA#Fqs{UVX zGZnHihI?Q>wI2@j+hNz8O|0QYC41S$o%0jx; z@W29W8|&NuB)_Qaq9M|4Cg#m1olT!j+qyepp4OlgNrC8VrMEU={pUVObBMHjgc1wK zsq{7j52I5RW`nJ7;`ubl1cmNWI+;L9FSj+VU+T^N)LJM6Wp)lVs1y}8XHa_g~ z&Nvc@>7Bm1^WT@q#QUH2gpsl8jp!=!4$+J{6e2PuRC{AZAFtJoti}vQQz9%93)Jv@ zyFFLtJ?~V7jRsa)!wh|m--{awAi{odkjHLIAH4c(g@i>XrbqcZ2>P$-ncZB%-wva( zD?5>%sFYVXnp|OD@5wc&2RgL@X^*t^l|mto*0ZWOJ8mRKs-j|<=sELnkVIrOmN-@@ zLrD-VE0y(+ioeT_yL5E1rnaO3PxCqFpB1&`%C2%X+L$T~1m&1