Updated changelog, bumped versions

Author: Faboslav

.github/versions.json

@@ -1,7 +1,7 @@
 {
-  "1.19.2": "1.5.10",
-  "1.19.1": "1.5.10",
-  "1.19": "1.5.10",
+  "1.19.2": "1.5.11",
+  "1.19.1": "1.5.11",
+  "1.19": "1.5.11",
   "1.18.2": "1.4.5",
   "1.18.1": "1.2.5",
   "1.18": "1.2.5"

CHANGELOG.md

@@ -1,3 +1,9 @@
+## mc1.19.2-1.5.11, September 30, 2022
+
+- Glare is now breedable (it can have children)
+- Updated translations
+- Added config option to enable/disable glare griefing
+
 ## mc1.19.2-1.5.10, September 09, 2022
 
 - Fixed incompatibility with YOUNG mods

common/src/main/java/com/faboslav/friendsandfoes/api/IllusionerEntityAccess.java common/src/main/java/com/faboslav/friendsandfoes/advancements/api/IllusionerEntityAccess.java

@@ -1,4 +1,4 @@
-package com.faboslav.friendsandfoes.api;
+package com.faboslav.friendsandfoes.advancements.api;
 
 import com.faboslav.friendsandfoes.mixin.IllusionerEntityMixin;
 import net.minecraft.entity.mob.IllusionerEntity;

common/src/main/java/com/faboslav/friendsandfoes/client/render/entity/model/GlareEntityModel.java

@@ -196,7 +196,16 @@ private void animateLayers(
 	}
 
 	@Override
-	public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) {
+	public void render(
+		MatrixStack matrices,
+		VertexConsumer vertices,
+		int light,
+		int overlay,
+		float red,
+		float green,
+		float blue,
+		float alpha
+	) {
 		this.getPart().render(matrices, vertices, light, overlay, red, green, blue, alpha);
 	}
 }

common/src/main/java/com/faboslav/friendsandfoes/entity/ai/goal/BeePollinateMoobloomGoal.java

@@ -146,7 +146,7 @@ public void tick() {
 		}
 	}
 
