refactor forge stuff

This commit is contained in:
dfsek 2021-05-04 22:09:50 -07:00
parent d3458148bd
commit a821501392
26 changed files with 50 additions and 56 deletions

View File

@ -1,18 +1,18 @@
package com.dfsek.terra.forge.world; package com.dfsek.terra.forge;
import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.math.vector.Vector3;
import com.dfsek.terra.api.platform.block.BlockFace; import com.dfsek.terra.api.platform.block.BlockFace;
import com.dfsek.terra.api.platform.block.state.Container; import com.dfsek.terra.api.platform.block.state.Container;
import com.dfsek.terra.api.platform.block.state.MobSpawner; import com.dfsek.terra.api.platform.block.state.MobSpawner;
import com.dfsek.terra.api.platform.block.state.Sign; import com.dfsek.terra.api.platform.block.state.Sign;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import com.dfsek.terra.forge.world.block.data.ForgeDirectional; import com.dfsek.terra.forge.block.data.ForgeDirectional;
import com.dfsek.terra.forge.world.block.data.ForgeMultipleFacing; import com.dfsek.terra.forge.block.data.ForgeMultipleFacing;
import com.dfsek.terra.forge.world.block.data.ForgeOrientable; import com.dfsek.terra.forge.block.data.ForgeOrientable;
import com.dfsek.terra.forge.world.block.data.ForgeRotatable; import com.dfsek.terra.forge.block.data.ForgeRotatable;
import com.dfsek.terra.forge.world.block.data.ForgeSlab; import com.dfsek.terra.forge.block.data.ForgeSlab;
import com.dfsek.terra.forge.world.block.data.ForgeStairs; import com.dfsek.terra.forge.block.data.ForgeStairs;
import com.dfsek.terra.forge.world.block.data.ForgeWaterlogged; import com.dfsek.terra.forge.block.data.ForgeWaterlogged;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.tileentity.LockableLootTileEntity; import net.minecraft.tileentity.LockableLootTileEntity;

View File

@ -37,11 +37,11 @@ import com.dfsek.terra.config.lang.LangUtil;
import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.lang.Language;
import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.config.templates.BiomeTemplate;
import com.dfsek.terra.forge.generation.ForgeChunkGeneratorWrapper;
import com.dfsek.terra.forge.generation.PopulatorFeature;
import com.dfsek.terra.forge.generation.TerraLevelType;
import com.dfsek.terra.forge.handle.ForgeItemHandle; import com.dfsek.terra.forge.handle.ForgeItemHandle;
import com.dfsek.terra.forge.handle.ForgeWorldHandle; import com.dfsek.terra.forge.handle.ForgeWorldHandle;
import com.dfsek.terra.forge.world.features.PopulatorFeature;
import com.dfsek.terra.forge.world.generator.ForgeChunkGeneratorWrapper;
import com.dfsek.terra.forge.world.generator.config.TerraLevelType;
import com.dfsek.terra.profiler.Profiler; import com.dfsek.terra.profiler.Profiler;
import com.dfsek.terra.profiler.ProfilerImpl; import com.dfsek.terra.profiler.ProfilerImpl;
import com.dfsek.terra.registry.exception.DuplicateEntryException; import com.dfsek.terra.registry.exception.DuplicateEntryException;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.forge.world.block; package com.dfsek.terra.forge.block;
import com.dfsek.terra.api.math.vector.Location; import com.dfsek.terra.api.math.vector.Location;
import com.dfsek.terra.api.platform.block.Block; import com.dfsek.terra.api.platform.block.Block;
@ -7,7 +7,7 @@ import com.dfsek.terra.api.platform.block.BlockFace;
import com.dfsek.terra.api.platform.block.BlockType; import com.dfsek.terra.api.platform.block.BlockType;
import com.dfsek.terra.api.platform.block.state.BlockState; import com.dfsek.terra.api.platform.block.state.BlockState;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.forge.world.ForgeAdapter; import com.dfsek.terra.forge.ForgeAdapter;
import net.minecraft.block.FlowingFluidBlock; import net.minecraft.block.FlowingFluidBlock;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld; import net.minecraft.world.IWorld;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.forge.world.block; package com.dfsek.terra.forge.block;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.block.BlockType; import com.dfsek.terra.api.platform.block.BlockType;

