mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-25 21:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Back

Browse Source
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-12 16:06:08 -04:00
1 parent e832239730
commit 7a099cbd5e
26 files changed
+38 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/art/arcane/iris/generation/hydrology/IrisRiverConfigurationTest.java
+2 -1
View File
@@ -69,8 +69,9 @@ public class IrisRiverConfigurationTest {
assertTrue(surface.getBanks().isExposeCutStrata());
assertEquals(0D, surface.getBanks().getShoreRise(), 0D);
assertEquals(0D, surface.getBanks().getBlendBaseWidth(), 0D);
assertDisabledMaterial(surface.getBanks().getShoreMaterial());
assertMaterial(surface.getBanks().getShoreMaterial(), "sand", 2);
assertDisabledMaterial(surface.getBanks().getBankMaterial());
assertTrue(surface.getBed().isAllowGravityBlocks());
assertDisabledMaterial(surface.getBed().getMaterial());
assertEquals(2, surface.getFlow().getCascadeRun());
assertEquals(6, surface.getFlow().getWaterfallMinimumDrop());
core/src/test/java/art/arcane/iris/pack/schema/SchemaBuilderIdentityTest.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class SchemaBuilderIdentityTest {
@ClassRule
public static final PlatformLeakGuard PLATFORM_GUARD = PlatformLeakGuard.clean();
private static final String EXPECTED_SCHEMA_DIGEST = "f9f759367e4712bc5d0ade01b0086d5d5855ede41e8a57d56e067d8c03964d14";
private static final String EXPECTED_SCHEMA_DIGEST = "da993d49349b961b46f86a4966b8d2ab228a6b005c2a4ee279018e03e1139783";
private static final List<Class<?>> SCHEMA_ROOTS = List.of(
IrisDimension.class,
core/src/test/java/art/arcane/iris/structure/object/IrisStaticObjectCompatTest.java
+5 -3
View File
@@ -66,10 +66,12 @@ public class IrisStaticObjectCompatTest {
public void bindPlatform() {
previousSettings = IrisSettings.settings;
IrisSettings.settings = new IrisSettings();
// Water, clay and dirt are what a default dimension composes (fluid palette, river bed padding); without
// them the dimension itself is excluded and the static object is never the deciding unit.
// Water, clay, dirt and sand are what a default dimension composes (fluid palette, river bed padding, the
// default sand shore bench); without them the dimension itself is excluded and the static object is never
// the deciding unit.
platform = CompatTestPlatform.bind(temporaryFolder.getRoot(), List.of("minecraft:stone",
"minecraft:cobblestone", "minecraft:air", "minecraft:water", "minecraft:clay", "minecraft:dirt"));
"minecraft:cobblestone", "minecraft:air", "minecraft:water", "minecraft:clay", "minecraft:dirt",
"minecraft:sand"));
previousRotator = IrisObjectRotation.bindPlatformRotator((rotation, block, x, y, z) -> block);
}