From 52d4a9d581016c88211ef85d2a0f32448ce46c33 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Mon, 6 Jul 2020 00:14:09 -0300
Subject: [PATCH] adjustment to piglins respawning in bastions.

---
 src/main/java/carpet/CarpetSettings.java                  | 8 ++++++--
 .../java/carpet/mixins/BastionRemnantFeatureMixin.java    | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java
index 6d914e66..1e452f2b 100644
--- a/src/main/java/carpet/CarpetSettings.java
+++ b/src/main/java/carpet/CarpetSettings.java
@@ -214,8 +214,12 @@ public class CarpetSettings
     @Rule( desc = "Shulkers will respawn in end cities", category = FEATURE )
     public static boolean shulkerSpawningInEndCities = false;
 
-    @Rule( desc = "Piglin brutes will respawn in bastion remnants", category = FEATURE )
-    public static boolean bruteSpawningInBastionRemnants = false;
+    @Rule(
+            desc = "Piglins will respawn in bastion remnants",
+            extra = "Includes piglins, brutes, and a few hoglins",
+            category = FEATURE
+    )
+    public static boolean piglinsSpawningInBastions = false;
 
     @Rule(desc = "Entities pushed or moved into unloaded chunks no longer disappear", category = {EXPERIMENTAL, BUGFIX})
     public static boolean unloadedEntityFix = false;
diff --git a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java b/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java
index 400cd1bc..ea28e41c 100644
--- a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java
+++ b/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java
@@ -18,7 +18,11 @@ import java.util.List;
 @Mixin(BastionRemnantFeature.class)
 public abstract class BastionRemnantFeatureMixin extends StructureFeature<BastionRemnantFeatureConfig> {
 
-    private static final List<Biome.SpawnEntry> spawnList = Lists.newArrayList(new Biome.SpawnEntry(EntityType.PIGLIN_BRUTE, 5, 1, 2), new Biome.SpawnEntry(EntityType.PIGLIN, 10, 2, 4));
+    private static final List<Biome.SpawnEntry> spawnList = Lists.newArrayList(
+            new Biome.SpawnEntry(EntityType.PIGLIN_BRUTE, 5, 1, 2),
+            new Biome.SpawnEntry(EntityType.PIGLIN, 10, 2, 4),
+            new Biome.SpawnEntry(EntityType.HOGLIN, 2, 1, 2)
+    );
 
     public BastionRemnantFeatureMixin(Codec<BastionRemnantFeatureConfig> codec) {
         super(codec);
@@ -27,7 +31,7 @@ public abstract class BastionRemnantFeatureMixin extends StructureFeature<Bastio
     @Override
     public List<Biome.SpawnEntry> getMonsterSpawns()
     {
-        if (CarpetSettings.bruteSpawningInBastionRemnants)
+        if (CarpetSettings.piglinsSpawningInBastions)
             return spawnList;
         return Collections.emptyList();
     }