Merge Back

core/src/main/java/art/arcane/iris/generation/concurrent/MultiBurst.java

@@ -2,7 +2,6 @@ package art.arcane.iris.generation.concurrent;
 
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.configuration.IrisSettings;
-import art.arcane.volmlib.util.hunk.HunkBurst;
 import art.arcane.volmlib.util.parallel.MultiBurstSupport;
 import art.arcane.volmlib.util.math.M;
 import java.util.concurrent.ExecutorService;
@@ -25,13 +24,6 @@ public class MultiBurst extends MultiBurstSupport {
     public static final MultiBurst hydrology = new MultiBurst("Iris Hydrology", () -> Math.max(2, IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getParallelism())));
     private final AtomicInteger parallelismBaseline = new AtomicInteger();
 
-    static {
-        // Hunk's parallel section splits live in VolmLib and have no view of Iris' concurrency
-        // settings, so point them at the same pool the generation stages use. Without this they
-        // would spin up a second, untuned pool alongside it.
-        HunkBurst.install(burst::burst);
-    }
-
     public MultiBurst() {
         this("Iris");
     }

core/src/main/java/art/arcane/iris/generation/hydrology/IrisSurfaceRiverBankConfig.java

@@ -49,8 +49,11 @@ public class IrisSurfaceRiverBankConfig {
     @Description("Blocks added to every eroded valley width before the blend width limits apply, so even a shallow cut erodes at least this far beyond the shore; 0 leaves the width proportional to the cut alone.")
     private double blendBaseWidth = 0D;
 
-    @Description("Optional palette painted over the shore bench columns instead of the biome's own layers. Disabled by default, which keeps the shore biome's layers.")
-    private IrisRiverMaterialConfig shoreMaterial = new IrisRiverMaterialConfig();
+    @Description("Palette painted over the shore bench columns instead of the biome's own layers. The default is a two-block sand beach.")
+    private IrisRiverMaterialConfig shoreMaterial = new IrisRiverMaterialConfig()
+            .setEnabled(true)
+            .setPalette(new IrisMaterialPalette().qclear().qadd("sand"))
+            .setDepth(2);
 
     @Description("Optional palette painted over the eroded bank columns outside the shore bench instead of the biome's own layers. Disabled by default, which keeps the bank biome's layers.")
     private IrisRiverMaterialConfig bankMaterial = new IrisRiverMaterialConfig();

core/src/main/java/art/arcane/iris/generation/hydrology/IrisSurfaceRiverBedConfig.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 @Data
 public class IrisSurfaceRiverBedConfig {
     @Description("Allow sand, gravel and other falling blocks in the bed, shore and eroded banks. When false they are replaced by the padding palette.")
-    private boolean allowGravityBlocks = false;
+    private boolean allowGravityBlocks = true;
 
     @MinNumber(0)
     @MaxNumber(8)

core/src/main/java/art/arcane/iris/world/storage/matter/PreObjectMatter.java

@@ -50,19 +50,19 @@ public final class PreObjectMatter extends MappedHunk<PreObjectMatterCell>
 
     @Override
     public PreObjectMatter iterateSync(Consumer4<Integer, Integer, Integer, PreObjectMatterCell> consumer) {
-        super.iterateSync(consumer);
+        super.iterateEntriesSync(consumer);
         return this;
     }
 
     @Override
     public PreObjectMatter iterateSyncIO(Consumer4IO<Integer, Integer, Integer, PreObjectMatterCell> consumer) throws IOException {
-        super.iterateSyncIO(consumer);
+        super.iterateEntriesSyncIO(consumer);
         return this;
     }
 
     @Override
     public void empty(PreObjectMatterCell value) {
-        super.empty(value);
+        clear();
     }
 
     @Override

core/src/main/resources/languages/de_DE.toml

@@ -2075,6 +2075,7 @@ loading = "Nachrichten für {locale} werden geladen..."
 "part.line" = "Zeile {line}"
 "value.none" = "Keine"
 "value.empty" = "(leer)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Fehlende Berechtigung: {permission}"

core/src/main/resources/languages/es_ES.toml

@@ -2075,6 +2075,7 @@ loading = "Cargando los mensajes de {locale}..."
 "part.line" = "Línea {line}"
 "value.none" = "Ninguno"
 "value.empty" = "(vacío)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Falta el permiso: {permission}"

core/src/main/resources/languages/fi_FI.toml

@@ -2080,6 +2080,7 @@ loading = "Ladataan kielen {locale} viestejä..."
 "part.line" = "Rivi {line}"
 "value.none" = "Ei ole"
 "value.empty" = "(tyhjä)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Puuttuva käyttöoikeus: {permission}"

core/src/main/resources/languages/fr_FR.toml

@@ -2075,6 +2075,7 @@ loading = "Chargement des messages en {locale}..."
 "part.line" = "Ligne {line}"
 "value.none" = "Aucune"
 "value.empty" = "(vide)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Permission manquante : {permission}"

core/src/main/resources/languages/he_IL.toml

@@ -2080,6 +2080,7 @@ loading = "טוען הודעות עבור {locale}..."
 "part.line" = "שורה {line}"
 "value.none" = "אין"
 "value.empty" = "(ריק)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "חסרה הרשאה: {permission}"

core/src/main/resources/languages/it_IT.toml

@@ -2075,6 +2075,7 @@ loading = "Caricamento dei messaggi in {locale}..."
 "part.line" = "Riga {line}"
 "value.none" = "Nessuno"
 "value.empty" = "(vuoto)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Permesso mancante: {permission}"

core/src/main/resources/languages/ja-JP.toml

@@ -2078,6 +2078,7 @@ loading = "{locale}のメッセージを読み込んでいます..."
 "part.line" = "行{line}"
 "value.none" = "なし"
 "value.empty" = "(空)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "権限がありません: {permission}"

core/src/main/resources/languages/ko_KR.toml

@@ -2078,6 +2078,7 @@ loading = "{locale} 메시지를 불러오는 중..."
 "part.line" = "{line}번째 줄"
 "value.none" = "없음"
 "value.empty" = "(비어 있음)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "권한이 없습니다: {permission}"

core/src/main/resources/languages/lt_LT.toml

@@ -2080,6 +2080,7 @@ loading = "Įkeliami kalbos {locale} pranešimai..."
 "part.line" = "Eilutė {line}"
 "value.none" = "Nėra"
 "value.empty" = "(tuščia)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Trūksta leidimo: {permission}"

core/src/main/resources/languages/nl_NL.toml

@@ -2075,6 +2075,7 @@ loading = "Berichten voor {locale} laden..."
 "part.line" = "Regel {line}"
 "value.none" = "Geen"
 "value.empty" = "(leeg)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Ontbrekende machtiging: {permission}"

core/src/main/resources/languages/pl_PL.toml

@@ -2080,6 +2080,7 @@ loading = "Wczytywanie wiadomości w języku {locale}..."
 "part.line" = "Linia {line}"
 "value.none" = "Brak"
 "value.empty" = "(pusty)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Brak uprawnienia: {permission}"

core/src/main/resources/languages/pt_PT.toml

@@ -2075,6 +2075,7 @@ loading = "A carregar as mensagens de {locale}..."
 "part.line" = "Linha {line}"
 "value.none" = "Nenhum"
 "value.empty" = "(vazio)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Permissão em falta: {permission}"

core/src/main/resources/languages/ru_RU.toml

@@ -2080,6 +2080,7 @@ loading = "Загрузка сообщений для {locale}..."
 "part.line" = "Строка {line}"
 "value.none" = "Нет"
 "value.empty" = "(пусто)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Нет разрешения: {permission}"

core/src/main/resources/languages/tr_TR.toml

@@ -2080,6 +2080,7 @@ loading = "{locale} mesajları yükleniyor..."
 "part.line" = "Satır {line}"
 "value.none" = "Yok"
 "value.empty" = "(boş)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Eksik izin: {permission}"

core/src/main/resources/languages/vi_VI.toml

@@ -2078,6 +2078,7 @@ loading = "Đang tải tin nhắn cho {locale}..."
 "part.line" = "Dòng {line}"
 "value.none" = "Không có"
 "value.empty" = "(trống)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "Thiếu quyền: {permission}"

core/src/main/resources/languages/zh_CN.toml

@@ -2078,6 +2078,7 @@ loading = "正在加载 {locale} 的消息..."
 "part.line" = "第 {line} 行"
 "value.none" = "无"
 "value.empty" = "(空)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "缺少权限：{permission}"

core/src/main/resources/languages/zh_TW.toml

@@ -2078,6 +2078,7 @@ loading = "正在載入 {locale} 的訊息..."
 "part.line" = "第 {line} 行"
 "value.none" = "無"
 "value.empty" = "(空)"
+title = "{plugin} / {section}"
 
 [debug.error]
 missing-permission = "缺少權限：{permission}"