mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 16:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Fabric entity spawning

Browse Source
This commit is contained in:
dfsek 2022-06-16 15:59:25 -07:00
parent 355805347b
commit c96e908a1e
7 changed files with 210 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
platforms/fabric/src/main/java/com/dfsek/terra/fabric/entity/DelegateEntity.java Normal file
View File

@ -0,0 +1,52 @@
package com.dfsek.terra.fabric.entity;
import com.dfsek.terra.api.entity.Entity;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.ServerWorld;
import net.minecraft.world.ServerWorldAccess;
public class DelegateEntity implements Entity {
private Vector3 position;
private ServerWorld world;
private final EntityType type;
public DelegateEntity(Vector3 position, ServerWorld world, EntityType type) {
this.world = world;
this.position = position;
this.type = type;
}
@Override
public Vector3 position() {
return position;
}
@Override
public void position(Vector3 position) {
this.position = position;
}
@Override
public ServerWorld world() {
return world;
}
@Override
public void world(ServerWorld world) {
this.world = world;
}
@Override
public Object getHandle() {
return this;
}
public net.minecraft.entity.Entity createMinecraftEntity(ServerWorldAccess world) {
net.minecraft.entity.Entity entity = ((net.minecraft.entity.EntityType<?>) type).create(world.toServerWorld());
entity.setPos(position.getX(), position.getY(), position.getZ());
return entity;
}
}

10
platforms/fabric/src/main/java/com/dfsek/terra/fabric/entity/DelegateEntityHolder.java Normal file
View File

@ -0,0 +1,10 @@
package com.dfsek.terra.fabric.entity;
import java.util.List;
public interface DelegateEntityHolder {
List<DelegateEntity> getAndClearTerraEntities();
void addTerraEntity(DelegateEntity entity);
}

12
platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
View File

