Various Fixes

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 {

src/main/java/org/embeddedt/archaicfix/helpers/BuiltInResourcePack.java

@@ -14,7 +14,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import cpw.mods.fml.relauncher.ReflectionHelper;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 
 import com.google.common.base.Splitter;
@@ -100,8 +99,7 @@ public BuiltInResourcePack setEnabled(boolean enabled) {
 
     @SuppressWarnings("unchecked")
     private static void inject(IResourcePack resourcePack) {
-        List defaultResourcePacks = ReflectionHelper.getPrivateValue(Minecraft.class, Minecraft.getMinecraft(), "defaultResourcePacks", "field_110449_ao");
-        defaultResourcePacks.add(resourcePack);
+        Minecraft.getMinecraft().defaultResourcePacks.add(resourcePack);
         IResourceManager resMan = Minecraft.getMinecraft().getResourceManager();
         if(resMan instanceof SimpleReloadableResourceManager) {
             ((SimpleReloadableResourceManager)resMan).reloadResourcePack(resourcePack);

src/main/java/org/embeddedt/archaicfix/helpers/DragonAPIHelper.java

@@ -2,7 +2,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 

src/main/java/org/embeddedt/archaicfix/helpers/OreDictIterator.java

@@ -1,6 +1,5 @@
 package org.embeddedt.archaicfix.helpers;
 
-import gnu.trove.map.hash.TIntObjectHashMap;
 import lombok.var;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/org/embeddedt/archaicfix/helpers/SoundDeviceThread.java

@@ -1,8 +1,6 @@
 package org.embeddedt.archaicfix.helpers;
 
-import cpw.mods.fml.relauncher.ReflectionHelper;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.audio.SoundManager;
 import net.minecraft.client.renderer.GLAllocation;
 import org.embeddedt.archaicfix.ArchaicLogger;
@@ -35,9 +33,9 @@ private boolean isDisconnected(ALCdevice device) {
     public void run() {
         try {
             String previousDefault = null;
-            SoundManager manager = ReflectionHelper.getPrivateValue(SoundHandler.class, Minecraft.getMinecraft().getSoundHandler(), "sndManager", "field_147694_f");
+            SoundManager manager = Minecraft.getMinecraft().getSoundHandler().sndManager;
             while(!Thread.interrupted()) {
-                boolean managerLoaded = ReflectionHelper.getPrivateValue(SoundManager.class, manager, "loaded", "field_148617_f");
+                boolean managerLoaded = manager.loaded;
                 if(managerLoaded && !ClientProxy.soundSystemReloadLock) {
                     if(previousDefault == null) {
                         previousDefault = getDefault();

src/main/java/org/embeddedt/archaicfix/helpers/WorldRendererDistanceHelper.java

@@ -1,9 +1,7 @@
 package org.embeddedt.archaicfix.helpers;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.entity.Entity;
-import org.embeddedt.archaicfix.config.ArchaicConfig;
 
 public class WorldRendererDistanceHelper {
     /**

src/main/java/org/embeddedt/archaicfix/lighting/world/lighting/LightingEngine.java

@@ -536,8 +536,6 @@ private static long encodeWorldCoord(final long x, final long y, final long z) {
         return (y << sY) | (x + (1 << lX - 1) << sX) | (z + (1 << lZ - 1) << sZ);
     }
 
-    private static int ITEMS_PROCESSED = 0, CHUNKS_FETCHED = 0;
-
     /**
      * Polls a new item from <code>curQueue</code> and fills in state data members
      *
@@ -561,11 +559,8 @@ private boolean nextItem() {
         if (this.curChunkIdentifier != chunkIdentifier) {
             this.curChunk = this.getChunk(this.curPos);
             this.curChunkIdentifier = chunkIdentifier;
-            CHUNKS_FETCHED++;
         }
 
-        ITEMS_PROCESSED++;
-
         return true;
     }
 

src/main/java/org/embeddedt/archaicfix/mixins/client/aoa/MixinProjectileEntities.java

@@ -1,6 +1,6 @@
 package org.embeddedt.archaicfix.mixins.client.aoa;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import net.minecraft.client.particle.EffectRenderer;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.entity.projectile.EntityThrowable;

src/main/java/org/embeddedt/archaicfix/mixins/client/core/AccessorSplashProgress.java

@@ -1,12 +1,11 @@
 package org.embeddedt.archaicfix.mixins.client.core;
 
 import cpw.mods.fml.client.SplashProgress;
-import net.minecraft.client.gui.FontRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(SplashProgress.class)
+@SuppressWarnings("deprecation")
+@Mixin(value = SplashProgress.class, remap = false)
 public interface AccessorSplashProgress {
     @Accessor("barBorderColor")
     static int getBarBorderColor() {

src/main/java/org/embeddedt/archaicfix/mixins/client/core/MixinGuiBeaconButton.java

@@ -1,7 +1,6 @@
 package org.embeddedt.archaicfix.mixins.client.core;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiBeacon;
 import net.minecraft.client.renderer.OpenGlHelper;
 import org.lwjgl.opengl.GL11;
 import org.spongepowered.asm.mixin.Mixin;
@@ -14,7 +13,7 @@ public class MixinGuiBeaconButton {
     /**
      * Make transparent beacon buttons look right (e.g. with Modernity).
      */
-    @Inject(method = "func_146112_a", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/inventory/GuiBeacon$Button;func_73729_b(IIIIII)V", ordinal = 1), require = 0)
+    @Inject(method = "drawButton", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/inventory/GuiBeacon$Button;drawTexturedModalRect(IIIIII)V", ordinal = 1), require = 0)
     private void enableTransparency(Minecraft p_146112_1_, int p_146112_2_, int p_146112_3_, CallbackInfo ci) {
         GL11.glEnable(GL11.GL_BLEND);
         OpenGlHelper.glBlendFunc(770, 771, 1, 0);

src/main/java/org/embeddedt/archaicfix/mixins/client/core/MixinGuiCreateWorld.java

@@ -6,7 +6,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(GuiCreateWorld.class)
 public class MixinGuiCreateWorld {

src/main/java/org/embeddedt/archaicfix/mixins/client/core/MixinMinecraft.java

@@ -15,7 +15,9 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(Minecraft.class)
+// run after https://github.com/GTNewHorizons/Angelica/blob/master/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinMinecraft.java
+// to allow the getFancyGrass mixin to fail silently
+@Mixin(value = Minecraft.class, priority = 999)
 public abstract class MixinMinecraft {
     @Shadow private IntegratedServer theIntegratedServer;
 
@@ -28,7 +30,7 @@ public abstract class MixinMinecraft {
     @Shadow private boolean fullscreen;
 
     /** @reason Makes grass display as fancy regardless of the graphics setting. Matches the appearance of 1.8+ */
-    @Redirect(method = "runGameLoop", at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z"))
+    @Redirect(method = "runGameLoop", at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z"), expect = 0)
     private boolean getFancyGrass(GameSettings gameSettings) {
         return true;
     }

src/main/java/org/embeddedt/archaicfix/mixins/client/core/MixinSplashProgress.java

@@ -20,7 +20,8 @@
 
 import java.lang.reflect.Field;
 
-@Mixin(targets = { "cpw/mods/fml/client/SplashProgress$3" })
+@SuppressWarnings("deprecation")
+@Mixin(targets = { "cpw/mods/fml/client/SplashProgress$3" }, remap = false)
 public class MixinSplashProgress {
     private static final int memoryGoodColor = 0x78CB34;
     private static final int memoryWarnColor = 0xE6E84A;

src/main/java/org/embeddedt/archaicfix/mixins/client/divinerpg/MixinEntitySparkler.java

@@ -1,14 +1,11 @@
 package org.embeddedt.archaicfix.mixins.client.divinerpg;
 
 import net.divinerpg.entities.arcana.projectile.EntitySparkler;
-import net.divinerpg.entities.vanilla.projectile.EntitySparklerFX;
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.projectile.EntityThrowable;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(EntitySparkler.class)

src/main/java/org/embeddedt/archaicfix/mixins/client/journeymap/MixinTileDrawStep.java

@@ -8,7 +8,7 @@
 
 @Mixin(TileDrawStep.class)
 public class MixinTileDrawStep {
-    @Redirect(method = "*", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Ljourneymap/client/render/map/TileDrawStep;debug:Z"))
+    @Redirect(method = "*", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Ljourneymap/client/render/map/TileDrawStep;debug:Z"), remap = false)
     private boolean getDebug(TileDrawStep instance) {
         return false;
     }

src/main/java/org/embeddedt/archaicfix/mixins/client/lighting/MixinWorld.java

@@ -1,22 +1,18 @@
 package org.embeddedt.archaicfix.mixins.client.lighting;
 
-import net.minecraft.block.Block;
 import net.minecraft.world.EnumSkyBlock;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import org.embeddedt.archaicfix.lighting.world.lighting.LightingEngine;
 import org.embeddedt.archaicfix.lighting.world.lighting.LightingHooks;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(World.class)
 public abstract class MixinWorld {
-    @Shadow public abstract Block getBlock(int p_147439_1_, int p_147439_2_, int p_147439_3_);
 
     private LightingEngine lightingEngine;
 

src/main/java/org/embeddedt/archaicfix/mixins/client/renderdistance/MixinGameSettings.java

@@ -1,7 +1,6 @@
 package org.embeddedt.archaicfix.mixins.client.renderdistance;
 
 import net.minecraft.client.settings.GameSettings;
-import org.embeddedt.archaicfix.ArchaicFix;
 import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;

src/main/java/org/embeddedt/archaicfix/mixins/client/renderdistance/MixinRenderGlobal.java

@@ -1,22 +1,16 @@
 package org.embeddedt.archaicfix.mixins.client.renderdistance;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.renderer.RenderList;
-import org.embeddedt.archaicfix.ArchaicFix;
 import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.nio.Buffer;
-import java.nio.IntBuffer;
-
 @Mixin(value = RenderGlobal.class, priority = -10)
 public class MixinRenderGlobal {
     @Shadow private RenderList[] allRenderLists;

src/main/java/org/embeddedt/archaicfix/mixins/common/am2/MixinPlayerTracker.java

@@ -1,13 +1,9 @@
 package org.embeddedt.archaicfix.mixins.common.am2;
 
 import am2.PlayerTracker;
-import net.minecraft.client.settings.GameSettings;
-import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(value=PlayerTracker.class, remap=false)
 public class MixinPlayerTracker {

src/main/java/org/embeddedt/archaicfix/mixins/common/chickenchunks/MixinPlayerChunkViewerManager.java

@@ -16,6 +16,7 @@ public class MixinPlayerChunkViewerManager {
 
     private ArrayList<PlayerChunkViewerManager.TicketChange> oldTicketChanges;
 
+    @SuppressWarnings("unchecked")
     @Redirect(method = "update", at = @At(value = "INVOKE", target = "Ljava/util/LinkedList;iterator()Ljava/util/Iterator;"), remap = false)
     private Iterator<?> getSafeIterator(LinkedList<?> list) {
         if(list == this.ticketChanges) {

src/main/java/org/embeddedt/archaicfix/mixins/common/core/MixinAxisAlignedBB.java

@@ -8,7 +8,6 @@
 @Mixin(AxisAlignedBB.class)
 public class MixinAxisAlignedBB {
     private final double XZ_MARGIN = 1E-6;
-    private final double Y_MARGIN = 0.000000001;
 
     @ModifyVariable(method = "calculateXOffset", at = @At(value = "STORE", ordinal = 0), index = 2, argsOnly = true)
     private double subXMargin(double old) {

src/main/java/org/embeddedt/archaicfix/mixins/common/core/MixinChunk.java

@@ -23,12 +23,6 @@ public abstract class MixinChunk implements ICascadeDetectionChunk {
     @Shadow @Final private List<Entity>[] entityLists;
     @Shadow @Final private World worldObj;
 
-    @Shadow @Final public int xPosition;
-
-    @Shadow @Final public int zPosition;
-
-    @Shadow public Map chunkTileEntityMap;
-
     @Shadow
     protected abstract void populateChunk(IChunkProvider provider1, IChunkProvider provider2, int x, int z);