Merge branch '1.19.4'

# Conflicts:
#	.github/versions.json
#	common/src/main/resources/assets/friendsandfoes/lang/ru_ru.json
#	gradle.properties

.github/versions.json

@@ -1,11 +1,11 @@
 {
-	"1.20.1": "1.9.4",
-	"1.20": "1.9.4",
-	"1.19.4": "1.8.6",
-	"1.19.3": "1.8.6",
-	"1.19.2": "1.8.6",
-	"1.19.1": "1.8.6",
-	"1.19": "1.8.6",
+	"1.20.1": "1.9.5",
+	"1.20": "1.9.5",
+	"1.19.4": "1.8.7",
+	"1.19.3": "1.8.7",
+	"1.19.2": "1.8.7",
+	"1.19.1": "1.8.7",
+	"1.19": "1.8.7",
 	"1.18.2": "1.4.7",
 	"1.18.1": "1.2.5",
 	"1.18": "1.2.5"

common/src/main/java/com/faboslav/friendsandfoes/entity/MaulerEntity.java

@@ -117,6 +117,7 @@ public MaulerEntity(EntityType<? extends MaulerEntity> entityType, World world)
 		BURROWING_DOWN_ANIMATION_PROGRESS = DataTracker.registerData(MaulerEntity.class, TrackedDataHandlerRegistry.FLOAT);
 	}
 
+	@Override
 	protected void initDataTracker() {
 		super.initDataTracker();
 		this.dataTracker.startTracking(TYPE, Type.DESERT.name());
@@ -128,6 +129,7 @@ protected void initDataTracker() {
 		this.dataTracker.startTracking(BURROWING_DOWN_ANIMATION_PROGRESS, 0.0F);
 	}
 
+	@Override
 	public void writeCustomDataToNbt(NbtCompound nbt) {
 		super.writeCustomDataToNbt(nbt);
 		this.writeAngerToNbt(nbt);
@@ -137,7 +139,7 @@ public void writeCustomDataToNbt(NbtCompound nbt) {
 		nbt.putInt(TICKS_UNTIL_NEXT_BURROWING_DOWN_NBT_NAME, this.getTicksUntilNextBurrowingDown());
 		nbt.putFloat(BURROWING_DOWN_ANIMATION_PROGRESS_NBT_NAME, this.getBurrowingDownAnimationProgress());
 
-		if (this.isBurrowedDown() && this.burrowDownGoal.getBurrowedDownTicks() > 0) {
+		if (this.burrowDownGoal != null && this.isBurrowedDown() && this.burrowDownGoal.getBurrowedDownTicks() > 0) {
 			nbt.putInt(BURROWED_DOWN_TICKS_NBT_NAME, this.burrowDownGoal.getBurrowedDownTicks());
 		}
 	}
@@ -152,7 +154,7 @@ public void readCustomDataFromNbt(NbtCompound nbt) {
 		this.setTicksUntilNextBurrowingDown(nbt.getInt(TICKS_UNTIL_NEXT_BURROWING_DOWN_NBT_NAME));
 		this.setBurrowingDownAnimationProgress(nbt.getFloat(BURROWING_DOWN_ANIMATION_PROGRESS_NBT_NAME));
 
-		if (this.isBurrowedDown() && nbt.contains(BURROWED_DOWN_TICKS_NBT_NAME)) {
+		if (this.burrowDownGoal != null && this.isBurrowedDown() && nbt.contains(BURROWED_DOWN_TICKS_NBT_NAME)) {
 			this.burrowDownGoal.setBurrowedDownTicks(nbt.getInt(BURROWED_DOWN_TICKS_NBT_NAME));
 			this.setInvulnerable(true);
 			this.setInvisible(true);

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.configureondemand=false
 # Mod
 mod_name=Friends&Foes
 mod_id=friendsandfoes
-mod_version=1.9.4
+mod_version=1.9.5
 mod_author=Faboslav
 mod_description=Adds outvoted and forgotten mobs from the mob votes in a believable vanilla plus style.
 maven_group=com.faboslav.friendsandfoes