From 5139cf6e6950f2449090ecb2c658009458e7a468 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sun, 15 Oct 2023 14:36:17 +0200 Subject: [PATCH] Cleanup. Update Forge and GuideAPI to recommended --- README.md | 3 ++- gradle.properties | 4 ++-- .../entity/ai/goals/GolemTargetNonVillageFactionGoal.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b253b8c236..aa2079b0f2 100755 --- a/README.md +++ b/README.md @@ -29,8 +29,9 @@ The following labeling scheme is used: - *discussion*: Looking for feedback - *enhancement*: Any minor tweak that can be introduced in minor releases - *feature*: Any change that takes more time to implement and test +- *accepted*: Any feature/enhancement that is planned to be implemented eventually - *1.12-1.***: Affecting only a specific MC version -- *v1.8-v1.**: Bug affecting or enhancement targeting a specific Vamprism release branch +- *v1.8-v1.**: Bug affecting or enhancement targeting a specific Vampirism release branch - *latest*: Bug affecting or enhancement targeting the latest (potentially unreleased) Vampirism branch diff --git a/gradle.properties b/gradle.properties index 68e8fe379e..5f81385d33 100755 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G # forge minecraft_version=1.20.1 minecraft_version_range=[1.20.1,1.21) -forge_version=47.1.0 +forge_version=47.2.0 forge_version_range=[47,) loader_version_range=[47,) mappings_channel=parchment @@ -38,5 +38,5 @@ include_terrablender=true #Dependencies/Optional Libraries jei_mc_version=1.20.1 jei_version=15.0.0.12 -guideapi_version=1.20.1-2.2.6-alpha+20230617-1850 +guideapi_version=1.20.1-2.2.6 terrablender_version=1.20.1-3.0.0.164 diff --git a/src/main/java/de/teamlapen/vampirism/entity/ai/goals/GolemTargetNonVillageFactionGoal.java b/src/main/java/de/teamlapen/vampirism/entity/ai/goals/GolemTargetNonVillageFactionGoal.java index 53246d5d0b..a016888fc7 100644 --- a/src/main/java/de/teamlapen/vampirism/entity/ai/goals/GolemTargetNonVillageFactionGoal.java +++ b/src/main/java/de/teamlapen/vampirism/entity/ai/goals/GolemTargetNonVillageFactionGoal.java @@ -40,7 +40,7 @@ public boolean canContinueToUse() { return super.canContinueToUse(); } - @SuppressWarnings({"unchecked", "rawtypes"}) + @Override public boolean canUse() { if (golem.tickCount < 20) return false; // Some delay to allow nearby totems to load @@ -58,6 +58,7 @@ protected void findTarget() { * * @return Whether the faction has changed */ + @SuppressWarnings({"unchecked", "rawtypes"}) private boolean determineGolemFaction() { IFaction faction = VReference.HUNTER_FACTION; if (VampirismConfig.BALANCE.golemAttackNonVillageFaction.get()) {