refactor mixins

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/GeneratorOptionsMixin.java

@@ -22,7 +22,7 @@ import java.util.Properties;
 import java.util.Random;
 
 @Mixin(GeneratorOptions.class)
-public class MixinGeneratorOptions {
+public abstract class GeneratorOptionsMixin {
     @Inject(method = "fromProperties(Lnet/minecraft/util/registry/DynamicRegistryManager;Ljava/util/Properties;)Lnet/minecraft/world/gen/GeneratorOptions;", at = @At("HEAD"), cancellable = true)
     private static void fromProperties(DynamicRegistryManager dynamicRegistryManager, Properties properties, CallbackInfoReturnable<GeneratorOptions> cir) {
         if(properties.get("level-type") == null) {

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/BiomeMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.world;
+package com.dfsek.terra.fabric.mixin.implementations;
 
 import net.minecraft.world.biome.Biome;
 import org.spongepowered.asm.mixin.Implements;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ChunkGeneratorMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.world;
+package com.dfsek.terra.fabric.mixin.implementations;
 
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import org.spongepowered.asm.mixin.Implements;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockEntityMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.block;
+package com.dfsek.terra.fabric.mixin.implementations.block;
 
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/LootableContainerBlockEntityMixin.java

@@ -1,8 +1,9 @@
-package com.dfsek.terra.fabric.mixin.block;
+package com.dfsek.terra.fabric.mixin.implementations.block.state;
 
 import com.dfsek.terra.api.platform.block.state.Container;
 import com.dfsek.terra.api.platform.inventory.Inventory;
 import com.dfsek.terra.fabric.inventory.FabricInventory;
+import com.dfsek.terra.fabric.mixin.implementations.block.BlockEntityMixin;
 import net.minecraft.block.entity.LootableContainerBlockEntity;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.world;
+package com.dfsek.terra.fabric.mixin.implementations.chunk;
 
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.world;
+package com.dfsek.terra.fabric.mixin.implementations.chunk;
 
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.world;
+package com.dfsek.terra.fabric.mixin.implementations.chunk.data;
 
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.world.generator.ChunkData;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.entity;
+package com.dfsek.terra.fabric.mixin.implementations.entity;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.world.World;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityTypeMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.entity;
+package com.dfsek.terra.fabric.mixin.implementations.entity;
 
 import net.minecraft.entity.EntityType;
 import org.spongepowered.asm.mixin.Implements;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/PlayerEntityMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.entity;
+package com.dfsek.terra.fabric.mixin.implementations.entity;
 
 import com.dfsek.terra.api.platform.entity.Player;
 import net.minecraft.entity.player.PlayerEntity;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/ServerCommandSourceMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.entity;
+package com.dfsek.terra.fabric.mixin.implementations.entity;
 
 import com.dfsek.terra.api.platform.CommandSender;
 import net.minecraft.server.command.ServerCommandSource;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/item/ItemMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.inventory;
+package com.dfsek.terra.fabric.mixin.implementations.inventory.item;
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import net.minecraft.item.Item;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/item/ItemStackMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.inventory;
+package com.dfsek.terra.fabric.mixin.implementations.inventory.item;
 
 import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/EnchantmentMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.inventory;
+package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import net.minecraft.enchantment.Enchantment;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/ItemStackDamageableMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.inventory;
+package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;
 
 import com.dfsek.terra.api.platform.inventory.item.Damageable;
 import net.minecraft.item.ItemStack;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/ItemStackMetaMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.inventory;
+package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;
 
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.world;
+package com.dfsek.terra.fabric.mixin.implementations.world;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.Block;
@@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(ChunkRegion.class)
 @Implements(@Interface(iface = World.class, prefix = "terra$"))
-public abstract class ChunkRegionWorldMixin {
+public abstract class ChunkRegionMixin {
     @Shadow
     @Final
     private ServerWorld world;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.world;
+package com.dfsek.terra.fabric.mixin.implementations.world;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.Block;

platforms/fabric/src/main/resources/terra.mixins.json

@@ -4,25 +4,25 @@
   "package": "com.dfsek.terra.fabric.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "MixinGeneratorOptions",
+    "GeneratorOptionsMixin",
-    "block.BlockEntityMixin",
+    "implementations.block.BlockEntityMixin",
-    "block.LootableContainerBlockEntityMixin",
+    "implementations.block.state.LootableContainerBlockEntityMixin",
-    "entity.EntityMixin",
+    "implementations.entity.EntityMixin",
-    "entity.EntityTypeMixin",
+    "implementations.entity.EntityTypeMixin",
-    "entity.PlayerEntityMixin",
+    "implementations.entity.PlayerEntityMixin",
-    "entity.ServerCommandSourceMixin",
+    "implementations.entity.ServerCommandSourceMixin",
-    "inventory.EnchantmentMixin",
+    "implementations.inventory.meta.EnchantmentMixin",
-    "inventory.ItemMixin",
+    "implementations.inventory.item.ItemMixin",
-    "inventory.ItemStackDamageableMixin",
+    "implementations.inventory.meta.ItemStackDamageableMixin",
-    "inventory.ItemStackMetaMixin",
+    "implementations.inventory.meta.ItemStackMetaMixin",
-    "inventory.ItemStackMixin",
+    "implementations.inventory.item.ItemStackMixin",
-    "world.BiomeMixin",
+    "implementations.BiomeMixin",
-    "world.ChunkGeneratorMixin",
+    "implementations.ChunkGeneratorMixin",
-    "world.ChunkRegionMixin",
+    "implementations.chunk.ChunkRegionMixin",
-    "world.ChunkRegionWorldMixin",
+    "implementations.world.ChunkRegionMixin",
-    "world.ProtoChunkMixin",
+    "implementations.chunk.data.ProtoChunkMixin",
-    "world.ServerWorldMixin",
+    "implementations.world.ServerWorldMixin",
-    "world.WorldChunkMixin"
+    "implementations.chunk.WorldChunkMixin"
   ],
   "client": [
     "GeneratorTypeAccessor"