1.18 to 1.19 port

Author: SkyBlade1978

README.md

@@ -22,8 +22,8 @@ Mineralogy 6 is the first full provider. It supplies its rocks, ores, crude-oil
 deposit, geomes, biome influences, and recommended settings to OreSpawn. An
 ore-only provider such as Base Metals can supply ores and host tags without
 enabling rock layers or biome replacement. A total-conversion provider can add
-biomes and replace surfaces, aquifer fluids, snow, and ice without depending on
-TerraBlender.
+biomes and replace surfaces, aquifer fluids, snow, and ice through OreSpawn's
+declarative provider contract.
 
 ## Players And Server Owners
 

docs/AGENTS.md

@@ -27,8 +27,8 @@ Configuration contracts:
   per ore and must also drive vanilla-feature suppression.
 - JSON Schemas and examples are under `META-INF/orespawn/docs/` in the jar.
 - Schema 4 providers may declare `biome_palettes` and `dimension_materials`.
-  Palettes wrap the native dimension biome source; they do not require
-  TerraBlender. Region presets are 128, 256, 512, 1024, and 2048 blocks.
+  Palettes wrap the native dimension biome source. Region presets are 128,
+  256, 512, 1024, and 2048 blocks.
 
 Lifecycle and ownership:
 

docs/API.md

@@ -78,8 +78,7 @@ WorldgenProvider provider = WorldgenProvider.builder("examplemod", 1)
 for one legacy oil rule. New integrations should use `FluidDepositDefinition`.
 
 Register custom biomes with Forge as usual. `OreSpawnBiomes.copyAndRegister`
