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

refactor mixins

Browse Source
This commit is contained in:
dfsek 2022-06-16 16:17:12 -07:00
parent c96e908a1e
commit 01ba75a29b
36 changed files with 72 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,8 @@ import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper;
import com.dfsek.terra.api.world.info.WorldProperties; import com.dfsek.terra.api.world.info.WorldProperties;
import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions; import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
import com.dfsek.terra.fabric.data.Codecs; import com.dfsek.terra.fabric.data.Codecs;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder; import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.mixin.access.ChunkRegionAccessor; import com.dfsek.terra.fabric.mixin.access.ChunkRegionAccessor;
import com.dfsek.terra.fabric.mixin.access.StructureAccessorAccessor; import com.dfsek.terra.fabric.mixin.access.StructureAccessorAccessor;
import com.dfsek.terra.fabric.util.FabricAdapter; import com.dfsek.terra.fabric.util.FabricAdapter;

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/cache/ChunkRegionMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/cache/ChunkRegionMixin.java vendored
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.fabric.mixin.cache; package com.dfsek.terra.fabric.mixin.implementations.cache;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.chunk.Chunk;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder; import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.ChunkRegion; import net.minecraft.world.ChunkRegion;

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/cache/ProtoChunkMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/cache/ProtoChunkMixin.java vendored
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.mixin.cache; package com.dfsek.terra.fabric.mixin.implementations.cache;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder; import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import net.minecraft.world.chunk.ProtoChunk; import net.minecraft.world.chunk.ProtoChunk;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/compat/GenerationSettingsFloraFeaturesMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/compat/GenerationSettingsFloraFeaturesMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.compat; package com.dfsek.terra.fabric.mixin.implementations.compat;
import com.dfsek.terra.fabric.util.FloraFeatureHolder; import com.dfsek.terra.fabric.mixin_ifaces.FloraFeatureHolder;
import net.minecraft.world.biome.GenerationSettings; import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredFeature;

13
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/entity_holder/ProtoChunkMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity_holder/ProtoChunkMixin.java
View File

@ -1,16 +1,9 @@
package com.dfsek.terra.fabric.mixin.entity_holder; package com.dfsek.terra.fabric.mixin.implementations.entity_holder;
import com.dfsek.terra.fabric.entity.DelegateEntity; import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntity;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder; import com.dfsek.terra.fabric.mixin_ifaces.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.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.Implements;
import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Interface;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations; package com.dfsek.terra.fabric.mixin.implementations.terra;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

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

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.mixin.implementations; package com.dfsek.terra.fabric.mixin.implementations.terra;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/block/BlockMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.block; package com.dfsek.terra.fabric.mixin.implementations.terra.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.block.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Interface;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.block.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import net.minecraft.block.entity.LootableContainerBlockEntity; import net.minecraft.block.entity.LootableContainerBlockEntity;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.block.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.block.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.text.Text; import net.minecraft.text.Text;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/BlockStateMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/block/state/BlockStateMixin.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.mixin.implementations.block.state; package com.dfsek.terra.fabric.mixin.implementations.terra.block.state;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/PropertyMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/block/state/PropertyMixin.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.mixin.implementations.block.state; package com.dfsek.terra.fabric.mixin.implementations.terra.block.state;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.chunk; package com.dfsek.terra.fabric.mixin.implementations.terra.chunk;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkRegion; import net.minecraft.world.ChunkRegion;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/chunk/WorldChunkMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.chunk; package com.dfsek.terra.fabric.mixin.implementations.terra.chunk;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.chunk.WorldChunk; import net.minecraft.world.chunk.WorldChunk;

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/chunk/data/ProtoChunkMixin.java
View File

@ -15,12 +15,10 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.chunk.data; package com.dfsek.terra.fabric.mixin.implementations.terra.chunk.data;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.ProtoChunk; import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.HeightLimitView; import net.minecraft.world.HeightLimitView;

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

@ -15,18 +15,15 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Interface;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import java.util.UUID;
import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.fabric.util.FabricAdapter; import com.dfsek.terra.fabric.util.FabricAdapter;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.entity; package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/LockableContainerBlockEntityMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/inventory/LockableContainerBlockEntityMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.inventory; package com.dfsek.terra.fabric.mixin.implementations.terra.inventory;
import net.minecraft.block.entity.LockableContainerBlockEntity; import net.minecraft.block.entity.LockableContainerBlockEntity;
import net.minecraft.item.Items; import net.minecraft.item.Items;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/item/ItemMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/inventory/item/ItemMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.inventory.item; package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.item;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/item/ItemStackMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/inventory/item/ItemStackMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.inventory.item; package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/EnchantmentMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/inventory/meta/EnchantmentMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.inventory.meta; package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.meta;
import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantment;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/ItemStackDamageableMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/inventory/meta/ItemStackDamageableMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.inventory.meta; package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.meta;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Implements;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/ItemStackMetaMixin.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java
View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.inventory.meta; package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.meta;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/package-info.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/terra/package-info.java
View File

