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

Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging

Browse Source 
# Conflicts:
#	common/api/util/src/main/java/com/dfsek/terra/api/util/Logger.java
#	common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java
#	common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
#	common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
#	common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java
#	platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java
This commit is contained in:
solonovamax
2021-09-25 00:42:09 -04:00
parent b03c8b4a11 687efb7444
commit 4c1ac827ad
141 changed files with 205 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java
View File

@@ -14,7 +14,7 @@ import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.api.util.generic.pair.Pair;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.fabric.block.FabricBlockState;
import com.dfsek.terra.fabric.util.FabricAdapter;
import com.dfsek.terra.fabric.util.WorldEditUtil;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java
View File

@@ -18,7 +18,7 @@ import java.util.Set;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.profiler.ProfileFrame;
import com.dfsek.terra.api.util.collection.MaterialSet;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.Tree;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.fabric.FabricEntryPoint;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java
View File

@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Shadow;
import java.util.UUID;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.fabric.util.FabricAdapter;

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

@@ -26,7 +26,7 @@ import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.WorldConfig;
import com.dfsek.terra.api.entity.Entity;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java
View File

@@ -30,7 +30,7 @@ import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.WorldConfig;
import com.dfsek.terra.api.entity.Entity;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java
View File

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.block.state.properties.enums.Half;
import com.dfsek.terra.api.block.state.properties.enums.RailShape;
import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection;
import com.dfsek.terra.api.block.state.properties.enums.WallHeight;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.fabric.block.FabricBlockState;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java
View File

@@ -9,7 +9,7 @@ import net.minecraft.world.World;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.util.generic.pair.Pair;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3;
public final class WorldEditUtil {