2.3.4 Release

Author: MeAlam1

changelog.md

@@ -1,19 +1,28 @@
-# 2.3.3.6 MoLang Additions
-
-### We will be gradually releasing Minor versions with a ton of MoLang additions.
-
-**Feel Free to Suggest MoLangs that you would like to see added in the future.**
+# 2.3.4 MoLang Additions
 
 ## Warning:
 
-* **This is a major update series with extensive changes. While everything has been tested privately, the sheer size means bugs
+* **This is a major update series with extensive changes. While everything has been tested privately, the sheer size
+  means bugs
   may still occur. Please report any issues on GitHub or message `@me_alam` on Discord.**
 * **The version will remain minor until stability and feature completeness are confirmed.**
 
 ## Added
 
 * Added all the MoLang for:
-    * PatrollingMonster
+    * Saddleable
+    * Ownable
+
+## Changed
+
+* Refactored some shared Entity Rendering code to reduce duplication.
+
+### From Previous Beta's
+
+* Added a TypeAdapter for the Animation Controllers.
+* Made the JSONMerger Static, so it can be used without instantiation.
+* Minor Cleanup in the EntityMoLang Registration.
+* And a lot of MoLang!!!!
 
 ## Epilogue
 

changelog_molang.md

@@ -0,0 +1,22 @@
+# {VERSION} MoLang Additions
+
+### We will be gradually releasing Minor versions with a ton of MoLang additions.
+
+**Feel Free to Suggest MoLangs that you would like to see added in the future.**
+
+## Warning:
+
+* **This is a major update series with extensive changes. While everything has been tested privately, the sheer size means bugs
+  may still occur. Please report any issues on GitHub or message `@me_alam` on Discord.**
+* **The version will remain minor until stability and feature completeness are confirmed.**
+
+## Added
+
+* Added all the MoLang for:
+    * 
+
+## Epilogue
+
+* Thank you for your continued support and patience.
+* Please keep reporting your issues so we can finalize these features and ensure a BugFree Experience.
+* If you have any questions or need assistance, feel free to reach out on Discord (@me_alam) or GitHub (MeAlam1)

common/build.gradle.kts