@ -27,6 +27,8 @@ import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper;
import com.dfsek.terra.api.world.info.WorldProperties;
import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
import com.dfsek.terra.fabric.data.Codecs;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.mixin.access.ChunkRegionAccessor;
import com.dfsek.terra.fabric.mixin.access.StructureAccessorAccessor;
import com.dfsek.terra.fabric.util.FabricAdapter;
@ -95,7 +97,8 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C
ChunkPos pos = chunk.getPos();
((BiomeProviderHolder) chunk)
.terra$setHeldBiomeProvider(pack.getBiomeProvider()
.caching((ProtoWorld) ((StructureAccessorAccessor) structureAccessor).getWorld(), pos.x, pos.z));
.caching((ProtoWorld) ((StructureAccessorAccessor) structureAccessor).getWorld(), pos.x,
pos.z));
}
return super.populateBiomes(biomeRegistry, executor, noiseConfig, blender, structureAccessor, chunk);
}
@ -116,6 +119,13 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C
@Override
public void populateEntities(ChunkRegion region) {
((ChunkRegionAccessor) region)
.getChunks()
.forEach(
chunk -> ((DelegateEntityHolder) chunk)
.getAndClearTerraEntities()
.forEach(entity -> chunk.addEntity(entity.createMinecraftEntity(region)))
);
if(!this.settings.value().mobGenerationDisabled()) {
ChunkPos chunkPos = region.getCenterPos();
RegistryEntry<Biome> registryEntry = region.getBiome(chunkPos.getStartPos().withY(region.getTopY() - 1));

15
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/ChunkRegionAccessor.java Normal file
View File

@ -0,0 +1,15 @@
package com.dfsek.terra.fabric.mixin.access;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.chunk.Chunk;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.List;
@Mixin(ChunkRegion.class)
public interface ChunkRegionAccessor {
@Accessor("chunks")
List<Chunk> getChunks();
}

46
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/entity_holder/ProtoChunkMixin.java Normal file
View File

@ -0,0 +1,46 @@
package com.dfsek.terra.fabric.mixin.entity_holder;
import com.dfsek.terra.fabric.entity.DelegateEntity;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.HeightLimitView;
import net.minecraft.world.chunk.ChunkSection;
import net.minecraft.world.chunk.ProtoChunk;
import net.minecraft.world.chunk.UpgradeData;
import net.minecraft.world.gen.chunk.BlendingData;
import net.minecraft.world.tick.SimpleTickScheduler;
import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@Mixin(ProtoChunk.class)
@Implements(@Interface(iface = DelegateEntityHolder.class, prefix = "terra$"))
public class ProtoChunkMixin {
private AtomicReference<List<DelegateEntity>> terra$entities;
@Inject(method = "<init>*", at = @At("RETURN"))
public void injectConstructor(CallbackInfo ci) {
this.terra$entities = new AtomicReference<>(new ArrayList<>());
}
public List<DelegateEntity> terra$getAndClearTerraEntities() {
return terra$entities.getAndSet(new ArrayList<>());
}
public void terra$addTerraEntity(DelegateEntity entity) {
this.terra$entities.updateAndGet(list -> {
list.add(entity);
return list;
});
}
}

42
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java
View File

@ -28,6 +28,8 @@ import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
import com.dfsek.terra.fabric.entity.DelegateEntity;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder;
import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
import com.dfsek.terra.fabric.generation.TerraBiomeSource;
@ -47,13 +49,15 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.ArrayList;
import java.util.List;
@Mixin(ChunkRegion.class)
@Implements(@Interface(iface = ProtoWorld.class, prefix = "terraWorld$"))
public abstract class ChunkRegionMixin {
private ConfigPack config;
private ConfigPack terra$config;
@Shadow
@Final
@ -70,27 +74,28 @@ public abstract class ChunkRegionMixin {
@Final
private MultiTickScheduler<Fluid> fluidTickScheduler;
@SuppressWarnings("deprecation")
private final Lazy<BiomeProvider> caching = Lazy.lazy(() -> ((TerraBiomeSource) ((ChunkRegion) (Object) this)
.toServerWorld()
.getChunkManager()
.getChunkGenerator()
.getBiomeSource()).getProvider().caching((ProtoWorld) this));
@Shadow
public abstract net.minecraft.server.world.ServerWorld toServerWorld();
@Shadow
public abstract Chunk getChunk(int chunkX, int chunkZ);
private Lazy<BiomeProvider> caching;
@SuppressWarnings("deprecation")
@Inject(at = @At("RETURN"),
method = "<init>(Lnet/minecraft/server/world/ServerWorld;Ljava/util/List;Lnet/minecraft/world/chunk/ChunkStatus;I)V")
public void injectConstructor(net.minecraft.server.world.ServerWorld world, List<net.minecraft.world.chunk.Chunk> list,
ChunkStatus chunkStatus, int i,
CallbackInfo ci) {
this.config = ((ServerWorld) world).getPack();
this.terra$config = ((ServerWorld) world).getPack();
this.caching = Lazy.lazy(() -> ((TerraBiomeSource) ((ChunkRegion) (Object) this)
.toServerWorld()
.getChunkManager()
.getChunkGenerator()
.getBiomeSource()).getProvider().caching((ProtoWorld) this));
}
public Entity terraWorld$spawnEntity(Vector3 location, EntityType entityType) {
net.minecraft.entity.Entity entity = ((net.minecraft.entity.EntityType<?>) entityType).create(null);
entity.setPos(location.getX(), location.getY(), location.getZ());
((ChunkRegion) (Object) this).spawnEntity(entity);
return (Entity) entity;
}
@Intrinsic(displace = true)
public void terraWorld$setBlockState(int x, int y, int z, BlockState data, boolean physics) {
@ -139,10 +144,9 @@ public abstract class ChunkRegionMixin {
}
public Entity terraWorld$spawnEntity(double x, double y, double z, EntityType entityType) {
net.minecraft.entity.Entity entity = ((net.minecraft.entity.EntityType<?>) entityType).create(null);
entity.setPos(x, y, z);
((ChunkRegion) (Object) this).spawnEntity(entity);
return (Entity) entity;
DelegateEntity entity = new DelegateEntity(Vector3.of(x, y, z), (ServerWorld) this.toServerWorld(), entityType);
((DelegateEntityHolder) getChunk((int) x / 16, (int) z / 16)).addTerraEntity(entity);
return entity;
}
public int terraWorld$centerChunkX() {
@ -158,6 +162,6 @@ public abstract class ChunkRegionMixin {
}
public ConfigPack terraWorld$getPack() {
return config;
return terra$config;
}
}

2
platforms/fabric/src/main/resources/terra.mixins.json
View File

@ -4,12 +4,14 @@
"package": "com.dfsek.terra.fabric.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"access.ChunkRegionAccessor",
"access.MobSpawnerLogicAccessor",
"access.StateAccessor",
"access.StructureAccessorAccessor",
"cache.ChunkRegionMixin",
"cache.ProtoChunkMixin",
"compat.GenerationSettingsFloraFeaturesMixin",
"entity_holder.ProtoChunkMixin",
"fix.NetherFossilOptimization",
"implementations.BiomeMixin",
"implementations.HandleImplementationMixin",