Various cleanups (#136)

Author: glowredman

dependencies.gradle

@@ -34,6 +34,7 @@ dependencies {
     compileOnly(deobfMaven(curseMaven, "curse.maven:divinerpg-363543:2918948"))
     compileOnly(deobfMaven(curseMaven, "curse.maven:journeymap-32274:2367915"))
     compileOnly(deobfMaven(curseMaven, "curse.maven:ars-magica-2-67313:2280862"))
+    compileOnly(deobfMaven(curseMaven, "curse.maven:waystones-245755:2559125"))
     runtimeOnly(deobf("https://github.com/makamys/CoreTweaks/releases/download/0.3.0.4/CoreTweaks-1.7.10-0.3.0.4+nomixin.jar"))
 
     if(!Boolean.valueOf(project.properties["archaicFix.noRuntimeExtras"] ?: "false")) {

src/main/java/org/embeddedt/archaicfix/ArchaicFix.java

@@ -9,7 +9,6 @@
 import cpw.mods.fml.common.network.NetworkCheckHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
-import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.crafting.CraftingManager;
@@ -55,9 +54,8 @@ public void onConstruct(FMLConstructionEvent event) {
     @EventHandler
     public void preinit(FMLPreInitializationEvent event)
     {
-        int nextID = ReflectionHelper.getPrivateValue(Entity.class, null, "field_70152_a", "nextEntityID");
-        if(nextID == 0) {
-            ReflectionHelper.setPrivateValue(Entity.class, null, 1, "field_70152_a", "nextEntityID");
+        if(Entity.nextEntityID == 0) {
+            Entity.nextEntityID = 1;
             ArchaicLogger.LOGGER.info("Fixed MC-111480");
         }
         if(ArchaicConfig.enableHitThroughGrassFix) {

src/main/java/org/embeddedt/archaicfix/CommandDebugUpdateQueue.java

@@ -1,7 +1,6 @@
 package org.embeddedt.archaicfix;
 
 import com.mojang.realmsclient.gui.ChatFormatting;
-import cpw.mods.fml.relauncher.ReflectionHelper;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.server.MinecraftServer;
@@ -28,7 +27,8 @@ public void processCommand(ICommandSender sender, String[] p_71515_2_) {
         if(server != null) {
             sender.addChatMessage(new ChatComponentText("Update queue sizes:"));
             for(WorldServer world : server.worldServers) {
-                TreeSet<NextTickListEntry> ticks = ReflectionHelper.getPrivateValue(WorldServer.class, world, "field_73065_O", "pendingTickListEntriesTreeSet");
+                @SuppressWarnings("unchecked")
+                TreeSet<NextTickListEntry> ticks = world.pendingTickListEntriesTreeSet;
                 if(ticks.size() > 0)
                     sender.addChatMessage(new ChatComponentText("Dimension " + world.provider.dimensionId + ": " + ticks.size()));
             }

src/main/java/org/embeddedt/archaicfix/FixHelper.java

@@ -56,7 +56,7 @@ public void onClientConnect(FMLNetworkEvent.ClientConnectedToServerEvent event)
     }
 
     @SubscribeEvent
-    public void onNetworkRegister(FMLNetworkEvent.CustomPacketRegistrationEvent event) {
+    public void onNetworkRegister(FMLNetworkEvent.CustomPacketRegistrationEvent<?> event) {
         if(event.operation.equals("REGISTER")) {
             boolean hasArchaic = event.registrations.contains("archaicfix");
             if(event.handler instanceof NetHandlerPlayServer) {

src/main/java/org/embeddedt/archaicfix/LeftClickEventHandler.java

@@ -11,7 +11,6 @@
 import net.minecraft.world.World;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
 public final class LeftClickEventHandler {

src/main/java/org/embeddedt/archaicfix/asm/TargetedMod.java

@@ -4,8 +4,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.function.Predicate;
-
 @RequiredArgsConstructor
 public enum TargetedMod {
     CHICKENCHUNKS("ChickenChunks", "ChickenChunks"),

src/main/java/org/embeddedt/archaicfix/block/ThreadedBlockData.java

@@ -1,7 +1,5 @@
 package org.embeddedt.archaicfix.block;
 
-import net.minecraft.block.Block;
-
 public class ThreadedBlockData {
     public double minX = 0;
     public double minY = 0;

src/main/java/org/embeddedt/archaicfix/config/ArchaicGuiConfig.java

@@ -1,7 +1,6 @@
 package org.embeddedt.archaicfix.config;
 
 import net.minecraft.client.gui.GuiScreen;
-import org.embeddedt.archaicfix.Tags;
 
 import static org.embeddedt.archaicfix.ArchaicFix.MODID;
 import static org.embeddedt.archaicfix.ArchaicFix.MODNAME;

src/main/java/org/embeddedt/archaicfix/config/ConfigException.java

@@ -5,6 +5,8 @@
  */
 public class ConfigException extends Exception {
 
+    private static final long serialVersionUID = 1038100965627501494L;
+
     public ConfigException(String message) {
         super(message);
     }

src/main/java/org/embeddedt/archaicfix/ducks/IAcceleratedRecipe.java

@@ -2,7 +2,6 @@
 
 import net.minecraft.item.Item;
 
-import java.util.Collection;
 import java.util.Set;
 
 public interface IAcceleratedRecipe {