mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-26 05:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: sync allay

Browse Source
This commit is contained in:
daoge_cmd committed 2024-08-27 19:15:42 +08:00
1 parent c97f25cb95
commit 2e709dace6
5 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java
+2 -2
View File
@@ -3,8 +3,8 @@ package org.allaymc.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.data.VanillaBiomeId;
import org.allaymc.api.server.Server; import org.allaymc.api.server.Server;
import org.allaymc.api.world.biome.BiomeId;
import org.allaymc.terra.allay.delegate.AllayBiome; import org.allaymc.terra.allay.delegate.AllayBiome;
import org.allaymc.terra.allay.handle.AllayItemHandle; import org.allaymc.terra.allay.handle.AllayItemHandle;
import org.allaymc.terra.allay.handle.AllayWorldHandle; import org.allaymc.terra.allay.handle.AllayWorldHandle;
@@ -73,6 +73,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(VanillaBiomeId.fromId(Mapping.biomeIdJeToBe(id))); return new AllayBiome(BiomeId.fromId(Mapping.biomeIdJeToBe(id)));
} }
} }
platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.allaymc.terra.allay.delegate; package org.allaymc.terra.allay.delegate;
import org.allaymc.api.block.property.type.BlockPropertyTypes;
import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.block.type.BlockTypes;
import org.allaymc.api.data.VanillaBlockPropertyTypes;
import org.allaymc.api.world.chunk.Chunk; import org.allaymc.api.world.chunk.Chunk;
import org.allaymc.terra.allay.Mapping; import org.allaymc.terra.allay.Mapping;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@ import com.dfsek.terra.api.world.ServerWorld;
*/ */
public record AllayChunk(ServerWorld world, Chunk allayChunk) implements com.dfsek.terra.api.world.chunk.Chunk { public record AllayChunk(ServerWorld world, Chunk allayChunk) implements com.dfsek.terra.api.world.chunk.Chunk {
private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15)); private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
@Override @Override
public void setBlock(int x, int y, int z, BlockState data, boolean physics) { public void setBlock(int x, int y, int z, BlockState data, boolean physics) {
platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.allaymc.terra.allay.delegate; package org.allaymc.terra.allay.delegate;
import org.allaymc.api.block.property.type.BlockPropertyTypes;
import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.block.type.BlockTypes;
import org.allaymc.api.data.VanillaBlockPropertyTypes;
import org.allaymc.api.world.chunk.UnsafeChunk; import org.allaymc.api.world.chunk.UnsafeChunk;
import org.allaymc.terra.allay.Mapping; import org.allaymc.terra.allay.Mapping;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@ import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
*/ */
public record AllayProtoChunk(UnsafeChunk allayChunk) implements ProtoChunk { public record AllayProtoChunk(UnsafeChunk allayChunk) implements ProtoChunk {
private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15)); private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
@Override @Override
public int getMaxHeight() { public int getMaxHeight() {
platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java
+2 -2
View File
@@ -2,8 +2,8 @@ package org.allaymc.terra.allay.delegate;
import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.util.vector.Vector3;
import org.allaymc.api.block.property.type.BlockPropertyTypes;
import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.block.type.BlockTypes;
import org.allaymc.api.data.VanillaBlockPropertyTypes;
import org.allaymc.api.world.generator.context.OtherChunkAccessibleContext; import org.allaymc.api.world.generator.context.OtherChunkAccessibleContext;
import org.allaymc.terra.allay.Mapping; import org.allaymc.terra.allay.Mapping;
@@ -24,7 +24,7 @@ import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
*/ */
public record AllayProtoWorld(AllayServerWorld allayServerWorld, OtherChunkAccessibleContext context) implements ProtoWorld { public record AllayProtoWorld(AllayServerWorld allayServerWorld, OtherChunkAccessibleContext context) implements ProtoWorld {
private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15)); private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
@Override @Override
public int centerChunkX() { public int centerChunkX() {
platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java
+2 -2
View File
@@ -2,8 +2,8 @@ package org.allaymc.terra.allay.delegate;
import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.util.vector.Vector3;
import org.allaymc.api.block.property.type.BlockPropertyTypes;
import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.block.type.BlockTypes;
import org.allaymc.api.data.VanillaBlockPropertyTypes;
import org.allaymc.api.world.Dimension; import org.allaymc.api.world.Dimension;
import org.allaymc.terra.allay.Mapping; import org.allaymc.terra.allay.Mapping;
import org.allaymc.terra.allay.generator.AllayGeneratorWrapper; import org.allaymc.terra.allay.generator.AllayGeneratorWrapper;
@@ -26,7 +26,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 {
private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15)); private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
@Override @Override
public Chunk getChunkAt(int x, int z) { public Chunk getChunkAt(int x, int z) {