From 5d1faf3c00338028ce84dfb3e67ac181dc2fbb87 Mon Sep 17 00:00:00 2001 From: IWareQ Date: Sat, 13 Jun 2026 20:14:42 +0400 Subject: [PATCH] feat: update mappings to 26.1 & adapt allay update --- buildSrc/src/main/kotlin/Versions.kt | 8 ++++---- platforms/allay/README.md | 2 +- .../java/com/dfsek/terra/allay/AllayPlatform.java | 2 +- .../main/java/com/dfsek/terra/allay/Mapping.java | 11 +++++------ .../com/dfsek/terra/allay/delegate/AllayChunk.java | 4 ++-- .../terra/allay/delegate/AllayProtoChunk.java | 6 +++--- .../terra/allay/delegate/AllayProtoWorld.java | 8 ++++---- .../terra/allay/delegate/AllayServerWorld.java | 8 ++++---- .../terra/allay/delegate/AllayWorldProperties.java | 12 ++++++------ .../allay/generator/AllayGeneratorWrapper.java | 14 +++++++------- 10 files changed, 37 insertions(+), 38 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index cb593331ab..33e26dfea2 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -86,13 +86,13 @@ object Versions { } object Allay { - const val api = "0.20.0" + const val api = "0.28.0" const val gson = "2.13.2" - const val mappings = "366baa6" - const val mappingsGenerator = "e957088" + const val mappings = "0c2ac22" + const val mappingsGenerator = "3742321" - const val mcmeta = "c976eb3" + const val mcmeta = "805b8ac" } object Minestom { diff --git a/platforms/allay/README.md b/platforms/allay/README.md index 48ff788478..501ac95201 100644 --- a/platforms/allay/README.md +++ b/platforms/allay/README.md @@ -2,7 +2,7 @@ ## Resource files -Current mapping version: je 1.21.11 to be 1.21.111 +Current mapping version: JE 26.1.2 to BE 26.1 - `mapping/biomes.json` and `mapping/items.json` are obtained from [GeyserMC/mappings](https://github.com/GeyserMC/mappings). - `mapping/blocks.json` is obtained from [GeyserMC/mappings-generator](https://github.com/GeyserMC/mappings-generator) (path: `https://github.com/GeyserMC/mappings-generator/blob/master/generator_blocks.json`). diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java index f9cb5831ff..304d9d1d72 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java @@ -47,7 +47,7 @@ public boolean reload() { var dimension = wrapper.getAllayWorldGenerator().getDimension(); TerraAllayPlugin.instance.getPluginLogger().info( "Replaced pack in chunk generator for world {}", - dimension.getWorld().getWorldData().getDisplayName() + ":" + dimension.getDimensionInfo().dimensionId() + dimension.getWorld().getWorldData().getDisplayName() + ":" + dimension.getDimensionType().getIdentifier() ); }); }); diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java index 5c17830c5e..d389c1d04c 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java @@ -82,12 +82,11 @@ public static int biomeIdJeToBe(String jeBiomeId) { } public static String dimensionIdBeToJe(String beDimensionId) { - return switch(beDimensionId) { - case "overworld" -> "minecraft:overworld"; - case "nether" -> "minecraft:the_nether"; - case "the_end" -> "minecraft:the_end"; - default -> beDimensionId; - }; + if(beDimensionId.equals("minecraft:nether")) { + return "minecraft:the_nether"; + } + + return beDimensionId; } public static Map getJeBlockDefaultProperties(String jeBlockIdentifier) { diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java index 8fe456bac0..a87bf6c3a7 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java @@ -21,10 +21,10 @@ public record AllayChunk(ServerWorld world, Chunk allayChunk) implements com.dfs @Override public void setBlock(int x, int y, int z, BlockState data, boolean physics) { - var dimensionInfo = allayChunk.getDimensionInfo(); + var dimensionType = allayChunk.getDimensionType(); if(x < 0 || x > 15 || z < 0 || z > 15 || - y < dimensionInfo.minHeight() || y > dimensionInfo.maxHeight()) { + y < dimensionType.getMinHeight() || y > dimensionType.getMaxHeight()) { return; } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java index 164d316ff1..62762ee5a3 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java @@ -21,15 +21,15 @@ public record AllayProtoChunk(UnsafeChunk allayChunk) implements ProtoChunk { @Override public int getMaxHeight() { - return allayChunk.getDimensionInfo().maxHeight(); + return allayChunk.getDimensionType().getMaxHeight(); } @Override public void setBlock(int x, int y, int z, @NotNull BlockState blockState) { - var dimensionInfo = allayChunk.getDimensionInfo(); + var dimensionType = allayChunk.getDimensionType(); if(x < 0 || x > 15 || z < 0 || z > 15 || - y < dimensionInfo.minHeight() || y > dimensionInfo.maxHeight()) { + y < dimensionType.getMinHeight() || y > dimensionType.getMaxHeight()) { return; } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java index 01e38c31cd..f47a305151 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java @@ -31,11 +31,11 @@ private static org.allaymc.api.blockentity.BlockEntity getBlockEntity(OtherChunk var currentChunk = context.getCurrentChunk(); var currentChunkX = currentChunk.getX(); var currentChunkZ = currentChunk.getZ(); - var dimInfo = currentChunk.getDimensionInfo(); + var dimensionType = currentChunk.getDimensionType(); if(x >= currentChunkX * 16 && x < currentChunkX * 16 + 16 && z >= currentChunkZ * 16 && z < currentChunkZ * 16 + 16 && - y >= dimInfo.minHeight() && y <= dimInfo.maxHeight()) { + y >= dimensionType.getMinHeight() && y <= dimensionType.getMaxHeight()) { return currentChunk.getBlockEntity(x & 15, y, z & 15); } else { var chunk = context.getChunkSource().getChunk(x >> 4, z >> 4); @@ -60,8 +60,8 @@ public ServerWorld getWorld() { @Override public void setBlockState(int x, int y, int z, BlockState data, boolean physics) { - var dimensionInfo = allayServerWorld.allayDimension().getDimensionInfo(); - if(y < dimensionInfo.minHeight() || y > dimensionInfo.maxHeight()) { + var dimensionType = allayServerWorld.allayDimension().getDimensionType(); + if(y < dimensionType.getMinHeight() || y > dimensionType.getMaxHeight()) { return; } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java index 7239a2b701..9579ca3329 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java @@ -27,8 +27,8 @@ public Chunk getChunkAt(int x, int z) { @Override public void setBlockState(int x, int y, int z, BlockState data, boolean physics) { - var dimensionInfo = allayDimension.getDimensionInfo(); - if(y < dimensionInfo.minHeight() || y > dimensionInfo.maxHeight()) { + var dimensionType = allayDimension.getDimensionType(); + if(y < dimensionType.getMinHeight() || y > dimensionType.getMaxHeight()) { return; } @@ -74,12 +74,12 @@ public long getSeed() { @Override public int getMaxHeight() { - return allayDimension.getDimensionInfo().maxHeight(); + return allayDimension.getDimensionType().getMaxHeight(); } @Override public int getMinHeight() { - return allayDimension.getDimensionInfo().minHeight(); + return allayDimension.getDimensionType().getMinHeight(); } @Override diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayWorldProperties.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayWorldProperties.java index 221f6b67bc..d57d4ac3ae 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayWorldProperties.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayWorldProperties.java @@ -1,6 +1,6 @@ package com.dfsek.terra.allay.delegate; -import org.allaymc.api.world.data.DimensionInfo; +import org.allaymc.api.world.dimension.DimensionType; import com.dfsek.terra.api.world.info.WorldProperties; @@ -12,12 +12,12 @@ public class AllayWorldProperties implements WorldProperties { private final Object fakeHandle; private final long seed; - private final DimensionInfo dimensionInfo; + private final DimensionType dimensionType; - public AllayWorldProperties(long seed, DimensionInfo dimensionInfo) { + public AllayWorldProperties(long seed, DimensionType dimensionType) { this.fakeHandle = new Object(); this.seed = seed; - this.dimensionInfo = dimensionInfo; + this.dimensionType = dimensionType; } @Override @@ -27,12 +27,12 @@ public long getSeed() { @Override public int getMaxHeight() { - return dimensionInfo.maxHeight(); + return dimensionType.getMaxHeight(); } @Override public int getMinHeight() { - return dimensionInfo.minHeight(); + return dimensionType.getMinHeight(); } @Override diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java index 9ffc029f7e..750ab63545 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java @@ -4,7 +4,7 @@ import org.allaymc.api.utils.AllayStringUtils; import org.allaymc.api.world.biome.BiomeType; import org.allaymc.api.world.chunk.UnsafeChunk; -import org.allaymc.api.world.data.DimensionInfo; +import org.allaymc.api.world.dimension.DimensionType; import org.allaymc.api.world.generator.WorldGenerator; import org.allaymc.api.world.generator.context.NoiseContext; import org.allaymc.api.world.generator.context.PopulateContext; @@ -55,11 +55,11 @@ public AllayGeneratorWrapper(String preset) { .populators(new AllayPopulator()) .onDimensionSet(dimension -> { this.allayServerWorld = new AllayServerWorld(this, dimension); - this.worldProperties = new AllayWorldProperties(this.seed, dimension.getDimensionInfo()); + this.worldProperties = new AllayWorldProperties(this.seed, dimension.getDimensionType()); var metaPackName = options.get(OPTION_META_PACK_NAME); if(metaPackName != null) { - setConfigPack(getConfigPackByMeta(metaPackName, dimension.getDimensionInfo())); + setConfigPack(getConfigPackByMeta(metaPackName, dimension.getDimensionType())); return; } @@ -94,13 +94,13 @@ protected static ConfigPack getConfigPackById(String packId) { .orElseThrow(() -> new IllegalArgumentException("Cant find terra config pack named " + packId)); } - protected static ConfigPack getConfigPackByMeta(String metaPackId, DimensionInfo dimensionInfo) { + protected static ConfigPack getConfigPackByMeta(String metaPackId, DimensionType dimensionType) { return TerraAllayPlugin.platform .getMetaConfigRegistry() .getByID(metaPackId) .orElseThrow(() -> new IllegalArgumentException("Cant find terra meta pack named " + metaPackId)) .packs() - .get(Mapping.dimensionIdBeToJe(dimensionInfo.toString())); + .get(Mapping.dimensionIdBeToJe(dimensionType.getIdentifier().toString())); } protected static ChunkGenerator createGenerator(ConfigPack configPack) { @@ -148,8 +148,8 @@ public boolean apply(NoiseContext context) { worldProperties, biomeProvider, chunkX, chunkZ ); - int minHeight = context.getDimensionInfo().minHeight(); - int maxHeight = context.getDimensionInfo().maxHeight(); + int minHeight = context.getDimensionType().getMinHeight(); + int maxHeight = context.getDimensionType().getMaxHeight(); for(int x = 0; x < 16; x++) { for(int y = minHeight; y < maxHeight; y++) { for(int z = 0; z < 16; z++) {