rename mixins for mojmap

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/AbstractSpawnerAccessor.java

@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(AbstractSpawner.class)
-public interface MobSpawnerLogicAccessor {
+public interface AbstractSpawnerAccessor {
     @Invoker("getEntityId")
     ResourceLocation callGetEntityId();
 }

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ConfiguredFeatureMixin.java

@@ -26,9 +26,9 @@ public abstract class ConfiguredFeatureMixin {
     @SuppressWarnings({"try"})
     public boolean terra$plant(Location l, Random r) {
         try(ProfileFrame ignore = TerraForgePlugin.getInstance().getProfiler().profile("forge_tree")) {
-            ISeedReader fabricWorldAccess = ((ISeedReader) l.getWorld());
+            ISeedReader world = ((ISeedReader) l.getWorld());
             ChunkGenerator generatorWrapper = (ChunkGenerator) l.getWorld().getGenerator();
-            return place(fabricWorldAccess, generatorWrapper, r, new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()));
+            return place(world, generatorWrapper, r, new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()));
         }
     }
 

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java

@@ -17,7 +17,7 @@ import javax.annotation.Nullable;
 
 @Mixin(TileEntity.class)
 @Implements(@Interface(iface = BlockState.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class BlockEntityMixin {
+public abstract class TileEntityMixin {
     @Shadow
     protected BlockPos worldPosition;
 

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.forge.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.forge.mixin.implementations.block.BlockEntityMixin;
+import com.dfsek.terra.forge.mixin.implementations.block.TileEntityMixin;
 import net.minecraft.tileentity.LockableLootTileEntity;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(LockableLootTileEntity.class)
 @Implements(@Interface(iface = Container.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class LootableContainerBlockEntityMixin extends BlockEntityMixin {
+public abstract class LockableLootTileEntityMixin extends TileEntityMixin {
     public Inventory terra$getInventory() {
         return (Inventory) this;
     }

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java

@@ -4,8 +4,8 @@ import com.dfsek.terra.api.platform.block.state.MobSpawner;
 import com.dfsek.terra.api.platform.block.state.SerialState;
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.forge.TerraForgePlugin;
-import com.dfsek.terra.forge.mixin.access.MobSpawnerLogicAccessor;
-import com.dfsek.terra.forge.mixin.implementations.block.BlockEntityMixin;
+import com.dfsek.terra.forge.mixin.access.AbstractSpawnerAccessor;
+import com.dfsek.terra.forge.mixin.implementations.block.TileEntityMixin;
 import net.minecraft.tileentity.MobSpawnerTileEntity;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.spawner.AbstractSpawner;
@@ -17,12 +17,12 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(MobSpawnerTileEntity.class)
 @Implements(@Interface(iface = MobSpawner.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class MobSpawnerBlockEntityMixin extends BlockEntityMixin {
+public abstract class MobSpawnerTileEntityMixin extends TileEntityMixin {
     @Shadow
     public abstract AbstractSpawner getSpawner();
 
     public EntityType terra$getSpawnedType() {
-        return (EntityType) Registry.ENTITY_TYPE.get(((MobSpawnerLogicAccessor) getSpawner()).callGetEntityId());
+        return (EntityType) Registry.ENTITY_TYPE.get(((AbstractSpawnerAccessor) getSpawner()).callGetEntityId());
     }
 
     public void terra$setSpawnedType(@NotNull EntityType creatureType) {

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java

@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(SignTileEntity.class)
 @Implements(@Interface(iface = Sign.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class SignBlockEntityMixin {
+public abstract class SignTileEntityMixin {
     @Shadow
     @Final
     private ITextComponent[] messages;

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java

@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(net.minecraft.world.chunk.Chunk.class)
 @Implements(@Interface(iface = Chunk.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class WorldChunkMixin {
+public abstract class ChunkMixin {
 
     @Shadow
     @Final

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java

@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(WorldGenRegion.class)
 @Implements(@Interface(iface = Chunk.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class ChunkRegionMixin {
+public abstract class WorldGenRegionMixin {
     @Final
     @Shadow
     private int x;

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java

@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(ChunkPrimer.class)
 @Implements(@Interface(iface = ChunkData.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class ProtoChunkMixin {
+public abstract class ChunkPrimerMixin {
     @Shadow
     public abstract BlockState getBlockState(BlockPos pos);
 

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/CommandSourceMixin.java

@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(CommandSource.class)
 @Implements(@Interface(iface = CommandSender.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class ServerCommandSourceMixin {
+public abstract class CommandSourceMixin {
     @Shadow
     public abstract void sendSuccess(ITextComponent p_197030_1_, boolean p_197030_2_);
 

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/LockableTileEntityMixin.java

@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(LockableTileEntity.class)
 @Implements(@Interface(iface = Inventory.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public class LockableContainerBlockEntityMixin {
+public class LockableTileEntityMixin {
     public Object terra$getHandle() {
         return this;
     }

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

@@ -71,11 +71,11 @@ public abstract class ServerWorldMixin {
     }
 
     /**
-     * Overridden in the same manner as {@link ChunkRegionMixin#hashCode()}
+     * Overridden in the same manner as {@link WorldGenRegionMixin#hashCode()}
      *
      * @param other Another object
      * @return Whether this world is the same as other.
-     * @see ChunkRegionMixin#hashCode()
+     * @see WorldGenRegionMixin#hashCode()
      */
     @SuppressWarnings("ConstantConditions")
     @Override

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/WorldGenRegionMixin.java

@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(WorldGenRegion.class)
 @Implements(@Interface(iface = World.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class ChunkRegionMixin {
+public abstract class WorldGenRegionMixin {
     @Shadow
     @Final
     private ServerWorld level;

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

@@ -4,30 +4,30 @@
   "compatibilityLevel": "JAVA_8",
   "refmap": "terra-refmap.json",
   "mixins": [
-    "access.MobSpawnerLogicAccessor",
+    "access.AbstractSpawnerAccessor",
     "implementations.BiomeMixin",
     "implementations.ChunkGeneratorMixin",
     "implementations.ConfiguredFeatureMixin",
-    "implementations.block.BlockEntityMixin",
     "implementations.block.BlockMixin",
-    "implementations.block.state.LootableContainerBlockEntityMixin",
-    "implementations.block.state.MobSpawnerBlockEntityMixin",
-    "implementations.block.state.SignBlockEntityMixin",
-    "implementations.chunk.ChunkRegionMixin",
-    "implementations.chunk.WorldChunkMixin",
-    "implementations.chunk.data.ProtoChunkMixin",
+    "implementations.block.TileEntityMixin",
+    "implementations.block.state.LockableLootTileEntityMixin",
+    "implementations.block.state.MobSpawnerTileEntityMixin",
+    "implementations.block.state.SignTileEntityMixin",
+    "implementations.chunk.ChunkMixin",
+    "implementations.chunk.WorldGenRegionMixin",
+    "implementations.chunk.data.ChunkPrimerMixin",
+    "implementations.entity.CommandSourceMixin",
     "implementations.entity.EntityMixin",
     "implementations.entity.EntityTypeMixin",
     "implementations.entity.PlayerEntityMixin",
-    "implementations.entity.ServerCommandSourceMixin",
-    "implementations.inventory.LockableContainerBlockEntityMixin",
+    "implementations.inventory.LockableTileEntityMixin",
     "implementations.inventory.item.ItemMixin",
     "implementations.inventory.item.ItemStackMixin",
     "implementations.inventory.meta.EnchantmentMixin",
     "implementations.inventory.meta.ItemStackDamageableMixin",
     "implementations.inventory.meta.ItemStackMetaMixin",
-    "implementations.world.ChunkRegionMixin",
-    "implementations.world.ServerWorldMixin"
+    "implementations.world.ServerWorldMixin",
+    "implementations.world.WorldGenRegionMixin"
   ],
   "client": [
   ],