View File

@ -1,7 +1,7 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.data.AnaloguePowerable; import com.dfsek.terra.api.platform.block.data.AnaloguePowerable;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
/** /**

View File

@ -1,9 +1,9 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.BlockFace; import com.dfsek.terra.api.platform.block.BlockFace;
import com.dfsek.terra.api.platform.block.data.Directional; import com.dfsek.terra.api.platform.block.data.Directional;
import com.dfsek.terra.forge.world.ForgeAdapter; import com.dfsek.terra.forge.ForgeAdapter;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.state.DirectionProperty; import net.minecraft.state.DirectionProperty;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.Axis; import com.dfsek.terra.api.platform.block.Axis;
import com.dfsek.terra.api.platform.block.BlockFace; import com.dfsek.terra.api.platform.block.BlockFace;

View File

@ -1,12 +1,11 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.BlockFace; import com.dfsek.terra.api.platform.block.BlockFace;
import com.dfsek.terra.api.platform.block.data.MultipleFacing; import com.dfsek.terra.api.platform.block.data.MultipleFacing;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.BlockStateProperties;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

View File

@ -1,13 +1,12 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.Axis; import com.dfsek.terra.api.platform.block.Axis;
import com.dfsek.terra.api.platform.block.data.Orientable; import com.dfsek.terra.api.platform.block.data.Orientable;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.state.EnumProperty; import net.minecraft.state.EnumProperty;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import java.util.Arrays; import java.util.Arrays;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;

View File

@ -1,8 +1,8 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.BlockFace; import com.dfsek.terra.api.platform.block.BlockFace;
import com.dfsek.terra.api.platform.block.data.Rotatable; import com.dfsek.terra.api.platform.block.data.Rotatable;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.BlockStateProperties;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.data.Slab; import com.dfsek.terra.api.platform.block.data.Slab;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.BlockFace; import com.dfsek.terra.api.platform.block.BlockFace;
import com.dfsek.terra.api.platform.block.data.Stairs; import com.dfsek.terra.api.platform.block.data.Stairs;

View File

@ -1,7 +1,7 @@
package com.dfsek.terra.forge.world.block.data; package com.dfsek.terra.forge.block.data;
import com.dfsek.terra.api.platform.block.data.Waterlogged; import com.dfsek.terra.api.platform.block.data.Waterlogged;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.BlockStateProperties;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.forge.world.generator; package com.dfsek.terra.forge.generation;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.generator.ChunkData; import com.dfsek.terra.api.platform.world.generator.ChunkData;
@ -7,7 +7,6 @@ import com.dfsek.terra.api.util.FastRandom;
import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.forge.TerraForgePlugin; import com.dfsek.terra.forge.TerraForgePlugin;
import com.dfsek.terra.forge.world.TerraBiomeSource;
import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.TerraWorld;
import com.dfsek.terra.world.generation.generators.DefaultChunkGenerator3D; import com.dfsek.terra.world.generation.generators.DefaultChunkGenerator3D;
import com.dfsek.terra.world.generation.math.samplers.Sampler; import com.dfsek.terra.world.generation.math.samplers.Sampler;

View File

@ -1,8 +1,7 @@
package com.dfsek.terra.forge.world.features; package com.dfsek.terra.forge.generation;
import com.dfsek.terra.api.platform.world.Chunk; import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.forge.world.generator.ForgeChunkGeneratorWrapper;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ISeedReader; import net.minecraft.world.ISeedReader;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.forge.world; package com.dfsek.terra.forge.generation;
import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.UserDefinedBiome;
import com.dfsek.terra.api.world.biome.provider.BiomeProvider; import com.dfsek.terra.api.world.biome.provider.BiomeProvider;

View File

@ -1,9 +1,7 @@
package com.dfsek.terra.forge.world.generator.config; package com.dfsek.terra.forge.generation;
import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.forge.TerraForgePlugin; import com.dfsek.terra.forge.TerraForgePlugin;
import com.dfsek.terra.forge.world.TerraBiomeSource;
import com.dfsek.terra.forge.world.generator.ForgeChunkGeneratorWrapper;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.ChunkGenerator;

View File

@ -2,8 +2,8 @@ package com.dfsek.terra.forge.handle;
import com.dfsek.terra.api.platform.entity.EntityType; import com.dfsek.terra.api.platform.entity.EntityType;
import com.dfsek.terra.api.platform.handle.WorldHandle; import com.dfsek.terra.api.platform.handle.WorldHandle;
import com.dfsek.terra.forge.world.ForgeAdapter; import com.dfsek.terra.forge.ForgeAdapter;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import com.mojang.brigadier.StringReader; import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

View File

@ -3,8 +3,8 @@ package com.dfsek.terra.forge.mixin.implementations.block;
import com.dfsek.terra.api.platform.block.Block; import com.dfsek.terra.api.platform.block.Block;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.block.state.BlockState; import com.dfsek.terra.api.platform.block.state.BlockState;
import com.dfsek.terra.forge.world.ForgeAdapter; import com.dfsek.terra.forge.ForgeAdapter;
import com.dfsek.terra.forge.world.block.ForgeBlock; import com.dfsek.terra.forge.block.ForgeBlock;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;

View File

@ -2,7 +2,7 @@ package com.dfsek.terra.forge.mixin.implementations.block;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.block.BlockType; import com.dfsek.terra.api.platform.block.BlockType;
import com.dfsek.terra.forge.world.ForgeAdapter; import com.dfsek.terra.forge.ForgeAdapter;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;

View File

@ -4,8 +4,8 @@ import com.dfsek.terra.api.platform.block.Block;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.world.Chunk; import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.forge.world.block.ForgeBlock; import com.dfsek.terra.forge.block.ForgeBlock;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.gen.WorldGenRegion; import net.minecraft.world.gen.WorldGenRegion;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -4,8 +4,8 @@ import com.dfsek.terra.api.platform.block.Block;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.world.Chunk; import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.forge.world.block.ForgeBlock; import com.dfsek.terra.forge.block.ForgeBlock;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.chunk.IChunk; import net.minecraft.world.chunk.IChunk;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -2,7 +2,7 @@ package com.dfsek.terra.forge.mixin.implementations.chunk.data;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.world.generator.ChunkData; import com.dfsek.terra.api.platform.world.generator.ChunkData;
import com.dfsek.terra.forge.world.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.chunk.ChunkPrimer;

View File

@ -2,7 +2,7 @@ package com.dfsek.terra.forge.mixin.implementations.entity;
import com.dfsek.terra.api.math.vector.Location; import com.dfsek.terra.api.math.vector.Location;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.forge.world.ForgeAdapter; import com.dfsek.terra.forge.ForgeAdapter;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.ITextComponent;

View File

@ -9,8 +9,8 @@ import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.generator.ChunkGenerator; import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper; import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
import com.dfsek.terra.forge.world.block.ForgeBlock; import com.dfsek.terra.forge.block.ForgeBlock;
import com.dfsek.terra.forge.world.generator.ForgeChunkGeneratorWrapper; import com.dfsek.terra.forge.generation.ForgeChunkGeneratorWrapper;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.gen.WorldGenRegion; import net.minecraft.world.gen.WorldGenRegion;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;

View File

@ -9,8 +9,8 @@ import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.platform.world.generator.ChunkGenerator; import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper; import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
import com.dfsek.terra.forge.world.block.ForgeBlock; import com.dfsek.terra.forge.block.ForgeBlock;
import com.dfsek.terra.forge.world.generator.ForgeChunkGeneratorWrapper; import com.dfsek.terra.forge.generation.ForgeChunkGeneratorWrapper;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IServerWorld; import net.minecraft.world.IServerWorld;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;