Fix #105 and #106

Author: skyjay1

CHANGELOG.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2020 Skyler James
+Copyright (c) 2016-2022 Skyler James
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the author(s) be held liable for any damages arising from the use of this software.
 

LICENSE

@@ -12,14 +12,14 @@ mappings_version=1.19.2
 # Mod properties
 mod_name=Extra-Golems
 mod_id=golems
-mod_version=19.2.0
+mod_version=19.2.1
 mod_authors="skyjay1 and the MMD Team"
 mod_description="Adds dozens of golems with unique textures and abilities!"
 maven_group=com.mcmoddev.golems
 archives_base_name=extragolems
 # Dependencies
-forge_version=43.0.2
-forge_version_range=[42,)
-loader_version_range=[42,)
+forge_version=43.1.2
+forge_version_range=[43.1,)
+loader_version_range=[43,)
 top_proj=245211
 top_file=3871444

gradle.properties

@@ -1,15 +1,11 @@
 package com.mcmoddev.golems;
 
-import com.mcmoddev.golems.container.GolemContainer;
-import net.minecraft.ResourceLocationException;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.ForgeConfigSpec;
 
 import java.time.LocalDateTime;
 import java.time.Month;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public final class EGConfig {
 
@@ -22,11 +18,21 @@ public final class EGConfig {
 	private final ForgeConfigSpec.IntValue VILLAGER_GOLEM_SPAWN_CHANCE;
 	private final ForgeConfigSpec.ConfigValue<List<? extends String>> VILLAGER_GOLEM_SPAWN_LIST;
 	private static final String[] defaultVillagerGolemSpawns = {
-			"golems:bookshelf", "golems:clay", "golems:coal", "golems:crafting",
-			"golems:glass", "golems:glowstone", "golems:hay", "golems:leaves",
-			"golems:log", "golems:melon", "golems:moss", "golems:mushroom", "golems:obsidian",
-			"golems:quartz", "golems:red_sandstone", "golems:sandstone",
-			"golems:terracotta", "golems:wool"
+			new ResourceLocation(ExtraGolems.MODID, "bookshelf").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "clay").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "coal").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "crafting").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "glass").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "glowstone").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "hay").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "leaves").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "log").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "melon").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "moss").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "mushroom").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "obsidian").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "terracotta").toString(),
+			new ResourceLocation(ExtraGolems.MODID, "wool").toString()
 	};
 
 	private boolean aprilFirst;
@@ -44,23 +50,23 @@ public final class EGConfig {
 	public EGConfig(final ForgeConfigSpec.Builder builder) {
 		// Global values
 		builder.push("general");
-		this.BEDROCK_GOLEM_CREATIVE_ONLY = builder.comment("When true, only players in creative mode can use a Bedrock Golem spawn item")
+		BEDROCK_GOLEM_CREATIVE_ONLY = builder.comment("When true, only players in creative mode can use a Bedrock Golem spawn item")
 				.define("bedrock_golem_creative_only", true);
-		this.PUMPKIN_BUILDS_GOLEMS = builder.comment("When true, pumpkins can be used to build this mod's golems")
+		PUMPKIN_BUILDS_GOLEMS = builder.comment("When true, pumpkins can be used to build this mod's golems")
 				.define("pumpkin_builds_golems", false);
-		this.ENABLE_FRIENDLY_FIRE = builder.comment("When enabled, attacking a player-built entity will make it attack you")
+		ENABLE_FRIENDLY_FIRE = builder.comment("When enabled, attacking a player-built entity will make it attack you")
 				.define("friendly_fire", true);
-		this.ENABLE_USE_SPELL_ITEM = builder
+		ENABLE_USE_SPELL_ITEM = builder
 				.comment("When enabled, players can use the spell item on a carved pumpkin to convert it to a golem head in-world")
 				.define("use_spell", true);
-		this.ENABLE_HOLIDAYS = builder.comment("Super secret special days")
+		ENABLE_HOLIDAYS = builder.comment("Super secret special days")
 				.define("holidays", true);
-		this.VILLAGER_GOLEM_SPAWN_CHANCE = builder.comment("Percent chance for a villager to summon an Extra Golems entity")
+		VILLAGER_GOLEM_SPAWN_CHANCE = builder.comment("Percent chance for a villager to summon an Extra Golems entity")
 				.defineInRange("villager_summon_chance", 60, 0, 100);
-		this.ENABLE_HEAL_GOLEMS = builder.comment("When enabled, giving blocks and items to golems can restore health")
+		ENABLE_HEAL_GOLEMS = builder.comment("When enabled, giving blocks and items to golems can restore health")
 				.define("heal_golems", true);
-		this.VILLAGER_GOLEM_SPAWN_LIST = builder.comment("Golems that can be summoned by villagers", "(Duplicate entries increase chances)")
-				.defineList("villager_summon_golems", List.of(defaultVillagerGolemSpawns), o -> o instanceof String);
+		VILLAGER_GOLEM_SPAWN_LIST = builder.comment("Golems that can be summoned by villagers", "(Duplicate entries increase chances)")
+				.defineList("villager_summon_golems", List.of(defaultVillagerGolemSpawns), o -> o instanceof String s && ResourceLocation.tryParse(s) != null);
 
 		builder.pop();
 	}
@@ -114,25 +120,6 @@ public void bake() {
 		enableHolidays = ENABLE_HOLIDAYS.get();
 		enableHealGolems = ENABLE_HEAL_GOLEMS.get();
 		villagerGolemSpawnChance = VILLAGER_GOLEM_SPAWN_CHANCE.get();
-		villagerGolemSpawnList = loadVillagerGolemList(VILLAGER_GOLEM_SPAWN_LIST.get());
-	}
-
-
-	private static List<ResourceLocation> loadVillagerGolemList(List<? extends String> config) {
-		final List<ResourceLocation> list = new ArrayList<>();
-		// load all villager golem candidates from config
-		for (final String s : config) {
-			// parse each entry as resource location with error-catching
-			if (s != null && !s.isEmpty()) {
-				try {
-					ResourceLocation golemId = ResourceLocation.tryParse(s);
-					final Optional<GolemContainer> container = ExtraGolems.GOLEM_CONTAINERS.get(golemId);
-					container.ifPresent(c -> list.add(new ResourceLocation(s)));
-				} catch (ResourceLocationException e) {
-					ExtraGolems.LOGGER.error("Invalid golem ID in config file for villager_summon_golems: \"" + s + "\"");
-				}
-			}
-		}
-		return list;
+		villagerGolemSpawnList = VILLAGER_GOLEM_SPAWN_LIST.get().stream().map(ResourceLocation::tryParse).toList();
 	}
 }