@ -20,4 +20,4 @@
* interfaces in Minecraft classes. * interfaces in Minecraft classes.
*/ */
package com.dfsek.terra.fabric.mixin.implementations; package com.dfsek.terra.fabric.mixin.implementations.terra;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.world; package com.dfsek.terra.fabric.mixin.implementations.terra.world;
import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.entity.BlockEntity;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
@ -28,9 +28,9 @@ import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; 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.ChunkGenerator;
import com.dfsek.terra.api.world.chunk.generation.ProtoWorld; import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
import com.dfsek.terra.fabric.entity.DelegateEntity; import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntity;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder; import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder; import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
import com.dfsek.terra.fabric.generation.TerraBiomeSource; import com.dfsek.terra.fabric.generation.TerraBiomeSource;
import com.dfsek.terra.fabric.util.FabricUtil; import com.dfsek.terra.fabric.util.FabricUtil;
@ -49,7 +49,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.ArrayList;
import java.util.List; import java.util.List;

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

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>. * along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.dfsek.terra.fabric.mixin.implementations.world; package com.dfsek.terra.fabric.mixin.implementations.terra.world;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldAccess;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/BiomeProviderHolder.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin_ifaces/BiomeProviderHolder.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.generation; package com.dfsek.terra.fabric.mixin_ifaces;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FloraFeatureHolder.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin_ifaces/FloraFeatureHolder.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.util; package com.dfsek.terra.fabric.mixin_ifaces;
import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredFeature;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/entity/DelegateEntity.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin_ifaces/entity/DelegateEntity.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.entity; package com.dfsek.terra.fabric.mixin_ifaces.entity;
import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.Entity;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/entity/DelegateEntityHolder.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin_ifaces/entity/DelegateEntityHolder.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.entity; package com.dfsek.terra.fabric.mixin_ifaces.entity;
import java.util.List; import java.util.List;

1
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/BiomeUtil.java
View File

@ -6,6 +6,7 @@ import com.dfsek.terra.fabric.FabricEntryPoint;
import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions; import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
import com.dfsek.terra.fabric.config.VanillaBiomeProperties; import com.dfsek.terra.fabric.config.VanillaBiomeProperties;
import com.dfsek.terra.fabric.mixin_ifaces.FloraFeatureHolder;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;

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

@ -8,35 +8,35 @@
"access.MobSpawnerLogicAccessor", "access.MobSpawnerLogicAccessor",
"access.StateAccessor", "access.StateAccessor",
"access.StructureAccessorAccessor", "access.StructureAccessorAccessor",
"cache.ChunkRegionMixin", "implementations.cache.ChunkRegionMixin",
"cache.ProtoChunkMixin", "implementations.cache.ProtoChunkMixin",
"compat.GenerationSettingsFloraFeaturesMixin", "implementations.compat.GenerationSettingsFloraFeaturesMixin",
"entity_holder.ProtoChunkMixin", "implementations.entity_holder.ProtoChunkMixin",
"fix.NetherFossilOptimization", "fix.NetherFossilOptimization",
"implementations.BiomeMixin", "implementations.terra.BiomeMixin",
"implementations.HandleImplementationMixin", "implementations.terra.HandleImplementationMixin",
"implementations.block.BlockMixin", "implementations.terra.block.BlockMixin",
"implementations.block.entity.BlockEntityMixin", "implementations.terra.block.entity.BlockEntityMixin",
"implementations.block.entity.LootableContainerBlockEntityMixin", "implementations.terra.block.entity.LootableContainerBlockEntityMixin",
"implementations.block.entity.MobSpawnerBlockEntityMixin", "implementations.terra.block.entity.MobSpawnerBlockEntityMixin",
"implementations.block.entity.SignBlockEntityMixin", "implementations.terra.block.entity.SignBlockEntityMixin",
"implementations.block.state.BlockStateMixin", "implementations.terra.block.state.BlockStateMixin",
"implementations.block.state.PropertyMixin", "implementations.terra.block.state.PropertyMixin",
"implementations.chunk.ChunkRegionMixin", "implementations.terra.chunk.ChunkRegionMixin",
"implementations.chunk.WorldChunkMixin", "implementations.terra.chunk.WorldChunkMixin",
"implementations.chunk.data.ProtoChunkMixin", "implementations.terra.chunk.data.ProtoChunkMixin",
"implementations.entity.EntityMixin", "implementations.terra.entity.EntityMixin",
"implementations.entity.EntityTypeMixin", "implementations.terra.entity.EntityTypeMixin",
"implementations.entity.PlayerEntityMixin", "implementations.terra.entity.PlayerEntityMixin",
"implementations.entity.ServerCommandSourceMixin", "implementations.terra.entity.ServerCommandSourceMixin",
"implementations.inventory.LockableContainerBlockEntityMixin", "implementations.terra.inventory.LockableContainerBlockEntityMixin",
"implementations.inventory.item.ItemMixin", "implementations.terra.inventory.item.ItemMixin",
"implementations.inventory.item.ItemStackMixin", "implementations.terra.inventory.item.ItemStackMixin",
"implementations.inventory.meta.EnchantmentMixin", "implementations.terra.inventory.meta.EnchantmentMixin",
"implementations.inventory.meta.ItemStackDamageableMixin", "implementations.terra.inventory.meta.ItemStackDamageableMixin",
"implementations.inventory.meta.ItemStackMetaMixin", "implementations.terra.inventory.meta.ItemStackMetaMixin",
"implementations.world.ChunkRegionMixin", "implementations.terra.world.ChunkRegionMixin",
"implementations.world.ServerWorldMixin", "implementations.terra.world.ServerWorldMixin",
"lifecycle.DataPackContentsMixin", "lifecycle.DataPackContentsMixin",
"lifecycle.MinecraftServerMixin", "lifecycle.MinecraftServerMixin",
"lifecycle.NoiseConfigMixin", "lifecycle.NoiseConfigMixin",