diff --git a/src/main/java/com/colen/postea/Postea.java b/src/main/java/com/colen/postea/Postea.java index 18f90b8..ed3ec6a 100644 --- a/src/main/java/com/colen/postea/Postea.java +++ b/src/main/java/com/colen/postea/Postea.java @@ -8,7 +8,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; public class Postea { @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - } + public void preInit(FMLPreInitializationEvent event) {} } diff --git a/src/main/java/com/colen/postea/Utility/ChunkFixerUtility.java b/src/main/java/com/colen/postea/Utility/ChunkFixerUtility.java index 4ad6cbd..e484d9e 100644 --- a/src/main/java/com/colen/postea/Utility/ChunkFixerUtility.java +++ b/src/main/java/com/colen/postea/Utility/ChunkFixerUtility.java @@ -1,5 +1,7 @@ package com.colen.postea.Utility; +import static com.colen.postea.Utility.PosteaUtilities.getModListHash; + import java.util.ArrayList; import java.util.List; import java.util.function.BiFunction; @@ -16,8 +18,6 @@ import com.colen.postea.API.TileEntityReplacementManager; import akka.japi.Pair; import cpw.mods.fml.common.registry.GameRegistry; -import static com.colen.postea.Utility.PosteaUtilities.getModListHash; - public class ChunkFixerUtility { public static void processChunkNBT(NBTTagCompound compound, World world) { @@ -98,7 +98,9 @@ public class ChunkFixerUtility { private static void transformTileEntities(NBTTagCompound levelCompoundTag, World world) { - Pair, NBTTagList> output = adjustTileEntities(levelCompoundTag.getTagList("TileEntities", 10), world); + Pair, NBTTagList> output = adjustTileEntities( + levelCompoundTag.getTagList("TileEntities", 10), + world); List conversionInfoList = output.first(); NBTTagList tileEntities = output.second(); diff --git a/src/main/java/com/colen/postea/Utility/PosteaUtilities.java b/src/main/java/com/colen/postea/Utility/PosteaUtilities.java index 815b3fa..ee1951f 100644 --- a/src/main/java/com/colen/postea/Utility/PosteaUtilities.java +++ b/src/main/java/com/colen/postea/Utility/PosteaUtilities.java @@ -1,14 +1,14 @@ package com.colen.postea.Utility; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; +import java.util.ArrayList; +import java.util.Collections; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Objects; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; public abstract class PosteaUtilities { @@ -29,7 +29,6 @@ public abstract class PosteaUtilities { return tagCompound; } - public static int getModListHash() { // We iterate over every mod, get its version and put it into a giant list. @@ -38,7 +37,8 @@ public abstract class PosteaUtilities { ArrayList modList = new ArrayList<>(); - for (ModContainer mod : Loader.instance().getActiveModList()) { + for (ModContainer mod : Loader.instance() + .getActiveModList()) { modList.add(mod.getModId() + ":" + mod.getVersion()); } @@ -65,5 +65,4 @@ public abstract class PosteaUtilities { } } - } diff --git a/src/main/java/com/colen/postea/mixins/early/MixinAnvilChunkLoader.java b/src/main/java/com/colen/postea/mixins/early/MixinAnvilChunkLoader.java index 0fc865b..1f0dc8a 100644 --- a/src/main/java/com/colen/postea/mixins/early/MixinAnvilChunkLoader.java +++ b/src/main/java/com/colen/postea/mixins/early/MixinAnvilChunkLoader.java @@ -3,7 +3,6 @@ package com.colen.postea.mixins.early; import static com.colen.postea.Utility.ChunkFixerUtility.POSTEA_UPDATE_CODE; import static com.colen.postea.Utility.ChunkFixerUtility.processChunkNBT; -import com.colen.postea.mixins.interfaces.IChunkMixin; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -15,6 +14,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.colen.postea.mixins.interfaces.IChunkMixin; + @Mixin(AnvilChunkLoader.class) public abstract class MixinAnvilChunkLoader { diff --git a/src/main/java/com/colen/postea/mixins/early/MixinChunk.java b/src/main/java/com/colen/postea/mixins/early/MixinChunk.java index 54a03c9..d3fa83c 100644 --- a/src/main/java/com/colen/postea/mixins/early/MixinChunk.java +++ b/src/main/java/com/colen/postea/mixins/early/MixinChunk.java @@ -1,10 +1,12 @@ package com.colen.postea.mixins.early; -import com.colen.postea.mixins.interfaces.IChunkMixin; import net.minecraft.world.chunk.Chunk; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; +import com.colen.postea.mixins.interfaces.IChunkMixin; + @Mixin(Chunk.class) public class MixinChunk implements IChunkMixin { diff --git a/src/main/java/com/colen/postea/mixins/interfaces/IChunkMixin.java b/src/main/java/com/colen/postea/mixins/interfaces/IChunkMixin.java index 8add7c5..74915ee 100644 --- a/src/main/java/com/colen/postea/mixins/interfaces/IChunkMixin.java +++ b/src/main/java/com/colen/postea/mixins/interfaces/IChunkMixin.java @@ -1,6 +1,8 @@ package com.colen.postea.mixins.interfaces; public interface IChunkMixin { + long Postea$getPosteaCode(); + void Postea$setPosteaCode(long posteaID); }