mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-15 21:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Begin absorbing Gaea into Terra

Browse Source
This commit is contained in:
dfsek
2020-12-18 19:36:27 -07:00
parent 9ac098f1ca
commit d1af8c1224
241 changed files with 779 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.world.Biome;
import com.dfsek.terra.api.generic.world.BiomeGrid;
import com.dfsek.terra.api.platform.world.Biome;
import com.dfsek.terra.api.platform.world.BiomeGrid;
import com.dfsek.terra.bukkit.world.BukkitBiome;
import org.bukkit.generator.ChunkGenerator;
import org.jetbrains.annotations.NotNull;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.bukkit.world.block.BukkitBlock;
public class BukkitChunk implements Chunk {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.CommandSender;
import com.dfsek.terra.api.platform.CommandSender;
import org.bukkit.ChatColor;
public class BukkitCommandSender implements CommandSender {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.Entity;
import com.dfsek.terra.api.platform.Entity;
public class BukkitEntity implements Entity {
private final org.bukkit.entity.Entity entity;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.inventory.ItemHandle;
import com.dfsek.terra.api.generic.inventory.ItemStack;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.inventory.ItemHandle;
import com.dfsek.terra.api.platform.inventory.ItemStack;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
public class BukkitItemHandle implements ItemHandle {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemMeta.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.inventory.item.ItemMeta;
import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
public class BukkitItemMeta implements ItemMeta {
private final org.bukkit.inventory.meta.ItemMeta delegate;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemStack.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.inventory.ItemStack;
import com.dfsek.terra.api.generic.inventory.item.ItemMeta;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.inventory.ItemStack;
import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
public class BukkitItemStack implements ItemStack {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.Player;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.world.vector.Location;
public class BukkitPlayer implements Player {
private final org.bukkit.entity.Player delegate;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java
+5 -5
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.world.WorldHandle;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.world.WorldHandle;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.bukkit.util.BukkitConversions;
import com.dfsek.terra.util.MaterialSet;
import org.bukkit.TreeType;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java
+7 -7
View File
@@ -1,11 +1,11 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator;
import com.dfsek.terra.bukkit.world.block.BukkitBlock;
@@ -75,7 +75,7 @@ public class BukkitWorld implements World {
}
@Override
public void spawn(Location l, Class<com.dfsek.terra.api.generic.Entity> entity, java.util.function.Consumer<com.dfsek.terra.api.generic.Entity> consumer) {
public void spawn(Location l, Class<com.dfsek.terra.api.platform.Entity> entity, java.util.function.Consumer<com.dfsek.terra.api.platform.Entity> consumer) {
}
@Override
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java
+6 -6
View File
@@ -1,11 +1,11 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.world.WorldHandle;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.world.WorldHandle;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.bukkit.world.block.BukkitBlockData;
import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+12 -12
View File
@@ -4,14 +4,14 @@ import com.dfsek.tectonic.loading.TypeRegistry;
import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.api.GenericLoaders;
import com.dfsek.terra.api.gaea.lang.Language;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.inventory.ItemHandle;
import com.dfsek.terra.api.generic.world.Biome;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.WorldHandle;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.inventory.ItemHandle;
import com.dfsek.terra.api.platform.world.Biome;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.WorldHandle;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.transform.MapTransform;
import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.bukkit.command.command.TerraCommand;
@@ -26,7 +26,7 @@ import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.base.PluginConfig;
import com.dfsek.terra.config.lang.LangUtil;
import com.dfsek.terra.debug.Debug;
import com.dfsek.terra.generation.TerraChunkGenerator;
import com.dfsek.terra.generation.MasterChunkGenerator;
import com.dfsek.terra.registry.ConfigRegistry;
import com.dfsek.terra.util.StringUtils;
import org.bstats.bukkit.Metrics;
@@ -45,7 +45,7 @@ import java.util.Objects;
public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
private final Map<String, TerraChunkGenerator> generatorMap = new HashMap<>();
private final Map<String, MasterChunkGenerator> generatorMap = new HashMap<>();
private final Map<World, TerraWorld> worldMap = new HashMap<>();
private final Map<String, ConfigPack> worlds = new HashMap<>();
private final ConfigRegistry registry = new ConfigRegistry();
@@ -138,7 +138,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> {
if(!registry.contains(id)) throw new IllegalArgumentException("No such config pack \"" + id + "\"");
worlds.put(worldName, registry.get(id));
return new TerraChunkGenerator(registry.get(id), this);
return new MasterChunkGenerator(registry.get(id), this);
}));
}
@@ -162,7 +162,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
throw new IllegalArgumentException("Not a Terra world! " + w.getGenerator());
if(!worlds.containsKey(w.getName())) {
getLogger().warning("Unexpected world load detected: \"" + w.getName() + "\"");
return new TerraWorld(w, ((TerraChunkGenerator) w.getGenerator()).getConfigPack(), this);
return new TerraWorld(w, ((MasterChunkGenerator) w.getGenerator()).getConfigPack(), this);
}
return worldMap.computeIfAbsent(w, world -> new TerraWorld(w, worlds.get(w.getName()), this));
}
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/Command.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.command;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.bukkit.BukkitCommandSender;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.command.command;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.bukkit.BukkitCommandSender;
import com.dfsek.terra.bukkit.command.Command;
import com.dfsek.terra.bukkit.command.command.biome.BiomeCommand;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.command.command.geometry;
import com.dfsek.terra.api.gaea.math.FastNoiseLite;
import com.dfsek.terra.api.generic.world.vector.Vector3;
import com.dfsek.terra.api.platform.world.vector.Vector3;
import com.dfsek.terra.bukkit.BukkitCommandSender;
import com.dfsek.terra.bukkit.BukkitPlayer;
import com.dfsek.terra.bukkit.BukkitWorld;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.command.command.geometry;
import com.dfsek.terra.api.generic.world.vector.Vector3;
import com.dfsek.terra.api.platform.world.vector.Vector3;
import com.dfsek.terra.bukkit.BukkitCommandSender;
import com.dfsek.terra.bukkit.BukkitPlayer;
import com.dfsek.terra.bukkit.BukkitWorld;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.command.command.geometry;
import com.dfsek.terra.api.generic.world.vector.Vector3;
import com.dfsek.terra.api.platform.world.vector.Vector3;
import com.dfsek.terra.bukkit.BukkitCommandSender;
import com.dfsek.terra.bukkit.BukkitWorld;
import com.dfsek.terra.bukkit.command.PlayerCommand;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
+6 -6
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.bukkit.generator;
import com.dfsek.terra.api.generic.generator.BlockPopulator;
import com.dfsek.terra.api.generic.generator.TerraChunkGenerator;
import com.dfsek.terra.api.generic.world.BiomeGrid;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.platform.generator.BlockPopulator;
import com.dfsek.terra.api.platform.world.BiomeGrid;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
import com.dfsek.terra.bukkit.BukkitBiomeGrid;
import com.dfsek.terra.bukkit.BukkitWorld;
import com.dfsek.terra.bukkit.world.block.BukkitBlockData;
@@ -16,7 +16,7 @@ import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
public class BukkitChunkGenerator implements com.dfsek.terra.api.generic.generator.ChunkGenerator {
public class BukkitChunkGenerator implements com.dfsek.terra.api.platform.generator.ChunkGenerator {
private final ChunkGenerator delegate;
public BukkitChunkGenerator(ChunkGenerator delegate) {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
+9 -8
View File
@@ -1,14 +1,15 @@
package com.dfsek.terra.bukkit.generator;
import com.dfsek.terra.api.gaea.population.PopulationManager;
import com.dfsek.terra.api.generic.Handle;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.generator.TerraChunkGenerator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.platform.Handle;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
import com.dfsek.terra.bukkit.BukkitBiomeGrid;
import com.dfsek.terra.bukkit.BukkitWorld;
import com.dfsek.terra.config.lang.LangUtil;
import com.dfsek.terra.debug.Debug;
import com.dfsek.terra.generation.MasterChunkGenerator;
import com.dfsek.terra.population.CavePopulator;
import com.dfsek.terra.population.FloraPopulator;
import com.dfsek.terra.population.OrePopulator;
@@ -31,7 +32,7 @@ import java.util.stream.Stream;
public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Handle {
private static final Map<com.dfsek.terra.api.generic.world.World, PopulationManager> popMap = new HashMap<>();
private static final Map<com.dfsek.terra.api.platform.world.World, PopulationManager> popMap = new HashMap<>();
private final PopulationManager popMan;
@@ -52,7 +53,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Handl
public static synchronized void saveAll() {
for(Map.Entry<com.dfsek.terra.api.generic.world.World, PopulationManager> e : popMap.entrySet()) {
for(Map.Entry<com.dfsek.terra.api.platform.world.World, PopulationManager> e : popMap.entrySet()) {
try {
e.getValue().saveBlocks(e.getKey());
Debug.info("Saved data for world " + e.getKey().getName());
@@ -63,11 +64,11 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Handl
}
public static synchronized void fixChunk(Chunk c) {
if(!(c.getWorld().getGenerator() instanceof com.dfsek.terra.generation.TerraChunkGenerator)) throw new IllegalArgumentException();
if(!(c.getWorld().getGenerator() instanceof MasterChunkGenerator)) throw new IllegalArgumentException();
popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld());
}
private void load(com.dfsek.terra.api.generic.world.World w) {
private void load(com.dfsek.terra.api.platform.world.World w) {
try {
popMan.loadBlocks(w);
} catch(FileNotFoundException e) {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.bukkit.generator;
import com.dfsek.terra.api.generic.generator.BlockPopulator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.platform.generator.BlockPopulator;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.bukkit.BukkitChunk;
import com.dfsek.terra.bukkit.BukkitWorld;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.generator;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
import com.dfsek.terra.bukkit.BukkitChunk;
import com.dfsek.terra.bukkit.BukkitWorld;
import org.bukkit.Chunk;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.listeners;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.platform.TerraPlugin;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.world.StructureGrowEvent;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.listeners;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.platform.TerraPlugin;
import org.bukkit.event.Listener;
/**
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/RotationUtil.java
+11 -11
View File
@@ -1,16 +1,16 @@
package com.dfsek.terra.bukkit.structure;
import com.dfsek.terra.api.generic.world.block.Axis;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.Directional;
import com.dfsek.terra.api.generic.world.block.data.MultipleFacing;
import com.dfsek.terra.api.generic.world.block.data.Orientable;
import com.dfsek.terra.api.generic.world.block.data.Rail;
import com.dfsek.terra.api.generic.world.block.data.RedstoneWire;
import com.dfsek.terra.api.generic.world.block.data.Rotatable;
import com.dfsek.terra.api.generic.world.block.data.Wall;
import com.dfsek.terra.api.generic.world.vector.Vector2;
import com.dfsek.terra.api.platform.world.block.Axis;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.Directional;
import com.dfsek.terra.api.platform.world.block.data.MultipleFacing;
import com.dfsek.terra.api.platform.world.block.data.Orientable;
import com.dfsek.terra.api.platform.world.block.data.Rail;
import com.dfsek.terra.api.platform.world.block.data.RedstoneWire;
import com.dfsek.terra.api.platform.world.block.data.Rotatable;
import com.dfsek.terra.api.platform.world.block.data.Wall;
import com.dfsek.terra.api.platform.world.vector.Vector2;
import com.dfsek.terra.structure.Rotation;
import net.jafama.FastMath;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.util;
import com.dfsek.terra.api.generic.world.vector.Vector3;
import com.dfsek.terra.api.platform.world.vector.Vector3;
import com.dfsek.terra.bukkit.BukkitWorld;
import org.bukkit.Location;
import org.bukkit.util.Vector;
@@ -10,7 +10,7 @@ public final class BukkitConversions {
return new Vector3(bukkit.getX(), bukkit.getY(), bukkit.getZ());
}
public static Location toBukkitLocation(com.dfsek.terra.api.generic.world.vector.Location terra) {
public static Location toBukkitLocation(com.dfsek.terra.api.platform.world.vector.Location terra) {
return new Location(((BukkitWorld) terra.getWorld()).getHandle(), terra.getX(), terra.getY(), terra.getZ());
}
}
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiome.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world;
import com.dfsek.terra.api.generic.world.Biome;
import com.dfsek.terra.api.platform.world.Biome;
public class BukkitBiome implements Biome {
private final org.bukkit.block.Biome biome;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
+5 -5
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.bukkit.world.block;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.bukkit.BukkitWorld;
import com.dfsek.terra.bukkit.world.block.data.TerraEnumAdapter;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockData.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
public class BukkitBlockData implements BlockData {
private org.bukkit.block.data.BlockData delegate;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import org.bukkit.Material;
public class BukkitMaterialData implements MaterialData {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitEnumAdapter.java
+4 -4
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.Bisected;
import com.dfsek.terra.api.generic.world.block.data.Slab;
import com.dfsek.terra.api.generic.world.block.data.Stairs;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.Bisected;
import com.dfsek.terra.api.platform.world.block.data.Slab;
import com.dfsek.terra.api.platform.world.block.data.Stairs;
/**
* Utility class to adapt Bukkit enums to Terra enums.
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitMultipleFacing.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.MultipleFacing;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.MultipleFacing;
import com.dfsek.terra.bukkit.world.block.BukkitBlockData;
import java.util.Set;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitSlab.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.generic.world.block.data.Slab;
import com.dfsek.terra.api.platform.world.block.data.Slab;
public class BukkitSlab extends BukkitWaterlogged implements Slab {
public BukkitSlab(org.bukkit.block.data.type.Slab delegate) {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitStairs.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.Stairs;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.Stairs;
import com.dfsek.terra.bukkit.world.block.BukkitBlockData;
public class BukkitStairs extends BukkitBlockData implements Stairs {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitWaterlogged.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.generic.world.block.data.Waterlogged;
import com.dfsek.terra.api.platform.world.block.data.Waterlogged;
import com.dfsek.terra.bukkit.world.block.BukkitBlockData;
public class BukkitWaterlogged extends BukkitBlockData implements Waterlogged {
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/TerraEnumAdapter.java
+4 -4
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import org.bukkit.block.data.Bisected;
import org.bukkit.block.data.type.Slab;
import org.bukkit.block.data.type.Stairs;
@@ -10,7 +10,7 @@ import org.bukkit.block.data.type.Stairs;
* Utility class to adapt Terra enums to Bukkit enums
*/
public final class TerraEnumAdapter {
public static Stairs.Shape fromTerraStair(com.dfsek.terra.api.generic.world.block.data.Stairs.Shape shape) {
public static Stairs.Shape fromTerraStair(com.dfsek.terra.api.platform.world.block.data.Stairs.Shape shape) {
switch(shape) {
case STRAIGHT:
return Stairs.Shape.STRAIGHT;
@@ -27,7 +27,7 @@ public final class TerraEnumAdapter {
}
}
public static Bisected.Half fromTerraHalf(com.dfsek.terra.api.generic.world.block.data.Bisected.Half half) {
public static Bisected.Half fromTerraHalf(com.dfsek.terra.api.platform.world.block.data.Bisected.Half half) {
switch(half) {
case TOP:
return Bisected.Half.TOP;
@@ -83,7 +83,7 @@ public final class TerraEnumAdapter {
}
}
public static Slab.Type fromTerraSlabType(com.dfsek.terra.api.generic.world.block.data.Slab.Type type) {
public static Slab.Type fromTerraSlabType(com.dfsek.terra.api.platform.world.block.data.Slab.Type type) {
switch(type) {
case TOP:
return Slab.Type.TOP;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+7 -7
View File
@@ -4,12 +4,12 @@ import com.dfsek.tectonic.loading.TypeRegistry;
import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.api.GenericLoaders;
import com.dfsek.terra.api.gaea.lang.Language;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.inventory.ItemHandle;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.WorldHandle;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.api.platform.inventory.ItemHandle;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.WorldHandle;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.transform.MapTransform;
import com.dfsek.terra.api.transform.NotNullValidator;
import com.dfsek.terra.api.transform.Transformer;
@@ -176,7 +176,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
registry
.registerLoader(BlockData.class, (t, o, l) -> worldHandle.createBlockData((String) o))
.registerLoader(MaterialData.class, (t, o, l) -> worldHandle.createMaterialData((String) o))
.registerLoader(com.dfsek.terra.api.generic.world.Biome.class, (t, o, l) -> new FabricBiome(biomeFixer.translate((String) o)));
.registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> new FabricBiome(biomeFixer.translate((String) o)));
}
public static String createBiomeID(ConfigPack pack, UserDefinedBiome biome) {
platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.fabric.inventory;
import com.dfsek.terra.api.generic.inventory.ItemHandle;
import com.dfsek.terra.api.generic.inventory.ItemStack;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.inventory.ItemHandle;
import com.dfsek.terra.api.platform.inventory.ItemStack;
import com.dfsek.terra.api.platform.world.block.MaterialData;
public class FabricItemHandle implements ItemHandle {
@Override
platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.fabric.inventory;
import com.dfsek.terra.api.generic.inventory.ItemStack;
import com.dfsek.terra.api.generic.inventory.item.ItemMeta;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.inventory.ItemStack;
import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
import com.dfsek.terra.api.platform.world.block.MaterialData;
public class FabricItemStack implements ItemStack {
net.minecraft.item.ItemStack delegate;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricAdapters.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.world;
import com.dfsek.terra.api.generic.world.vector.Vector3;
import com.dfsek.terra.api.platform.world.vector.Vector3;
import net.minecraft.util.math.BlockPos;
public final class FabricAdapters {
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricBiome.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.world;
import com.dfsek.terra.api.generic.world.Biome;
import com.dfsek.terra.api.platform.world.Biome;
public class FabricBiome implements Biome {
private final net.minecraft.world.biome.Biome delegate;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.fabric.world;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.fabric.TerraFabricPlugin;
import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
+5 -5
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.fabric.world;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.world.WorldHandle;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.world.WorldHandle;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.fabric.world.block.FabricBlockData;
import com.dfsek.terra.fabric.world.block.FabricMaterialData;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/TerraBiomeSource.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.world;
import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.world.generation.GenerationPhase;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
import com.dfsek.terra.config.base.ConfigPack;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
+5 -5
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.fabric.world.block;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.fabric.world.FabricAdapters;
import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
import net.minecraft.util.math.BlockPos;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.world.block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import net.minecraft.block.BlockState;
public class FabricBlockData implements BlockData {
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.world.block;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.MaterialData;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricEnumAdapter.java
+4 -4
View File
@@ -1,9 +1,9 @@
package com.dfsek.terra.fabric.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.Bisected;
import com.dfsek.terra.api.generic.world.block.data.Slab;
import com.dfsek.terra.api.generic.world.block.data.Stairs;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.Bisected;
import com.dfsek.terra.api.platform.world.block.data.Slab;
import com.dfsek.terra.api.platform.world.block.data.Stairs;
import net.minecraft.block.enums.BlockHalf;
import net.minecraft.block.enums.SlabType;
import net.minecraft.block.enums.StairShape;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricMultipleFacing.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.MultipleFacing;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.MultipleFacing;
import com.dfsek.terra.fabric.world.block.FabricBlockData;
import net.minecraft.block.BlockState;
import net.minecraft.state.property.Properties;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricSlab.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.world.block.data;
import com.dfsek.terra.api.generic.world.block.data.Slab;
import com.dfsek.terra.api.platform.world.block.data.Slab;
import net.minecraft.block.BlockState;
import net.minecraft.state.property.Properties;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricStairs.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.Stairs;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.Stairs;
import net.minecraft.block.BlockState;
import net.minecraft.state.property.Properties;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricWaterlogged.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.world.block.data;
import com.dfsek.terra.api.generic.world.block.data.Waterlogged;
import com.dfsek.terra.api.platform.world.block.data.Waterlogged;
import com.dfsek.terra.fabric.world.block.FabricBlockData;
import net.minecraft.block.BlockState;
import net.minecraft.state.property.Properties;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/TerraEnumAdapter.java
+4 -4
View File
@@ -1,9 +1,9 @@
package com.dfsek.terra.fabric.world.block.data;
import com.dfsek.terra.api.generic.world.block.BlockFace;
import com.dfsek.terra.api.generic.world.block.data.Bisected;
import com.dfsek.terra.api.generic.world.block.data.Slab;
import com.dfsek.terra.api.generic.world.block.data.Stairs;
import com.dfsek.terra.api.platform.world.block.BlockFace;
import com.dfsek.terra.api.platform.world.block.data.Bisected;
import com.dfsek.terra.api.platform.world.block.data.Slab;
import com.dfsek.terra.api.platform.world.block.data.Stairs;
import net.minecraft.block.enums.BlockHalf;
import net.minecraft.block.enums.SlabType;
import net.minecraft.block.enums.StairShape;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkData.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.world.generator;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.platform.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.fabric.world.block.FabricBlockData;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.chunk.Chunk;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGenerator.java
+5 -5
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.fabric.world.generator;
import com.dfsek.terra.api.generic.generator.BlockPopulator;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.generator.TerraChunkGenerator;
import com.dfsek.terra.api.generic.world.BiomeGrid;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.platform.generator.BlockPopulator;
import com.dfsek.terra.api.platform.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.BiomeGrid;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
+5 -5
View File
@@ -1,12 +1,12 @@
package com.dfsek.terra.fabric.world.generator;
import com.dfsek.terra.api.gaea.util.FastRandom;
import com.dfsek.terra.api.generic.Handle;
import com.dfsek.terra.api.platform.Handle;
import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.fabric.TerraFabricPlugin;
import com.dfsek.terra.fabric.world.TerraBiomeSource;
import com.dfsek.terra.fabric.world.handles.world.FabricSeededWorldAccess;
import com.dfsek.terra.generation.TerraChunkGenerator;
import com.dfsek.terra.generation.MasterChunkGenerator;
import com.dfsek.terra.population.CavePopulator;
import com.dfsek.terra.population.FloraPopulator;
import com.dfsek.terra.population.OrePopulator;
@@ -32,7 +32,7 @@ import net.minecraft.world.gen.chunk.VerticalBlockSample;
public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Handle {
private final long seed;
private final TerraChunkGenerator delegate;
private final MasterChunkGenerator delegate;
private final TerraBiomeSource biomeSource;
public static final Codec<ConfigPack> PACK_CODEC = (RecordCodecBuilder.create(config -> config.group(
Codec.STRING.fieldOf("pack").forGetter(pack -> pack.getTemplate().getID())
@@ -70,7 +70,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Handl
super(biomeSource, new StructuresConfig(false));
this.pack = configPack;
this.delegate = new TerraChunkGenerator(configPack, TerraFabricPlugin.getInstance());
this.delegate = new MasterChunkGenerator(configPack, TerraFabricPlugin.getInstance());
delegate.getMain().getLogger().info("Loading world...");
this.biomeSource = biomeSource;
@@ -78,7 +78,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Handl
}
@Override
public TerraChunkGenerator getHandle() {
public MasterChunkGenerator getHandle() {
return delegate;
}
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
+7 -7
View File
@@ -1,12 +1,12 @@
package com.dfsek.terra.fabric.world.handles;
import com.dfsek.terra.api.generic.Entity;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.Entity;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.fabric.world.handles.chunk.FabricChunk;
import net.minecraft.server.world.ServerWorld;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.fabric.world.handles.chunk;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
public class FabricChunk implements Chunk {
private final net.minecraft.world.chunk.Chunk chunk;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunkWorldAccess.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.fabric.world.handles.chunk;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.fabric.world.block.FabricBlock;
import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
import net.minecraft.util.math.BlockPos;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
+7 -7
View File
@@ -1,12 +1,12 @@
package com.dfsek.terra.fabric.world.handles.world;
import com.dfsek.terra.api.generic.Entity;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.Entity;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.fabric.world.block.FabricBlock;
import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
import net.minecraft.util.math.BlockPos;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
+7 -7
View File
@@ -1,12 +1,12 @@
package com.dfsek.terra.fabric.world.handles.world;
import com.dfsek.terra.api.generic.Entity;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.Entity;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.fabric.world.block.FabricBlock;
import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
import net.minecraft.util.math.BlockPos;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java
+7 -7
View File
@@ -1,12 +1,12 @@
package com.dfsek.terra.fabric.world.handles.world;
import com.dfsek.terra.api.generic.Entity;
import com.dfsek.terra.api.generic.Tree;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.Block;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.Entity;
import com.dfsek.terra.api.platform.Tree;
import com.dfsek.terra.api.platform.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.block.Block;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.fabric.world.block.FabricBlock;
import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
import net.minecraft.util.math.BlockPos;