-	protected void pollinate() {
+	private void pollinate() {
 		for (int i = 0; i < 7; ++i) {
 			double d = this.beeEntity.getRandom().nextGaussian() * 0.02D;
 			double e = this.beeEntity.getRandom().nextGaussian() * 0.02D;
@@ -195,15 +195,15 @@ private Vec3d getMoobloomPollinationPos() {
 		);
 	}
 
-	protected boolean completedPollination() {
+	private boolean completedPollination() {
 		return this.pollinationTicks > 200;
 	}
 
-	protected boolean isRunning() {
+	private boolean isRunning() {
 		return this.running;
 	}
 
-	protected void setIsRunning(boolean isRunning) {
+	private void setIsRunning(boolean isRunning) {
 		this.running = isRunning;
 	}
 

common/src/main/java/com/faboslav/friendsandfoes/mixin/IllusionerEntityMixin.java

@@ -1,7 +1,7 @@
 package com.faboslav.friendsandfoes.mixin;
 
 import com.faboslav.friendsandfoes.FriendsAndFoes;
-import com.faboslav.friendsandfoes.api.IllusionerEntityAccess;
+import com.faboslav.friendsandfoes.advancements.api.IllusionerEntityAccess;
 import com.faboslav.friendsandfoes.util.RandomGenerator;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
@@ -72,6 +72,11 @@ protected IllusionerEntityMixin(
 	@Override
 	public void initDataTracker() {
 		super.initDataTracker();
+
+		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
+			return;
+		}
+
 		this.dataTracker.startTracking(IS_ILLUSION, false);
 		this.dataTracker.startTracking(WAS_ATTACKED, false);
 		this.dataTracker.startTracking(TICKS_UNTIL_DESPAWN, 0);
@@ -81,6 +86,11 @@ public void initDataTracker() {
 	@Override
 	public void writeCustomDataToNbt(NbtCompound nbt) {
 		super.writeCustomDataToNbt(nbt);
+
+		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
+			return;
+		}
+
 		nbt.putBoolean(IS_ILLUSION_NBT_NAME, this.isIllusion());
 		nbt.putBoolean(WAS_ATTACKED_NBT_NAME, this.wasAttacked());
 		nbt.putInt(TICKS_UNTIL_DESPAWN_NBT_NAME, this.getTicksUntilDespawn());
@@ -90,6 +100,11 @@ public void writeCustomDataToNbt(NbtCompound nbt) {
 	@Override
 	public void readCustomDataFromNbt(NbtCompound nbt) {
 		super.readCustomDataFromNbt(nbt);
+
+		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
+			return;
+		}
+
 		this.setIsIllusion(nbt.getBoolean(IS_ILLUSION_NBT_NAME));
 		this.setWasAttacked(nbt.getBoolean(WAS_ATTACKED_NBT_NAME));
 		this.setTicksUntilDespawn(nbt.getInt(TICKS_UNTIL_DESPAWN_NBT_NAME));
@@ -99,11 +114,12 @@ public void readCustomDataFromNbt(NbtCompound nbt) {
 	@Override
 	public void initGoals() {
 		super.initGoals();
+
 		this.goalSelector.add(0, new SwimGoal(this));
 		this.goalSelector.add(1, new LookAtTargetGoal());
 		this.goalSelector.add(2, new FleeEntityGoal(this, IronGolemEntity.class, 8.0F, 0.6D, 1.0D));
 
-		if (!this.isIllusion()) {
+		if (FriendsAndFoes.getConfig().enableIllusioner == false || this.isIllusion() == false) {
 			this.goalSelector.add(3, BlindTargetGoalFactory.newBlindTargetGoal((IllusionerEntity) (Object) this));
 		}
 
@@ -119,12 +135,12 @@ public void initGoals() {
 
 	@Override
 	public void tick() {
+		super.tick();
+
 		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
-			this.discard();
+			return;
 		}
 
-		super.tick();
-
 		if (this.getWorld().isClient()) {
 			return;
 		}
@@ -158,6 +174,10 @@ public void tick() {
 	public void tickMovement() {
 		super.tickMovement();
 
+		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
+			return;
+		}
+
 		if (
 			this.world.isClient()
 			|| !this.isIllusion()
@@ -181,19 +201,31 @@ public void tickMovement() {
 
 	@Override
 	public boolean shouldDropXp() {
-		return !this.isIllusion();
+		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
+			return super.shouldDropXp();
+		}
+
+		return this.isIllusion() == false;
 	}
 
 	@Override
 	protected boolean shouldDropLoot() {
-		return !this.isIllusion();
+		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
+			return super.shouldDropLoot();
+		}
+
+		return this.isIllusion() == false;
 	}
 
 	@Override
 	public boolean damage(
 		DamageSource source,
 		float amount
 	) {
+		if (FriendsAndFoes.getConfig().enableIllusioner == false) {
+			return super.damage(source, amount);
+		}
+
 		if (
 			source.getAttacker() instanceof IllusionerEntity
 			|| (

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.configureondemand=false
 # Mod
 mod_name=Friends&Foes
 mod_id=friendsandfoes
-mod_version=1.5.10
+mod_version=1.5.11
 mod_author=Faboslav
 mod_description=Adds all eliminated mobs from the minecraft mob votes along with the forgotten mobs like the Illusioner.
 maven_group=com.faboslav.friendsandfoes
@@ -17,7 +17,7 @@ maven_group=com.faboslav.friendsandfoes
 minecraft_version=1.19.2
 
 #Mappings
-yarn_mappings=1.19.2+build.1:v2
+yarn_mappings=1.19.2+build.18:v2
 
 # Architectury
 enabled_platforms=fabric,forge,quilt
@@ -28,11 +28,11 @@ mixin_extras_version=0.0.12
 
 # Fabric https://fabricmc.net/versions.html
 fabric_loader_version=0.14.9
-fabric_api_version=0.60.0+1.19.2
+fabric_api_version=0.62.0+1.19.2
 
-# Forge https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.html
-forge_version=1.19.2-43.1.2
+# Forge https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.2.html
+forge_version=1.19.2-43.1.1
 
 # Quilt https://lambdaurora.dev/tools/import_quilt.html
-quilt_loader_version=0.17.3
-quilt_fabric_api_version=4.0.0-beta.9+0.60.0-1.19.2
+quilt_loader_version=0.17.5-beta.3
+quilt_fabric_api_version=4.0.0-beta.13+0.62.0-1.19.2