-provides a small optional convenience for cloning a known biome without adding
-TerraBlender:
+provides a small optional convenience for cloning a known biome:
 
 ```java
 RegistryObject<Biome> candyPlains = OreSpawnBiomes.copyAndRegister(

docs/BIOMES.md

@@ -1,23 +1,22 @@
 # Biomes And World Materials
 
-OreSpawn can place provider biomes and replace their visible world materials
-without requiring TerraBlender. It does not register biomes for a child mod:
-the provider still registers ordinary Forge `Biome` objects, then supplies
-declarative placement and material rules to OreSpawn.
+OreSpawn can place provider biomes and replace their visible world materials.
+It does not register biomes for a child mod: the provider still registers
+ordinary Forge `Biome` objects, then supplies declarative placement and
+material rules to OreSpawn.
 
 This feature is optional. Ore-only providers and existing Mineralogy profiles
 with no biome palettes use Minecraft's original biome source unchanged.
 
 ## How Placement Composes
 
 OreSpawn waits until a server level has its final `ChunkGenerator`, then wraps
-the biome source already selected for that dimension. Vanilla, TerraBlender,
-Biomes O' Plenty, or another framework therefore runs first. OreSpawn reads the
-source biome once and applies pre-baked palette rules.
+the biome source already selected for that dimension. Vanilla or another
+installed biome source therefore runs first. OreSpawn reads the source biome
+once and applies pre-baked palette rules.
 
-The wrapper is native to OreSpawn and has no TerraBlender compile-time or
-runtime dependency. This keeps simple child mods small while still allowing a
-pack that already uses TerraBlender to compose safely.
+The wrapper is native to OreSpawn. This keeps simple child mods small and lets
+OreSpawn compose with the biome source already selected by the pack.
 
 Each palette has:
 

docs/DEVELOPER_GUIDE.md

@@ -179,8 +179,8 @@ chunk invocation and no registry lookup in the placement loop.
 
 Biome palettes wrap the dimension's already-selected biome source and bake
 registry holders, climate ranges, namespace filters, weights, surfaces, and
-world materials at server activation. No TerraBlender API is called. A
-dimension without a palette or material rule keeps the original generator path.
+world materials at server activation. A dimension without a palette or material
+rule keeps the original generator path.
 
 Definitions normally change after a restart. `/orespawn reload` is intended for
 operator-controlled profile reloads. Existing chunks are unchanged unless

docs/DIMENSIONS.md

@@ -10,8 +10,7 @@ Biome palettes and dimension-material rules are separate from terrain
 replacement. They may target `minecraft:overworld`, `minecraft:the_nether`,
 `minecraft:the_end`, or a provider dimension without adding rock strata.
 Unconfigured dimensions keep their original biome source, aquifers, snow, and
-ice. OreSpawn wraps the source already installed by the dimension, so
-TerraBlender is supported when present but is never required.
+ice. OreSpawn wraps the biome source already installed by the dimension.
 
 Each `terrain_dimensions` entry supplies replacement host blocks or tags and
 may restrict generation to explicit biome IDs or biome namespaces. With no

docs/PLAYER_GUIDE.md

@@ -12,6 +12,10 @@ For a normal game:
 3. Open **Help & Guide** for a plain-language tour of the controls.
 4. Press **Done**, then create the world normally.
 
+Hover over unfamiliar controls for a short explanation. The same explanations
+are collected in **Help & Guide**, so a setting can be learned either while
+editing it or one topic at a time.
+
 There is no requirement to use rock strata. Ore-only mods can use OreSpawn to
 place ores in ordinary vanilla stone while every geology control remains idle.
 When no provider supplies rocks, **Configure Rock Strata...** starts with a
@@ -50,6 +54,12 @@ safely instead of breaking world creation.
   style. Namespace scope protects other biome mods unless a pack deliberately
   opts them in.
 
+**World Materials** applies across an entire dimension. **Aquifer Fluid**
+changes the normal below-sea-level fluid, while **Deep Aquifer** can use a
+second fluid below a chosen Y level. Snow and ordinary ice can also be replaced.
+Use **Fluid Deposits**, not World Materials, for occasional underground lakes
+or pockets.
+
 ## Rocks, Ores, And Other Mods
 
 The material picker lists blocks from installed mods by full registry ID, for

docs/PROVIDERS.md

@@ -107,9 +107,9 @@ rules remain in the self-contained snapshot.
 
 Biome providers can add Forge biomes normally, then declare where those biomes
 belong through `biome_palettes`. The overlay wraps the dimension's existing
-biome source, so it composes after vanilla, TerraBlender, Biomes O' Plenty, or
-another source instead of taking a compile-time dependency on them. Use
-`minecraft_only` scope when the provider should leave other mods' biomes alone.
+biome source, so it composes after vanilla or another installed source instead
+of taking a compile-time dependency on it. Use `minecraft_only` scope when the
+provider should leave other mods' biomes alone.
 Use `required_similar_biomes` only when an output truly cannot work without a
 referenced biome; ordinary compatibility hints belong in `similar_biomes`.
 

src/main/java/com/mcmoddev/orespawn/client/AdvancedGeologySettingsScreen.java

@@ -32,11 +32,9 @@ protected void init() {
 					Component.translatable("button.orespawn.cyano_details"),
 					button -> openNumeric("cyano", NumericConfigScreen.CYANO_FIELDS)));
 		}
-		if (!session.fluidDepositIds().isEmpty()) {
-			addRenderableWidget(OreSpawnScreenLayout.plainButton(left, top + (row * 28), 310, 20,
-					Component.translatable("button.orespawn.fluid_deposit_details"),
-					button -> minecraft.setScreen(new FluidDepositListScreen(this, session))));
-		}
+		addRenderableWidget(OreSpawnScreenLayout.plainButton(left, top + (row * 28), 310, 20,
+				Component.translatable("button.orespawn.fluid_deposit_details"),
+				button -> minecraft.setScreen(new FluidDepositListScreen(this, session))));
 		addRenderableWidget(OreSpawnScreenLayout.plainButton(width / 2 - 75, OreSpawnScreenLayout.footerY(height), 150, 20,
 				CommonComponents.GUI_DONE, button -> onClose()));
 	}

src/main/java/com/mcmoddev/orespawn/client/BiomePlacementScreen.java

@@ -52,10 +52,12 @@ protected void init() {
 			button.active = value != tab;
 		}
 		JsonObject placement = session.biomePlacement(dimension, biomeId);
-		addRenderableWidget(CycleButton.onOffBuilder(bool(placement, "enabled", true))
-				.create(left, 64, contentWidth, 20,
+		addRenderableWidget(OreSpawnScreenLayout.explain(
+				CycleButton.onOffBuilder(bool(placement, "enabled", true)).create(
+						left, 64, contentWidth, 20,
 						Component.translatable("option.orespawn.enabled"),
-						(button, value) -> placement.addProperty("enabled", value)));
+						(button, value) -> placement.addProperty("enabled", value)),
+				"guide.orespawn.biomes.1"));
 		if (tab == Tab.PLACEMENT) initPlacement(left, half, placement);
 		else if (tab == Tab.CLIMATE) initClimate(left, half, placement);
 		else initSurface(left, contentWidth, placement);
@@ -71,36 +73,45 @@ protected void init() {
 	private void initPlacement(int left, int half, JsonObject placement) {
 		int y = 90;
 		weight = field(left + half + 5, y, half, decimal(placement, "weight", 1.0D));
+		OreSpawnScreenLayout.explain(weight, "guide.orespawn.biomes.3");
 		label(left, y + 6, half, "option.orespawn.weight");
 		y += 28;
-		addRenderableWidget(OreSpawnScreenLayout.button(this, font, left, y, half, 20,
+		addRenderableWidget(OreSpawnScreenLayout.explain(OreSpawnScreenLayout.button(
+				this, font, left, y, half, 20,
 				Component.translatable("button.orespawn.similar_biomes",
 						array(placement, "similar_biomes").size()),
 				button -> { saveFields(); minecraft.setScreen(new BiomeReferenceScreen(
-						this, session, placement, "similar_biomes")); }));
-		addRenderableWidget(OreSpawnScreenLayout.button(this, font, left + half + 5, y,
+						this, session, placement, "similar_biomes")); }),
+				"guide.orespawn.biomes.3"));
+		addRenderableWidget(OreSpawnScreenLayout.explain(OreSpawnScreenLayout.button(
+				this, font, left + half + 5, y,
 				half, 20, Component.translatable("button.orespawn.required_biomes",
 						array(placement, "required_similar_biomes").size()),
 				button -> { saveFields(); minecraft.setScreen(new BiomeReferenceScreen(
-						this, session, placement, "required_similar_biomes")); }));
+						this, session, placement, "required_similar_biomes")); }),
+				"guide.orespawn.biomes.3"));
 	}
 
 	private void initClimate(int left, int half, JsonObject placement) {
 		int y = 90;
 		minTemperature = field(left + half + 5, y, half,
 				decimal(placement, "min_temperature", -2.0D));
+		OreSpawnScreenLayout.explain(minTemperature, "guide.orespawn.biomes.3");
 		label(left, y + 6, half, "option.orespawn.min_temperature");
 		y += 24;
 		maxTemperature = field(left + half + 5, y, half,
 				decimal(placement, "max_temperature", 2.0D));
+		OreSpawnScreenLayout.explain(maxTemperature, "guide.orespawn.biomes.3");
 		label(left, y + 6, half, "option.orespawn.max_temperature");
 		y += 24;
 		minDownfall = field(left + half + 5, y, half,
 				decimal(placement, "min_downfall", 0.0D));
+		OreSpawnScreenLayout.explain(minDownfall, "guide.orespawn.biomes.3");
 		label(left, y + 6, half, "option.orespawn.min_downfall");
 		y += 24;
 		maxDownfall = field(left + half + 5, y, half,
 				decimal(placement, "max_downfall", 1.0D));
+		OreSpawnScreenLayout.explain(maxDownfall, "guide.orespawn.biomes.3");
 		label(left, y + 6, half, "option.orespawn.max_downfall");
 	}
 
@@ -110,19 +121,23 @@ private void initSurface(int left, int width, JsonObject placement) {
 		for (String key : Arrays.asList("top_block", "filler_block",
 				"underwater_block", "ceiling_block")) {
 			String current = string(surface, key, "");
-			addRenderableWidget(OreSpawnScreenLayout.button(this, font, left, y,
+			addRenderableWidget(OreSpawnScreenLayout.explain(OreSpawnScreenLayout.button(
+					this, font, left, y,
 					width - 65, 20, materialLabel(key, current), button -> {
 						saveFields();
 						minecraft.setScreen(new MaterialBlockPickerScreen(this, session,
 								false, id -> surface.addProperty(key, id)));
-					}));
-			addRenderableWidget(OreSpawnScreenLayout.plainButton(left + width - 60, y, 60, 20,
+					}), "guide.orespawn.biomes.3"));
+			Button clear = addRenderableWidget(OreSpawnScreenLayout.plainButton(
+					left + width - 60, y, 60, 20,
 					Component.translatable("button.orespawn.clear"),
 					button -> { surface.remove(key); rebuildWidgets(); }));
+			clear.active = !current.isEmpty();
 			y += 24;
 		}
 		fillerDepth = field(left + width / 2, y, width / 2,
 				integer(surface, "filler_depth", 3));
+		OreSpawnScreenLayout.explain(fillerDepth, "guide.orespawn.biomes.3");
 		label(left, y + 6, width / 2 - 5, "option.orespawn.filler_depth");
 	}