mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-10-26 22:10:18 +00:00
Scoped mod trees per biome
- importedFeatures gains biomeRules, which deny placed feature families or exact keys only in registry biomes matched by key, namespace, or tag; Iris custom biomes match through their vanilla derivative - Mod ingest classifies tree-like passthrough features from the catalog feature JSON, including trees nested in random selectors, fallen trees, and huge mushrooms - Tree-like mod features that a mod injects into vanilla biomes the pack already uses are denied in minecraft biomes, so they no longer double the pack's own trees while adopted mod biomes keep them - Studio schema digest updated for the new rule shape
This commit is contained in:
1 parent
0bc235afb6
commit
7767d6d30a
10 files changed
+454
-6
No files matched your search
@@ -35,7 +35,7 @@ public class ImportedFeatureWriterTest {
|
||||
public void sourceThatAlreadyRanImportedFeaturesKeepsVanillaAndOtherModsGenerating() {
|
||||
JsonObject dimension = dimension("{\"importedFeatures\": {\"enabled\": true, \"disabled\": [\"minecraft:ore_diamond\"]}}");
|
||||
|
||||
IrisImportedFeatureControl control = ImportedFeatureWriter.write(dimension, Set.of("examplemod:ore_tin"), Set.of("othermod"));
|
||||
IrisImportedFeatureControl control = ImportedFeatureWriter.write(dimension, Set.of("examplemod:ore_tin"), Set.of("othermod"), Set.of());
|
||||
|
||||
JsonObject imported = dimension.getAsJsonObject("importedFeatures");
|
||||
assertEquals(List.of("minecraft:ore_diamond"), ModIngestFixture.strings(imported.get("disabled")));
|
||||
@@ -50,7 +50,7 @@ public class ImportedFeatureWriterTest {
|
||||
public void sourceWithoutImportedFeaturesOnlyRunsTheSelectedModsPassthrough() {
|
||||
JsonObject dimension = dimension("{}");
|
||||
|
||||
IrisImportedFeatureControl control = ImportedFeatureWriter.write(dimension, Set.of("examplemod:ore_tin"), Set.of("othermod"));
|
||||
IrisImportedFeatureControl control = ImportedFeatureWriter.write(dimension, Set.of("examplemod:ore_tin"), Set.of("othermod"), Set.of());
|
||||
|
||||
JsonObject imported = dimension.getAsJsonObject("importedFeatures");
|
||||
assertTrue(imported.get("enabled").getAsBoolean());
|
||||
@@ -66,7 +66,7 @@ public class ImportedFeatureWriterTest {
|
||||
public void existingExactEntriesAreKept() {
|
||||
JsonObject dimension = dimension("{\"importedFeatures\": {\"enabled\": false, \"disabledExact\": [\"examplemod:old\"]}}");
|
||||
|
||||
ImportedFeatureWriter.write(dimension, Set.of("examplemod:ore_tin"), Set.of());
|
||||
ImportedFeatureWriter.write(dimension, Set.of("examplemod:ore_tin"), Set.of(), Set.of());
|
||||
|
||||
assertEquals(List.of("examplemod:old", "examplemod:ore_tin"),
|
||||
ModIngestFixture.strings(dimension.getAsJsonObject("importedFeatures").get("disabledExact")));
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
/*
|
||||
* Iris is a World Generator for Minecraft Bukkit Servers
|
||||
* Copyright (c) 2022 Arcane Arts (Volmit Software)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package art.arcane.iris.pack.ingest;
|
||||
|
||||
import art.arcane.iris.pack.ingest.catalog.CatalogBiome;
|
||||
import art.arcane.iris.pack.ingest.catalog.CatalogPlacedFeature;
|
||||
import art.arcane.iris.pack.ingest.catalog.WorldgenCatalog;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.TemporaryFolder;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
public class IngestTreeScopeTest {
|
||||
private static final int VEGETAL_STEP = ModIngestFixture.VEGETAL_STEP;
|
||||
|
||||
@Rule
|
||||
public TemporaryFolder folder = new TemporaryFolder();
|
||||
|
||||
private ModIngestReport report;
|
||||
private JsonObject imported;
|
||||
|
||||
@Before
|
||||
public void ingest() throws Exception {
|
||||
Path root = folder.getRoot().toPath();
|
||||
Path source = ModIngestFixture.writeSourcePack(root);
|
||||
Path target = root.resolve("packs").resolve("trees");
|
||||
report = ModIngester.ingest(new ModIngestRequest(source, target, "overworld", catalog(), Set.of(ModIngestFixture.MOD), Set.of(), false));
|
||||
imported = ModIngestFixture.readJson(target.resolve("dimensions/trees.json")).getAsJsonObject("importedFeatures");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void modTreesInjectedIntoThePacksVanillaBiomesAreDeniedThereOnly() {
|
||||
JsonArray rules = imported.getAsJsonArray("biomeRules");
|
||||
|
||||
assertEquals(1, rules.size());
|
||||
JsonObject rule = rules.get(0).getAsJsonObject();
|
||||
assertEquals(List.of("minecraft:"), ModIngestFixture.strings(rule.get("biomes")));
|
||||
assertEquals(List.of("examplemod:inline_trees", "examplemod:oak_bushes", "examplemod:simple_trees"),
|
||||
ModIngestFixture.strings(rule.get("disabledExact")));
|
||||
ModIngestItem bushes = ModIngestFixture.item(report, "examplemod:oak_bushes");
|
||||
assertEquals(ModIngestTier.PASSTHROUGH, bushes.tier());
|
||||
assertTrue(bushes.reason(), bushes.reason().contains("minecraft biomes"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void nonTreeDecorationAndModOnlyTreesKeepRunningEverywhere() {
|
||||
List<String> denied = ModIngestFixture.strings(imported.getAsJsonArray("biomeRules").get(0).getAsJsonObject().get("disabledExact"));
|
||||
|
||||
assertEquals(ModIngestTier.PASSTHROUGH, ModIngestFixture.item(report, "examplemod:mossy_rocks").tier());
|
||||
assertTrue(denied.stream().noneMatch(key -> key.equals("examplemod:mossy_rocks")));
|
||||
assertTrue(denied.stream().noneMatch(key -> key.equals("examplemod:maple_trees")));
|
||||
}
|
||||
|
||||
private static WorldgenCatalog catalog() {
|
||||
WorldgenCatalog fixture = ModIngestFixture.catalog();
|
||||
List<String> injected = List.of(ModIngestFixture.MOD + ":oak_bushes", ModIngestFixture.MOD + ":simple_trees",
|
||||
ModIngestFixture.MOD + ":inline_trees", ModIngestFixture.MOD + ":mossy_rocks");
|
||||
List<CatalogBiome> biomes = new ArrayList<>();
|
||||
for (CatalogBiome biome : fixture.biomes()) {
|
||||
if (!biome.key().equals("minecraft:forest") && !biome.key().equals(ModIngestFixture.MOD + ":maple_woods")) {
|
||||
biomes.add(biome);
|
||||
continue;
|
||||
}
|
||||
List<List<String>> steps = new ArrayList<>(biome.featureSteps());
|
||||
List<String> vegetal = new ArrayList<>(steps.get(VEGETAL_STEP));
|
||||
vegetal.addAll(injected);
|
||||
steps.set(VEGETAL_STEP, vegetal);
|
||||
biomes.add(new CatalogBiome(biome.key(), biome.temperature(), biome.downfall(), true, biome.tags(), steps, biome.spawns(), null));
|
||||
}
|
||||
List<CatalogPlacedFeature> features = new ArrayList<>(fixture.placedFeatures());
|
||||
features.add(feature("oak_bushes", "minecraft:random_selector", """
|
||||
{"features": [{"chance": 0.3, "feature": "examplemod:maple_trees"}], "default": "examplemod:mossy_rocks"}
|
||||
"""));
|
||||
features.add(feature("simple_trees", "minecraft:simple_random_selector", """
|
||||
{"features": ["examplemod:mossy_rocks", "examplemod:maple_trees"]}
|
||||
"""));
|
||||
features.add(feature("inline_trees", "minecraft:random_boolean_selector", """
|
||||
{"feature_true": {"feature": {"type": "minecraft:tree", "config": {}}, "placement": []}, "feature_false": "examplemod:mossy_rocks"}
|
||||
"""));
|
||||
features.add(feature("mossy_rocks", "minecraft:forest_rock", "{\"state\": \"minecraft:mossy_cobblestone\"}"));
|
||||
return new WorldgenCatalog(fixture.format(), fixture.minecraftVersion(), fixture.platform(), fixture.capturedAtEpochMillis(),
|
||||
fixture.contentFingerprint(), fixture.namespaces(), biomes, features, fixture.structures(),
|
||||
fixture.dimensionTypes(), fixture.levelStems());
|
||||
}
|
||||
|
||||
private static CatalogPlacedFeature feature(String path, String type, String config) {
|
||||
String key = ModIngestFixture.MOD + ":" + path;
|
||||
return new CatalogPlacedFeature(key, key, type, JsonParser.parseString(config), JsonParser.parseString("[]"));
|
||||
}
|
||||
}
|
||||
@@ -83,7 +83,7 @@ public class SchemaBuilderIdentityTest {
|
||||
@ClassRule
|
||||
public static final PlatformLeakGuard PLATFORM_GUARD = PlatformLeakGuard.clean();
|
||||
|
||||
private static final String EXPECTED_SCHEMA_DIGEST = "5841ff4a1ad2813e4ad45f941fd40e5083a6b1b29a61c522df9efa12eb04f8c0";
|
||||
private static final String EXPECTED_SCHEMA_DIGEST = "c99b0db94bfd6f316738beb87401edde5b52eed11bfa419148bb2e8c08b0d7a9";
|
||||
|
||||
private static final List<Class<?>> SCHEMA_ROOTS = List.of(
|
||||
IrisDimension.class,
|
||||
|
||||
+41
@@ -23,6 +23,8 @@ import art.arcane.iris.generation.decoration.IrisDecorationStep;
|
||||
import art.arcane.volmlib.util.collection.KList;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertThrows;
|
||||
@@ -111,6 +113,45 @@ public class IrisImportedFeatureControlTest {
|
||||
assertThrows(NullPointerException.class, () -> control.shouldGenerate("examplemod:ore_tin"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void biomeRulesDenyFeaturesOnlyInMatchingBiomes() {
|
||||
IrisImportedFeatureBiomeRule rule = new IrisImportedFeatureBiomeRule()
|
||||
.setBiomes(keys("minecraft:"))
|
||||
.setDisabledExact(keys("terralith:trees/oak"))
|
||||
.setDisabled(keys("terralith:bush"));
|
||||
IrisImportedFeatureControl control = new IrisImportedFeatureControl()
|
||||
.setEnabled(true)
|
||||
.setBiomeRules(new KList<>(rule));
|
||||
|
||||
assertTrue(control.hasBiomeFeatureRules());
|
||||
assertFalse(control.shouldGenerateInBiome("minecraft:forest", Set.of(), "terralith:trees/oak"));
|
||||
assertFalse(control.shouldGenerateInBiome("minecraft:forest", Set.of(), "terralith:bush/small"));
|
||||
assertTrue(control.shouldGenerateInBiome("minecraft:forest", Set.of(), "terralith:trees/oak_large"));
|
||||
assertTrue(control.shouldGenerateInBiome("minecraft:forest", Set.of(), "terralith:flowers/lavender"));
|
||||
assertTrue(control.shouldGenerateInBiome("terralith:lavender_forest", Set.of(), "terralith:trees/oak"));
|
||||
assertTrue(control.shouldGenerate("terralith:trees/oak"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void biomeRulesMatchExactKeysAndTags() {
|
||||
IrisImportedFeatureBiomeRule rule = new IrisImportedFeatureBiomeRule()
|
||||
.setBiomes(keys("minecraft:forest", "#minecraft:is_taiga"))
|
||||
.setDisabledExact(keys("terralith:trees/oak"));
|
||||
IrisImportedFeatureControl control = new IrisImportedFeatureControl()
|
||||
.setEnabled(true)
|
||||
.setBiomeRules(new KList<>(rule));
|
||||
|
||||
assertFalse(control.shouldGenerateInBiome("minecraft:forest", Set.of(), "terralith:trees/oak"));
|
||||
assertTrue(control.shouldGenerateInBiome("minecraft:forest_hills", Set.of(), "terralith:trees/oak"));
|
||||
assertFalse(control.shouldGenerateInBiome("minecraft:taiga", Set.of("minecraft:is_taiga"), "terralith:trees/oak"));
|
||||
assertTrue(control.shouldGenerateInBiome("minecraft:plains", Set.of("minecraft:is_overworld"), "terralith:trees/oak"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void controlWithoutBiomeRulesReportsNone() {
|
||||
assertFalse(new IrisImportedFeatureControl().setEnabled(true).hasBiomeFeatureRules());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void stepAllowListNarrowsGenerationToListedStepsOnly() {
|
||||
IrisImportedFeatureControl control = new IrisImportedFeatureControl()
|
||||
|
||||
Reference in new issue
Block a user