mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 02:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: adapt allay api 0.12.0-SHAPSHOT (waiting for 0.12.0 release)

Browse Source
This commit is contained in:
daoge_cmd
2025-09-30 23:12:12 +08:00
parent b7864bb6fb
commit 3ef60f4b33
12 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
buildSrc/src/main/kotlin/DependencyConfig.kt
View File

@@ -57,12 +57,12 @@ fun Project.configureDependencies() {
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
name = "Sonatype Snapshots" name = "Sonatype Snapshots"
} }
maven("https://repo.opencollab.dev/maven-releases/") { // maven("https://repo.opencollab.dev/maven-releases/") {
name = "OpenCollab Releases" // name = "OpenCollab Releases"
} // }
maven("https://repo.opencollab.dev/maven-snapshots/") { // maven("https://repo.opencollab.dev/maven-snapshots/") {
name = "OpenCollab Snapshots" // name = "OpenCollab Snapshots"
} // }
maven("https://storehouse.okaeri.eu/repository/maven-public/") { maven("https://storehouse.okaeri.eu/repository/maven-public/") {
name = "Okaeri" name = "Okaeri"
} }

2
buildSrc/src/main/kotlin/Versions.kt
View File

@@ -81,7 +81,7 @@ object Versions {
} }
object Allay { object Allay {
const val api = "0.7.1" const val api = "0.12.0-SNAPSHOT"
const val gson = "2.13.1" const val gson = "2.13.1"
const val mappings = "8002ed6" const val mappings = "8002ed6"

4
platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java
View File

@@ -3,8 +3,8 @@ package com.dfsek.terra.allay;
import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.TypeRegistry;
import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.depth.DepthTracker;
import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.exception.LoadException;
import org.allaymc.api.registry.Registries;
import org.allaymc.api.server.Server; import org.allaymc.api.server.Server;
import org.allaymc.api.world.biome.BiomeId;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.File; import java.io.File;
@@ -88,6 +88,6 @@ public class AllayPlatform extends AbstractPlatform {
protected AllayBiome parseBiome(String id, DepthTracker depthTracker) throws LoadException { protected AllayBiome parseBiome(String id, DepthTracker depthTracker) throws LoadException {
if(!id.startsWith("minecraft:")) throw new LoadException("Invalid biome identifier " + id, depthTracker); 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)));
} }
} }

2
platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.allay; 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.Map;
import java.util.TreeMap; import java.util.TreeMap;

22
platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java
View File