src/main/java/com/mcmoddev/golems/EGConfig.java

@@ -69,6 +69,7 @@
 
 import javax.annotation.Nullable;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Base class for all golems in this mod.
@@ -128,10 +129,15 @@ public void setMaterial(final ResourceLocation materialIn) {
 		if (materialIn.equals(material)) {
 			return;
 		}
+		Optional<GolemContainer> oContainer = ExtraGolems.GOLEM_CONTAINERS.get(materialIn);
+		if(!oContainer.isPresent()) {
+			ExtraGolems.LOGGER.error("Failed to load golem container for '" + materialIn.toString() + "'");
+			return;
+		}
 		// update material and container
 		this.getEntityData().set(MATERIAL, materialIn.toString());
 		this.material = materialIn;
-		this.container = ExtraGolems.GOLEM_CONTAINERS.get(materialIn).orElse(GolemContainer.EMPTY);
+		this.container = oContainer.get();
 		this.attributes = new AttributeMap(container.getAttributeSupplier().get().build());
 		this.setInvulnerable(container.getAttributes().getArmor() > MAX_ARMOR);
 		// clear description

src/main/java/com/mcmoddev/golems/entity/GolemBase.java

@@ -17,8 +17,10 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.util.SpawnUtil;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.ai.sensing.GolemSensor;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.npc.Villager;
@@ -110,6 +112,7 @@ public static void onLivingUpdate(final LivingEvent.LivingTickEvent event) {
 				&& event.getEntity() instanceof Villager villager
 				&& !villager.isSleeping()
 				&& villager.tickCount % 90L == 0L
+				&& !checkForNearbyGolem(villager)
 				&& villager.wantsToSpawnGolem(villager.tickCount)
 				&& villager.getRandom().nextInt(100) < ExtraGolems.CONFIG.villagerSummonChance()) {
 			// locate nearby villagers who also want to summon a golem
@@ -145,8 +148,26 @@ public static void onLivingUpdate(final LivingEvent.LivingTickEvent event) {
 	 * @return a random golem material from the config, or the empty material if the config is empty
 	 */
 	private static ResourceLocation getGolemToSpawn(final BlockPos pos, final RandomSource random) {
-		final List<ResourceLocation> options = ExtraGolems.CONFIG.getVillagerGolems();
+		final List<? extends ResourceLocation> options = ExtraGolems.CONFIG.getVillagerGolems();
 		final ResourceLocation choice = options.isEmpty() ? GolemContainer.EMPTY_MATERIAL : options.get(random.nextInt(options.size()));
 		return choice;
 	}
+
+	/**
+	 * Checks if the nearest living entity memory contains any golem or subclass.
+	 * Required because the version used by villagers only checks entity type.
+	 * @param villager the villager
+	 * @return true if a nearby golem was detected.
+	 */
+	private static boolean checkForNearbyGolem(LivingEntity villager) {
+		Optional<List<LivingEntity>> optional = villager.getBrain().getMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES);
+		if (optional.isPresent()) {
+			boolean flag = optional.get().stream().anyMatch(e -> e instanceof IronGolem);
+			if (flag) {
+				GolemSensor.golemDetected(villager);
+				return true;
+			}
+		}
+		return false;
+	}
 }

src/main/java/com/mcmoddev/golems/event/EGForgeEvents.java

@@ -1,15 +1,15 @@
 # The name of the mod loader type to load
 modLoader="javafml"
 # A version range to match for said mod loader
-loaderVersion="[42,)"
+loaderVersion="[43,)"
 # The license for your mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
 license="zlib License"
 # A URL to refer people to when problems occur with this mod
 issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/Extra-Golems/issues"
 
 [[mods]]
     modId="golems"
-    version="19.2.0"
+    version="19.2.1"
     displayName="Extra Golems"
     credits="TheGlitch76, jriwanek, AtelierAmber, and translators - Thanks!"
     authors="skyjay1 and the MMD Team"
@@ -18,6 +18,6 @@ issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/Extra-Golems/iss
 [[dependencies.golems]]
     modId="forge"
     mandatory=true
-    versionRange="[42,)"
+    versionRange="[43.1,)"
     ordering="NONE"
     side="BOTH"