Rascal

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,7 +8,7 @@ body:
         attributes:
             value: |
                 Thanks for taking the time to fill out this bug report! Anyhow before you take your time answering all of the question please make sure of the following:
-                  - Are you sure that there is not already reported same or similiar bug? You can try to use the [search](https://github.com/Faboslav/friends-and-foes/issues).
+                  - Are you sure that there is not already reported same or similar bug? You can try to use the [search](https://github.com/Faboslav/friends-and-foes/issues).
                   - Are you using the latest version of the mod? You can find the latest version [here](https://github.com/Faboslav/friends-and-foes/releases).
     -   type: input
         id: minecraft-version

.github/ISSUE_TEMPLATE/crash_report.yml

@@ -8,7 +8,7 @@ body:
         attributes:
             value: |
                 Thanks for taking the time to fill out this crash report! Anyhow before you take your time answering all of the question please make sure of the following:
-                  - Are you sure that there is not already reported same or similiar crash? You can try to use the [search](https://github.com/Faboslav/friends-and-foes/issues).
+                  - Are you sure that there is not already reported same or similar crash? You can try to use the [search](https://github.com/Faboslav/friends-and-foes/issues).
                   - Are you using the latest version of the mod? You can find the latest version [here](https://github.com/Faboslav/friends-and-foes/releases).
     -   type: input
         id: minecraft-version

.github/versions.json

@@ -1,5 +1,5 @@
 {
-	"1.19.2": "1.8.8",
+	"1.19.2": "1.8.9",
 	"1.19.1": "1.8.8",
 	"1.19": "1.8.8",
 	"1.18.2": "1.4.8",

blockbench/rascal/rascal.animation.json

@@ -0,0 +1,215 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"give_reward": {
+			"animation_length": 1.54167,
+			"bones": {
+				"head": {
+					"rotation": {
+						"0.0": {
+							"vector": [0, 0, 0]
+						},
+						"0.375": {
+							"vector": [-7.5, -50, 0],
+							"easing": "linear"
+						},
+						"0.4583": {
+							"vector": [-7.5, -40, 0]
+						},
+						"0.6667": {
+							"vector": [0, 0, 0]
+						},
+						"0.8333": {
+							"vector": [15, 0, 0]
+						},
+						"0.9583": {
+							"vector": [15, 0, 0]
+						},
+						"1.0833": {
+							"vector": [0, 0, 0]
+						},
+						"1.25": {
+							"vector": [0, 0, 0]
+						},
+						"1.5417": {
+							"vector": [0, 0, 0]
+						}
+					}
+				},
+				"rightArm": {
+					"rotation": {
+						"0.0": {
+							"vector": [0, 0, 0]
+						},
+						"0.125": {
+							"vector": [-37.5, 0, -20]
+						},
+						"0.4583": {
+							"vector": [-170, 0, -20],
+							"easing": "easeInElastic"
+						},
+						"0.5417": {
+							"vector": [-170, 0, -20],
+							"easing": "easeInElastic"
+						},
+						"0.625": {
+							"vector": [-60, 0, 0]
+						},
+						"0.75": {
+							"vector": [-60, 20, 0]
+						},
+						"1.0833": {
+							"vector": [-60, 20, 0]
+						},
+						"1.25": {
+							"vector": [-60, 20, 0]
+						},
+						"1.5417": {
+							"vector": [0, 0, 0]
+						}
+					},
+					"position": {
+						"0.625": {
+							"vector": [0, 0, 0]
+						},
+						"0.75": {
+							"vector": [0, -2, -1]
+						},
+						"1.0833": {
+							"vector": [0, -2, -1]
+						},
+						"1.25": {
+							"vector": [0, -2, -1]
+						},
+						"1.5417": {
+							"vector": [0, 0, 0]
+						}
+					}
+				},
+				"bag": {
+					"rotation": {
+						"0.4583": {
+							"vector": [0, 0, 0]
+						},
+						"0.5417": {
+							"vector": [5, 0, 0]
+						},
+						"0.625": {
+							"vector": [0, 90, 0]
+						},
+						"0.75": {
+							"vector": [-30, 180, 0]
+						},
+						"0.8333": {
+							"vector": [-30, 180, 0]
+						},
+						"1.0833": {
+							"vector": [-30, 180, 0]
+						},
+						"1.25": {
+							"vector": [-30, 180, 0]
+						},
+						"1.375": {
+							"vector": [0, 90, 0]
+						},
+						"1.4583": {
+							"vector": [5, 0, 0]
+						},
+						"1.5417": {
+							"vector": [0, 0, 0]
+						}
+					},
+					"position": {
+						"0.4583": {
+							"vector": [0, 0, 0]
+						},
+						"0.625": {
+							"vector": [7, 0, -6]
+						},
+						"0.75": {
+							"vector": [-3, -7, -12]
+						},
+						"1.0833": {
+							"vector": [-3, -7, -12]
+						},
+						"1.25": {
+							"vector": [-3, -7, -12]
+						},
+						"1.375": {
+							"vector": [7, 0, -6]
+						},
+						"1.5417": {
+							"vector": [0, 0, 0]
+						}
+					}
+				},
+				"leftArm": {
+					"rotation": {
+						"0.75": {
+							"vector": [0, 0, 0]
+						},
+						"0.8333": {
+							"vector": [-52.5, 0, 0]
+						},
+						"0.9167": {
+							"vector": [-65, -30, 0]
+						},
+						"1.0833": {
+							"vector": [-90, 0, 0]
+						},
+						"1.25": {
+							"vector": [-90, 0, 0]
+						},
+						"1.5417": {
+							"vector": [0, 0, 0]
+						}
+					},
+					"position": {
+						"0.4583": {
+							"vector": [0, 0, 0]
+						},
+						"0.5833": {
+							"vector": [0, -0.25, 0],
+							"easing": "linear"
+						},
+						"0.6667": {
+							"vector": [0, 0, 0]
+						},
+						"0.75": {
+							"vector": [0, 0, 0]
+						},
+						"0.8333": {
+							"vector": [0, -2, -1]
+						},
+						"1.25": {
+							"vector": [0, -2, -1]
+						},
+						"1.5417": {
+							"vector": [0, 0, 0]
+						}
+					}
+				},
+				"body": {
+					"position": {
+						"0.4583": {
+							"vector": [0, 0, 0]
+						},
+						"0.5833": {
+							"vector": [0, -0.25, 0],
+							"easing": "linear"
+						},
+						"0.6667": {
+							"vector": [0, 0, 0]
+						},
+						"1.0833": {
+							"vector": [0, 0, 0]
+						},
+						"1.5": {
+							"vector": [0, 0, 0]
+						}
+					}
+				}
+			}
+		}
+	}
+}

build.gradle

@@ -44,4 +44,4 @@ allprojects {
 	java {
 		withSourcesJar()
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/FriendsAndFoes.java

@@ -58,4 +58,4 @@ public static void postInit() {
 		FriendsAndFoesStructureProcessorTypes.postInit();
 		FriendsAndFoesVillagerProfessions.postInit();
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/advancements/criterion/ActivateZombieHorseTrapCriterion.java

@@ -66,4 +66,4 @@ public JsonObject toJson(AdvancementEntityPredicateSerializer predicateSerialize
 			return jsonObject;
 		}
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/advancements/criterion/CompleteHideAndSeekGameCriterion.java

@@ -0,0 +1,71 @@
+package com.faboslav.friendsandfoes.advancements.criterion;
+
+import com.faboslav.friendsandfoes.FriendsAndFoes;
+import com.faboslav.friendsandfoes.entity.RascalEntity;
+import com.google.gson.JsonObject;
+import net.minecraft.advancement.criterion.AbstractCriterion;
+import net.minecraft.advancement.criterion.AbstractCriterionConditions;
+import net.minecraft.loot.context.LootContext;
+import net.minecraft.predicate.entity.AdvancementEntityPredicateDeserializer;
+import net.minecraft.predicate.entity.AdvancementEntityPredicateSerializer;
+import net.minecraft.predicate.entity.EntityPredicate;
+import net.minecraft.predicate.entity.LootContextPredicate;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.Identifier;
+
+public final class CompleteHideAndSeekGameCriterion extends AbstractCriterion<CompleteHideAndSeekGameCriterion.Conditions>
+{
+	static final Identifier ID = FriendsAndFoes.makeID("complete_hide_and_seek_game");
+
+	public CompleteHideAndSeekGameCriterion() {
+	}
+
+	public Identifier getId() {
+		return ID;
+	}
+
+	public CompleteHideAndSeekGameCriterion.Conditions conditionsFromJson(
+		JsonObject jsonObject,
+		LootContextPredicate extended,
+		AdvancementEntityPredicateDeserializer advancementEntityPredicateDeserializer
+	) {
+		LootContextPredicate extended2 = EntityPredicate.contextPredicateFromJson(jsonObject, "rascal", advancementEntityPredicateDeserializer);
+
+		return new CompleteHideAndSeekGameCriterion.Conditions(extended, extended2);
+	}
+
+	public void trigger(ServerPlayerEntity player, RascalEntity entity) {
+		LootContext lootContext = EntityPredicate.createAdvancementEntityLootContext(player, entity);
+		this.trigger(player, (conditions) -> {
+			return conditions.matches(lootContext);
+		});
+	}
+
+	public static class Conditions extends AbstractCriterionConditions
+	{
+		private final LootContextPredicate entity;
+
+		public Conditions(LootContextPredicate player, LootContextPredicate entity) {
+			super(CompleteHideAndSeekGameCriterion.ID, player);
+			this.entity = entity;
+		}
+
+		public static CompleteHideAndSeekGameCriterion.Conditions any() {
+			return new CompleteHideAndSeekGameCriterion.Conditions(LootContextPredicate.EMPTY, LootContextPredicate.EMPTY);
+		}
+
+		public static CompleteHideAndSeekGameCriterion.Conditions create(EntityPredicate entity) {
+			return new CompleteHideAndSeekGameCriterion.Conditions(LootContextPredicate.EMPTY, EntityPredicate.asLootContextPredicate(entity));
+		}
+
+		public boolean matches(LootContext entityContext) {
+			return this.entity.test(entityContext);
+		}
+
+		public JsonObject toJson(AdvancementEntityPredicateSerializer predicateSerializer) {
+			JsonObject jsonObject = super.toJson(predicateSerializer);
+			jsonObject.add("entity", this.entity.toJson(predicateSerializer));
+			return jsonObject;
+		}
+	}
+}

common/src/main/java/com/faboslav/friendsandfoes/advancements/criterion/TameGlareCriterion.java

@@ -67,4 +67,4 @@ public JsonObject toJson(AdvancementEntityPredicateSerializer predicateSerialize
 			return jsonObject;
 		}
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/block/CopperButtonBlock.java

@@ -51,4 +51,4 @@ public ActionResult onUse(
 
 		return super.onUse(state, world, pos, player, hand, hit);
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/block/ExposedCopperButtonBlock.java

@@ -7,4 +7,4 @@ public final class ExposedCopperButtonBlock extends CopperButtonBlock
 	public ExposedCopperButtonBlock(Settings settings) {
 		super(settings);
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/block/Oxidizable.java

@@ -67,4 +67,4 @@ default Optional<BlockState> getDegradationResult(BlockState state) {
 	default float getDegradationChanceMultiplier() {
 		return this.getDegradationLevel() == net.minecraft.block.Oxidizable.OxidationLevel.UNAFFECTED ? 0.75F:1.0F;
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/block/OxidizedCopperButtonBlock.java

@@ -7,4 +7,4 @@ public final class OxidizedCopperButtonBlock extends CopperButtonBlock
 	public OxidizedCopperButtonBlock(Settings settings) {
 		super(settings);
 	}
-}
+}

common/src/main/java/com/faboslav/friendsandfoes/block/WeatheredCopperButtonBlock.java

@@ -7,4 +7,4 @@ public final class WeatheredCopperButtonBlock extends CopperButtonBlock
 	public WeatheredCopperButtonBlock(Settings settings) {
 		super(settings);
 	}
-}
+}