@@ -52,7 +52,7 @@ modrinth {
     uploadFile.set(tasks.named<Jar>("jar"))
     changelog = rootProject.file("changelog.md").readText(Charsets.UTF_8)
     gameVersions.set(listOf(mcVersion, "1.21.2", "1.21.3"))
-    versionType = "beta"
+    versionType = "release"
     loaders.set(listOf("neoforge", "forge"))
     dependencies {
         required.project("bluelib")
@@ -69,7 +69,7 @@ tasks.register<TaskPublishCurseForge>("publishToCurseForge") {
 
     val mainFile = upload(1132979, tasks.jar)
     mainFile.displayName = "${version}-common-${mcVersion}-${modId}"
-    mainFile.releaseType = "beta"
+    mainFile.releaseType = "release"
     mainFile.addModLoader("NeoForge", "Fabric", "Forge")
     mainFile.addGameVersion(mcVersion, "1.21.2", "1.21.3")
     mainFile.addJavaVersion("Java 21")

common/src/main/java/software/bluelib/BlueLibConstants.java

@@ -59,7 +59,7 @@ public static <T> ServiceLoader<T> loadAll(@NotNull Class<T> pClazz) {
 	public static final String MOD_NAME = "BlueLib";
 
 	@NotNull
-	public static final String VERSION = "2.3.3.6";
+	public static final String VERSION = "2.3.4";
 
 	@Nullable
 	public static MinecraftServer server;

common/src/main/java/software/bluelib/api/molang/context/entity/OwnableMoLang.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.molang.context.entity;
+
+import java.util.function.Supplier;
+import net.minecraft.world.entity.OwnableEntity;
+import org.jetbrains.annotations.NotNull;
+import software.bluelib.api.molang.context.BaseMoLangContext;
+
+public class OwnableMoLang extends BaseMoLangContext {
+
+	public OwnableMoLang(@NotNull Supplier<OwnableEntity> pOwnableEntitySup) {
+		OwnableEntity ownableEntity = pOwnableEntitySup.get();
+		setVariable("get_owner", ownableEntity.getOwner());
+		setVariable("level", ownableEntity.level());
+		setVariable("get_owner_uuid", ownableEntity.getOwnerUUID());
+	}
+}

common/src/main/java/software/bluelib/api/molang/context/entity/SaddleableMoLang.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.molang.context.entity;
+
+import java.util.function.Supplier;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.Saddleable;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import software.bluelib.api.molang.context.BaseMoLangContext;
+
+public class SaddleableMoLang extends BaseMoLangContext {
+
+	public SaddleableMoLang(@NotNull Supplier<Saddleable> pSaddleableSup) {
+		Saddleable saddleable = pSaddleableSup.get();
+		setVariable("is_saddleable", saddleable.isSaddleable());
+		setVariable("is_saddled", saddleable.isSaddled());
+		setVariable("get_saddle_sound_event", saddleable.getSaddleSoundEvent());
+
+		registerFunction("equip_saddle", (args, runtime) -> {
+			if (!(args.getFirst() instanceof ItemStack item)) {
+				return saddleable.isSaddled();
+			}
+			SoundSource soundSource = null;
+			if (args.size() > 1 && args.get(1) instanceof SoundSource) {
+				soundSource = (SoundSource) args.get(1);
+			}
+			saddleable.equipSaddle(item, soundSource);
+			return saddleable.isSaddled();
+		});
+	}
+}

common/src/main/java/software/bluelib/api/molang/registry/MoLangEntityRegistry.java

@@ -61,6 +61,10 @@ public static void init() {
 		registerEntityContext(hangingEntity -> hangingEntity instanceof HangingEntity ? new HangingEntityMoLang(() -> (HangingEntity) hangingEntity) : null);
 		registerEntityContext(blockAttachedEntity -> blockAttachedEntity instanceof BlockAttachedEntity ? new BlockAttachedEntityMoLang(() -> (BlockAttachedEntity) blockAttachedEntity) : null);
 		registerEntityContext(vehicleEntity -> vehicleEntity instanceof VehicleEntity ? new VehicleEntityMoLang(() -> (VehicleEntity) vehicleEntity) : null);
+
+		registerEntityContext(saddleableEntity -> saddleableEntity instanceof Saddleable ? new SaddleableMoLang(() -> (Saddleable) saddleableEntity) : null);
+		registerEntityContext(ownableEntity -> ownableEntity instanceof OwnableEntity ? new OwnableMoLang(() -> (OwnableEntity) ownableEntity) : null);
+
 		registerEntityContext(entity -> entity instanceof Entity ? new EntityMoLang(() -> entity) : null);
 	}
 }

common/src/main/java/software/bluelib/loader/renderer/entity/BlueEntityRenderer.java

@@ -175,84 +175,65 @@ public void render(@NotNull T pEntity, float pEntityYaw, float pPartialTick, @No
 	@Override
 	public void actuallyRender(@NotNull IRenderContext<T> pContext) {
 		if (pContext instanceof FullRenderContext<T> full) {
-			PoseStack pPoseStack = full.poseStack();
+			PoseStack poseStack = full.poseStack();
 			T animatable = full.animatable();
 			VertexConsumer buffer = full.optionalBuffer();
-			boolean pIsReRender = full.isReRender();
-			float pPartialTick = full.partialTick();
+			boolean isReRender = full.isReRender();
+			float partialTick = full.partialTick();
 
-			pPoseStack.pushPose();
+			poseStack.pushPose();
 
-			LivingEntity livingEntity = animatable instanceof LivingEntity entity ? entity : null;
-			boolean shouldSit = animatable.isPassenger() && (animatable.getVehicle() != null);
-			float lerpBodyRot = livingEntity == null ? 0 : Mth.rotLerp(pPartialTick, livingEntity.yBodyRotO, livingEntity.yBodyRot);
-			float lerpHeadRot = livingEntity == null ? 0 : Mth.rotLerp(pPartialTick, livingEntity.yHeadRotO, livingEntity.yHeadRot);
-			float netHeadYaw = lerpHeadRot - lerpBodyRot;
+			LivingEntity livingEntity = animatable instanceof LivingEntity e ? e : null;
+			boolean shouldSit = animatable.isPassenger() && animatable.getVehicle() != null;
 
-			if (shouldSit && animatable.getVehicle() instanceof LivingEntity livingentity) {
-				lerpBodyRot = Mth.rotLerp(pPartialTick, livingentity.yBodyRotO, livingentity.yBodyRot);
-				netHeadYaw = lerpHeadRot - lerpBodyRot;
-				float clampedHeadYaw = Mth.clamp(Mth.wrapDegrees(netHeadYaw), -85, 85);
-				lerpBodyRot = lerpHeadRot - clampedHeadYaw;
+			float lerpBodyRot = EntityRenderUtils.getLerpBodyRot(livingEntity, partialTick);
+			float lerpHeadRot = EntityRenderUtils.getLerpHeadRot(livingEntity, partialTick);
+			float[] adjusted = EntityRenderUtils.adjustSittingRotations(shouldSit, animatable, lerpHeadRot, lerpBodyRot, partialTick);
+			lerpBodyRot = adjusted[0];
+			float netHeadYaw = adjusted[1];
 
-				if (clampedHeadYaw * clampedHeadYaw > 2500f)
-					lerpBodyRot += clampedHeadYaw * 0.2f;
-
-				netHeadYaw = lerpHeadRot - lerpBodyRot;
-			}
-
-			if (animatable.getPose() == Pose.SLEEPING && livingEntity != null) {
-				Direction bedDirection = livingEntity.getBedOrientation();
-
-				if (bedDirection != null) {
-					float eyePosOffset = livingEntity.getEyeHeight(Pose.STANDING) - 0.1F;
-					pPoseStack.translate(-bedDirection.getStepX() * eyePosOffset, 0, -bedDirection.getStepZ() * eyePosOffset);
-				}
-			}
+			if (livingEntity != null)
+				EntityRenderUtils.applySleepingTranslation(poseStack, livingEntity);
 
 			float nativeScale = livingEntity != null ? livingEntity.getScale() : 1;
-			float ageInTicks = animatable.tickCount + pPartialTick;
-			float limbSwingAmount = 0;
-			float limbSwing = 0;
+			float ageInTicks = animatable.tickCount + partialTick;
 
-			pPoseStack.scale(nativeScale, nativeScale, nativeScale);
-			applyRotations(animatable, pPoseStack, ageInTicks, lerpBodyRot, pPartialTick, nativeScale);
+			poseStack.scale(nativeScale, nativeScale, nativeScale);
+			applyRotations(animatable, poseStack, ageInTicks, lerpBodyRot, partialTick, nativeScale);
 
-			if (!shouldSit && animatable.isAlive() && livingEntity != null) {
-				limbSwingAmount = livingEntity.walkAnimation.speed(pPartialTick);
-				limbSwing = livingEntity.walkAnimation.position(pPartialTick);
+			float[] limbSwingData = livingEntity != null
+					? EntityRenderUtils.computeLimbSwing(livingEntity, shouldSit, partialTick)
+					: new float[] { 0, 0 };
+			float limbSwing = limbSwingData[0];
+			float limbSwingAmount = limbSwingData[1];
 
-				if (livingEntity.isBaby())
-					limbSwing *= 3f;
+			if (!isReRender) {
+				float headPitch = Mth.lerp(partialTick, animatable.xRotO, animatable.getXRot());
+				float motionThreshold = getMotionAnimThreshold(pContext);
 
-				if (limbSwingAmount > 1f)
-					limbSwingAmount = 1f;
-			}
+				boolean moving = livingEntity != null
+						? EntityRenderUtils.isEntityMoving(livingEntity, motionThreshold, limbSwingAmount)
+						: (Math.abs(limbSwingAmount) >= motionThreshold);
 
-			if (!pIsReRender) {
-				float headPitch = Mth.lerp(pPartialTick, animatable.xRotO, animatable.getXRot());
-				float motionThreshold = getMotionAnimThreshold(pContext);
-				Vec3 velocity = animatable.getDeltaMovement();
-				float avgVelocity = (float) ((Math.abs(velocity.x) + Math.abs(velocity.z)) / 2f);
-				AnimationState<T> animationState = new AnimationState<>(animatable, limbSwing, limbSwingAmount, pPartialTick, avgVelocity >= motionThreshold && limbSwingAmount != 0);
+				AnimationState<T> state = new AnimationState<>(animatable, limbSwing, limbSwingAmount, partialTick, moving);
 				long instanceId = getInstanceId(pContext);
-				BlueModel<T> currentModel = getBlueModel();
-
-				animationState.setData(DataTickets.TICK, animatable.getTick(animatable));
-				animationState.setData(DataTickets.ENTITY, animatable);
-				animationState.setData(DataTickets.ENTITY_MODEL_DATA, new EntityModelData(shouldSit, livingEntity != null && livingEntity.isBaby(), -netHeadYaw, -headPitch));
-				currentModel.addAdditionalStateData(animatable, instanceId, animationState::setData);
-				currentModel.handleAnimations(animatable, instanceId, animationState, pPartialTick);
+				BlueModel<T> model = getBlueModel();
+
+				state.setData(DataTickets.TICK, animatable.getTick(animatable));
+				state.setData(DataTickets.ENTITY, animatable);
+				state.setData(DataTickets.ENTITY_MODEL_DATA,
+						new EntityModelData(shouldSit, livingEntity != null && livingEntity.isBaby(), -netHeadYaw, -headPitch));
+				model.addAdditionalStateData(animatable, instanceId, state::setData);
+				model.handleAnimations(animatable, instanceId, state, partialTick);
 			}
 
-			pPoseStack.translate(0, 0.01f, 0);
-
-			this.modelRenderTranslations = new Matrix4f(pPoseStack.last().pose());
+			poseStack.translate(0, 0.01f, 0);
+			this.modelRenderTranslations = new Matrix4f(poseStack.last().pose());
 
 			if (buffer != null)
 				BlueRenderer.super.actuallyRender(full);
 
-			pPoseStack.popPose();
+			poseStack.popPose();
 		} else if (pContext instanceof BaseRenderContext<T> base) {
 			handleBaseActuallyRenderContext(base, this);
 		}