@@ -8,19 +8,17 @@ import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; 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.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.block.type.BlockTypes;
import org.allaymc.api.item.type.ItemType; 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 org.jetbrains.annotations.Nullable;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -37,11 +35,11 @@ public final class Mapping {
.registerTypeAdapterFactory(new IgnoreFailureTypeAdapterFactory()) .registerTypeAdapterFactory(new IgnoreFailureTypeAdapterFactory())
.create(); .create();
private static final Map<String, Map<String, String>> JE_BLOCK_DEFAULT_PROPERTIES = new Object2ObjectOpenHashMap<>(); private static final Map<String, Map<String, String>> JE_BLOCK_DEFAULT_PROPERTIES = new HashMap<>();
private static final Map<BlockState, JeBlockState> BE_BLOCK_STATE_TO_JE = new Object2ObjectOpenHashMap<>(); private static final Map<BlockState, JeBlockState> BE_BLOCK_STATE_TO_JE = new HashMap<>();
private static final Map<Integer, BlockState> JE_BLOCK_STATE_HASH_TO_BE = new Int2ObjectOpenHashMap<>(); private static final Map<Integer, BlockState> JE_BLOCK_STATE_HASH_TO_BE = new HashMap<>();
private static final Map<String, ItemType<?>> JE_ITEM_ID_TO_BE = new Object2ObjectOpenHashMap<>(); private static final Map<String, ItemType<?>> JE_ITEM_ID_TO_BE = new HashMap<>();
private static final Map<String, Integer> JE_BIOME_ID_TO_BE = new Object2IntOpenHashMap<>(); private static final Map<String, Integer> JE_BIOME_ID_TO_BE = new HashMap<>();
private static final BlockState BE_AIR_STATE = BlockTypes.AIR.getDefaultState(); private static final BlockState BE_AIR_STATE = BlockTypes.AIR.getDefaultState();
@@ -122,7 +120,7 @@ public final class Mapping {
Map<String, ItemMapping> mappings = from(stream, new TypeToken<>() {}); Map<String, ItemMapping> mappings = from(stream, new TypeToken<>() {});
mappings.forEach((javaId, mapping) -> { mappings.forEach((javaId, mapping) -> {
ItemType<?> itemType = ItemTypeSafeGetter ItemType<?> itemType = ItemTypeGetter
.name(mapping.bedrockId()) .name(mapping.bedrockId())
.meta(mapping.bedrockData()) .meta(mapping.bedrockData())
.itemType(); .itemType();
@@ -184,7 +182,7 @@ public final class Mapping {
} }
private static BlockState createBeBlockState(BlockMapping.BedrockState state) { 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) { if(state.state() != null) {
convertValueType(state.state()).forEach(getter::property); convertValueType(state.state()).forEach(getter::property);
} }

2
platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.allay.delegate; 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 org.allaymc.api.block.type.BlockType;
import com.dfsek.terra.allay.Mapping; import com.dfsek.terra.allay.Mapping;

2
platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.allay.delegate; 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.property.type.BlockPropertyTypes;
import org.allaymc.api.block.tag.BlockTags;
import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.block.type.BlockTypes;
import org.allaymc.api.world.chunk.Chunk; import org.allaymc.api.world.chunk.Chunk;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.allay.delegate; package com.dfsek.terra.allay.delegate;
import org.allaymc.api.block.property.type.BlockPropertyTypes; 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.block.type.BlockTypes;
import org.allaymc.api.world.chunk.UnsafeChunk; import org.allaymc.api.world.chunk.UnsafeChunk;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.allay.delegate; package com.dfsek.terra.allay.delegate;
import org.allaymc.api.block.property.type.BlockPropertyTypes; 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.block.type.BlockTypes;
import org.allaymc.api.world.generator.context.OtherChunkAccessibleContext; import org.allaymc.api.world.generator.context.OtherChunkAccessibleContext;

2
platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java
View File

@@ -21,7 +21,7 @@ import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
public record AllayServerWorld(AllayGeneratorWrapper allayGeneratorWrapper, Dimension allayDimension) implements ServerWorld { public record AllayServerWorld(AllayGeneratorWrapper allayGeneratorWrapper, Dimension allayDimension) implements ServerWorld {
@Override @Override
public Chunk getChunkAt(int x, int z) { 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 @Override

10
platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java
View File

@@ -138,11 +138,6 @@ public class AllayGeneratorWrapper implements GeneratorWrapper {
} }
return true; return true;
} }
@Override
public String getName() {
return "TERRA_NOISER";
}
} }
protected class AllayPopulator implements Populator { protected class AllayPopulator implements Populator {
@@ -159,11 +154,6 @@ public class AllayGeneratorWrapper implements GeneratorWrapper {
} }
return true; return true;
} }
@Override
public String getName() {
return "TERRA_POPULATOR";
}
} }
protected static ConfigPack getConfigPack(String packName) { protected static ConfigPack getConfigPack(String packName) {

4
platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java
View File

@@ -1,7 +1,6 @@
package com.dfsek.terra.allay.handle; package com.dfsek.terra.allay.handle;
import org.allaymc.api.registry.Registries; import org.allaymc.api.registry.Registries;
import org.allaymc.api.utils.Identifier;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; 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;
import com.dfsek.terra.api.inventory.item.Enchantment; import com.dfsek.terra.api.inventory.item.Enchantment;
import org.allaymc.api.utils.identifier.Identifier;
/** /**
* @author daoge_cmd * @author daoge_cmd
*/ */