From 3ef60f4b330e3a3572e1156f447456f08d021242 Mon Sep 17 00:00:00 2001 From: daoge_cmd <3523206925@qq.com> Date: Tue, 30 Sep 2025 23:12:12 +0800 Subject: [PATCH] feat: adapt allay api 0.12.0-SHAPSHOT (waiting for 0.12.0 release) --- buildSrc/src/main/kotlin/DependencyConfig.kt | 12 +++++----- buildSrc/src/main/kotlin/Versions.kt | 2 +- .../com/dfsek/terra/allay/AllayPlatform.java | 4 ++-- .../com/dfsek/terra/allay/JeBlockState.java | 2 +- .../java/com/dfsek/terra/allay/Mapping.java | 22 +++++++++---------- .../terra/allay/delegate/AllayBlockType.java | 2 +- .../terra/allay/delegate/AllayChunk.java | 2 +- .../terra/allay/delegate/AllayProtoChunk.java | 2 +- .../terra/allay/delegate/AllayProtoWorld.java | 2 +- .../allay/delegate/AllayServerWorld.java | 2 +- .../generator/AllayGeneratorWrapper.java | 10 --------- .../terra/allay/handle/AllayItemHandle.java | 4 +++- 12 files changed, 28 insertions(+), 38 deletions(-) diff --git a/buildSrc/src/main/kotlin/DependencyConfig.kt b/buildSrc/src/main/kotlin/DependencyConfig.kt index 6fba4953a..f57e29721 100644 --- a/buildSrc/src/main/kotlin/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/DependencyConfig.kt @@ -57,12 +57,12 @@ fun Project.configureDependencies() { maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { name = "Sonatype Snapshots" } - maven("https://repo.opencollab.dev/maven-releases/") { - name = "OpenCollab Releases" - } - maven("https://repo.opencollab.dev/maven-snapshots/") { - name = "OpenCollab Snapshots" - } +// maven("https://repo.opencollab.dev/maven-releases/") { +// name = "OpenCollab Releases" +// } +// maven("https://repo.opencollab.dev/maven-snapshots/") { +// name = "OpenCollab Snapshots" +// } maven("https://storehouse.okaeri.eu/repository/maven-public/") { name = "Okaeri" } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5efb8e863..6d18cf94b 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -81,7 +81,7 @@ object Versions { } object Allay { - const val api = "0.7.1" + const val api = "0.12.0-SNAPSHOT" const val gson = "2.13.1" const val mappings = "8002ed6" 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 ef48be9ad..c58cd02db 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 @@ -3,8 +3,8 @@ package com.dfsek.terra.allay; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; +import org.allaymc.api.registry.Registries; import org.allaymc.api.server.Server; -import org.allaymc.api.world.biome.BiomeId; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -88,6 +88,6 @@ public class AllayPlatform extends AbstractPlatform { protected AllayBiome parseBiome(String id, DepthTracker depthTracker) throws LoadException { if(!id.startsWith("minecraft:")) throw new LoadException("Invalid biome identifier " + id, depthTracker); - return new AllayBiome(BiomeId.fromId(Mapping.biomeIdJeToBe(id))); + return new AllayBiome(Registries.BIOMES.getByK1(Mapping.biomeIdJeToBe(id))); } } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java index 60583f22c..7b9f3055b 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java @@ -1,6 +1,6 @@ package com.dfsek.terra.allay; -import org.allaymc.api.utils.HashUtils; +import org.allaymc.api.utils.hash.HashUtils; import java.util.Map; import java.util.TreeMap; 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 4ea1d54a5..adec64cd3 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 @@ -8,19 +8,17 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import org.allaymc.api.block.type.BlockState; -import org.allaymc.api.block.type.BlockStateSafeGetter; +import org.allaymc.api.block.type.BlockStateGetter; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.item.type.ItemType; -import org.allaymc.api.item.type.ItemTypeSafeGetter; +import org.allaymc.api.item.type.ItemTypeGetter; import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -37,11 +35,11 @@ public final class Mapping { .registerTypeAdapterFactory(new IgnoreFailureTypeAdapterFactory()) .create(); - private static final Map> JE_BLOCK_DEFAULT_PROPERTIES = new Object2ObjectOpenHashMap<>(); - private static final Map BE_BLOCK_STATE_TO_JE = new Object2ObjectOpenHashMap<>(); - private static final Map JE_BLOCK_STATE_HASH_TO_BE = new Int2ObjectOpenHashMap<>(); - private static final Map> JE_ITEM_ID_TO_BE = new Object2ObjectOpenHashMap<>(); - private static final Map JE_BIOME_ID_TO_BE = new Object2IntOpenHashMap<>(); + private static final Map> JE_BLOCK_DEFAULT_PROPERTIES = new HashMap<>(); + private static final Map BE_BLOCK_STATE_TO_JE = new HashMap<>(); + private static final Map JE_BLOCK_STATE_HASH_TO_BE = new HashMap<>(); + private static final Map> JE_ITEM_ID_TO_BE = new HashMap<>(); + private static final Map JE_BIOME_ID_TO_BE = new HashMap<>(); private static final BlockState BE_AIR_STATE = BlockTypes.AIR.getDefaultState(); @@ -122,7 +120,7 @@ public final class Mapping { Map mappings = from(stream, new TypeToken<>() {}); mappings.forEach((javaId, mapping) -> { - ItemType itemType = ItemTypeSafeGetter + ItemType itemType = ItemTypeGetter .name(mapping.bedrockId()) .meta(mapping.bedrockData()) .itemType(); @@ -184,7 +182,7 @@ public final class Mapping { } private static BlockState createBeBlockState(BlockMapping.BedrockState state) { - BlockStateSafeGetter.Getter getter = BlockStateSafeGetter.name("minecraft:" + state.bedrockId()); + BlockStateGetter.Getter getter = BlockStateGetter.name("minecraft:" + state.bedrockId()); if(state.state() != null) { convertValueType(state.state()).forEach(getter::property); } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java index 901f04ee3..7dec2f8b1 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java @@ -1,6 +1,6 @@ package com.dfsek.terra.allay.delegate; -import org.allaymc.api.block.tag.BlockTags; +import org.allaymc.api.block.data.BlockTags; import org.allaymc.api.block.type.BlockType; import com.dfsek.terra.allay.Mapping; 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 c67ed2d88..b5821144c 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.allay.delegate; +import org.allaymc.api.block.data.BlockTags; import org.allaymc.api.block.property.type.BlockPropertyTypes; -import org.allaymc.api.block.tag.BlockTags; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.world.chunk.Chunk; import org.jetbrains.annotations.NotNull; 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 5b67727fb..73405dc65 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.allay.delegate; import org.allaymc.api.block.property.type.BlockPropertyTypes; -import org.allaymc.api.block.tag.BlockTags; +import org.allaymc.api.block.data.BlockTags; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.world.chunk.UnsafeChunk; import org.jetbrains.annotations.NotNull; 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 0fb8173eb..7596dafd8 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.allay.delegate; import org.allaymc.api.block.property.type.BlockPropertyTypes; -import org.allaymc.api.block.tag.BlockTags; +import org.allaymc.api.block.data.BlockTags; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.world.generator.context.OtherChunkAccessibleContext; 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 b19dad904..7759920c1 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 @@ -21,7 +21,7 @@ import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; public record AllayServerWorld(AllayGeneratorWrapper allayGeneratorWrapper, Dimension allayDimension) implements ServerWorld { @Override public Chunk getChunkAt(int x, int z) { - return new AllayChunk(this, allayDimension.getChunkService().getChunk(x, z)); + return new AllayChunk(this, allayDimension.getChunkManager().getChunk(x, z)); } @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 20422b831..fd40727c7 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 @@ -138,11 +138,6 @@ public class AllayGeneratorWrapper implements GeneratorWrapper { } return true; } - - @Override - public String getName() { - return "TERRA_NOISER"; - } } protected class AllayPopulator implements Populator { @@ -159,11 +154,6 @@ public class AllayGeneratorWrapper implements GeneratorWrapper { } return true; } - - @Override - public String getName() { - return "TERRA_POPULATOR"; - } } protected static ConfigPack getConfigPack(String packName) { diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java index f85f001bb..b8352f479 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java @@ -1,7 +1,6 @@ package com.dfsek.terra.allay.handle; import org.allaymc.api.registry.Registries; -import org.allaymc.api.utils.Identifier; import java.util.Set; import java.util.stream.Collectors; @@ -13,6 +12,9 @@ import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.item.Enchantment; +import org.allaymc.api.utils.identifier.Identifier; + + /** * @author daoge_cmd */