Fix for campsite generation

florensie · Feb 21, 2022 · fb305ec · fb305ec
1 parent 1c5ca4f
commit fb305ec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/main/java/artifacts/common/config/ModConfig.java b/src/main/java/artifacts/common/config/ModConfig.java
@@ -51,8 +51,8 @@ private WorldGen() {
 		public static final class Campsite {
 			@ConfigEntry.Gui.RequiresRestart
 			@ConfigEntry.Gui.Tooltip(count = 2)
-			@ConfigEntry.BoundedDiscrete(max = 100)
-			public int genChance = 8;
+			@ConfigEntry.BoundedDiscrete(max = 10_000, min = 1)
+			public int campsiteRarity = 5;
 
 			@ConfigEntry.Gui.Tooltip(count = 2)
 			@ConfigEntry.BoundedDiscrete(max = 100)

diff --git a/src/main/java/artifacts/common/init/ModFeatures.java b/src/main/java/artifacts/common/init/ModFeatures.java
@@ -26,6 +26,8 @@
 
 import java.util.function.Predicate;
 
+import static artifacts.Artifacts.CONFIG;
+
 public class ModFeatures {
 
 	public static final Feature<NoneFeatureConfiguration> CAMPSITE = Registry.register(
@@ -37,9 +39,13 @@ public class ModFeatures {
 
 	public static void register() {
 		Predicate<BiomeSelectionContext> biomeSelector = BiomeSelectors.foundInOverworld();
-		BiomeModifications.addFeature(biomeSelector, GenerationStep.Decoration.UNDERGROUND_STRUCTURES,
-				BuiltinRegistries.PLACED_FEATURE.getResourceKey(PLACED_CAMPSITE)
-						.orElseThrow(() -> new RuntimeException("Failed to get feature from registry")));
+
+
+		if (CONFIG.worldgen.campsite.campsiteRarity < 10_000) {
+			BiomeModifications.addFeature(biomeSelector, GenerationStep.Decoration.UNDERGROUND_STRUCTURES,
+					BuiltinRegistries.PLACED_FEATURE.getResourceKey(PLACED_CAMPSITE)
+							.orElseThrow(() -> new RuntimeException("Failed to get feature from registry")));
+		}
 	}
 
 	private ModFeatures() {
@@ -56,8 +62,7 @@ private ModFeatures() {
 				BuiltinRegistries.PLACED_FEATURE,
 				Artifacts.id("underground_campsite"),
 				configuredFeature.placed(
-						// TODO: genchance is different, we probably got it all wrong
-						RarityFilter.onAverageOnceEvery(Artifacts.CONFIG.worldgen.campsite.genChance),
+						RarityFilter.onAverageOnceEvery(CONFIG.worldgen.campsite.campsiteRarity),
 						InSquarePlacement.spread(),
 						HeightRangePlacement.uniform(
 								VerticalAnchor.aboveBottom(32),

diff --git a/src/main/resources/artifacts.mixins.json b/src/main/resources/artifacts.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "artifacts.mixin.mixins",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "plugin": "artifacts.mixin.ArtifactsMixinPlugin",
   "mixins": [
     "accessors.DamageSourceAccessor",

diff --git a/src/main/resources/assets/artifacts/lang/en_us.json b/src/main/resources/assets/artifacts/lang/en_us.json
@@ -114,9 +114,9 @@
   "text.autoconfig.artifacts.option.worldgen.artifactRarity.@Tooltip[4]": "Setting this to 10000 will completely prevent artifacts from spawning",
   "text.autoconfig.artifacts.option.worldgen.artifactRarity.@Tooltip[5]": "When set to 0, every container that can contain artifacts will contain an artifact",
   "text.autoconfig.artifacts.option.worldgen.campsite": "Underground Campsites",
-  "text.autoconfig.artifacts.option.worldgen.campsite.genChance": "Generation frequency (per chunk)",
-  "text.autoconfig.artifacts.option.worldgen.campsite.genChance.@Tooltip[0]": "An attempt to generate a campsite might still fail",
-  "text.autoconfig.artifacts.option.worldgen.campsite.genChance.@Tooltip[1]": "depending on the density and shape of caves",
+  "text.autoconfig.artifacts.option.worldgen.campsite.campsiteRarity": "Campsite rarity",
+  "text.autoconfig.artifacts.option.worldgen.campsite.campsiteRarity.@Tooltip[0]": "A higher number means less frequent generation",
+  "text.autoconfig.artifacts.option.worldgen.campsite.campsiteRarity.@Tooltip[1]": "Also depends on the density and shape of caves",
   "text.autoconfig.artifacts.option.worldgen.campsite.mimicChance": "Mimic chance",
   "text.autoconfig.artifacts.option.worldgen.campsite.mimicChance.@Tooltip[0]": "Probability for a mimic to spawn",
   "text.autoconfig.artifacts.option.worldgen.campsite.mimicChance.@Tooltip[1]": "instead of a loot container",