Revert all dynamic texture code

Author: kivattt

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinItemRenderer.java

@@ -1,8 +1,6 @@
 package com.fox2code.foxloader.client.mixins;
 
 import com.fox2code.foxloader.client.network.NetworkItemStack;
-import com.fox2code.foxloader.client.renderer.TextureDynamic;
-import com.fox2code.foxloader.loader.ClientMod;
 import com.fox2code.foxloader.registry.GameRegistryClient;
 import com.fox2code.foxloader.registry.RegisteredItem;
 import com.fox2code.foxloader.registry.RegisteredItemStack;
@@ -18,21 +16,17 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ItemStack.class)
-public abstract class MixinItemStack implements RegisteredItemStack,
-        NetworkItemStack, TextureDynamic.Hooks.TexCacheItemStackRender {
+public abstract class MixinItemStack implements RegisteredItemStack, NetworkItemStack {
     @Shadow public int itemID;
     @Shadow public int stackSize;
     @Shadow public int itemDamage;
     @Unique private int networkId;
-    @Unique private ItemStack renderCache;
 
     @Shadow public abstract Item getItem();
     @Shadow public abstract String getDisplayName();
     @Shadow public abstract void setItemName(String par1Str);
     @Shadow public abstract boolean hasDisplayName();
 
-    @Shadow public NBTTagCompound nbtTagCompound;
-
     @Inject(method = "<init>(II)V", at = @At("RETURN"))
     public void onNewItemStack(int id, int count, CallbackInfo ci) {
         this.verifyRegisteredItemStack();
@@ -51,7 +45,6 @@ public void onNewItemStack(int id, int count, int damage, NBTTagCompound tagComp
     @Inject(method = "readFromNBT", at = @At("RETURN"))
     public void onReadFromNBT(NBTTagCompound nbtTagCompound, CallbackInfo ci) {
         this.verifyRegisteredItemStack();
-        this.renderCache = null;
     }
 
     @Inject(method = "splitStack", at = @At("RETURN"))
@@ -99,28 +92,6 @@ public void setRegisteredDisplayName(String displayName) {
         this.setItemName(displayName);
     }
 
-    @Override
-    public int getRegisteredDynamicTextureId() {
-        NBTTagCompound nbtTagCompound = this.nbtTagCompound;
-        return nbtTagCompound == null || // Avoid NPEs here
-                !nbtTagCompound.hasKey("DynamicTextureId") ? -1 :
-                nbtTagCompound.getByte("DynamicTextureId");
-    }
-
-    @Override
-    public void setRegisteredDynamicTextureId(int dynamicTextureSlot) {
-        NBTTagCompound nbtTagCompound = this.nbtTagCompound;
-        if (dynamicTextureSlot == -1) {
-            if (nbtTagCompound != null)
-                nbtTagCompound.removeTag("DynamicTextureId");
-            return;
-        }
-        if (nbtTagCompound == null) {
-            this.nbtTagCompound = nbtTagCompound = new NBTTagCompound();
-        }
-        nbtTagCompound.setByte("DynamicTextureId", (byte) dynamicTextureSlot);
-    }
-
     @Override
     public int getRemoteItemId() {
         int networkId = this.networkId;
@@ -136,20 +107,4 @@ public void setRemoteNetworkId(int networkId) {
 
     @Override
     public void verifyRegisteredItemStack() {}
-
-    @Override
-    public ItemStack getRenderItemCache(Item item) {
-        if (this.networkId == -1)
-            return ClientMod.toItemStack(this);
-        if (this.renderCache == null) {
-            ItemStack cache = new ItemStack(item, this.stackSize, this.itemDamage, this.nbtTagCompound);
-            ((NetworkItemStack) (Object) cache).setRemoteNetworkId(-1);
-            return this.renderCache = cache;
-        }
-        this.renderCache.itemID = item.itemID;
-        this.renderCache.stackSize = this.stackSize;
-        this.renderCache.itemDamage = this.itemDamage;
-        this.renderCache.nbtTagCompound = this.nbtTagCompound;
-        return this.renderCache;
-    }
 }

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinItemStack.java

@@ -1,16 +1,13 @@
 package com.fox2code.foxloader.client.mixins;
 
-import com.fox2code.foxloader.client.renderer.TextureDynamic;
 import com.fox2code.foxloader.launcher.FoxLauncher;
 import com.fox2code.foxloader.loader.ClientModLoader;
 import com.fox2code.foxloader.loader.ModLoader;
-import com.fox2code.foxloader.loader.packet.ServerDynamicTexture;
 import com.fox2code.foxloader.network.NetworkPlayer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.client.GameSettings;
 import net.minecraft.src.game.entity.player.EntityPlayer;
 import net.minecraft.src.game.level.World;
-import net.minecraft.src.game.level.WorldSettings;
 import org.lwjgl.input.Keyboard;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -23,18 +20,15 @@
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.io.File;
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.logging.Level;
 
 @Mixin(Minecraft.class)
 public class MixinMinecraft {
     @Shadow public volatile boolean running;
     @Shadow public GameSettings gameSettings;
     @Shadow private static File minecraftDir;
-    @Shadow public File mcDataDir;
     @Unique private NetworkPlayer.ConnectionType loadedWorldType;
     @Unique private boolean closeGameDelayed;
     @Unique private boolean showDebugInfoPrevious;
@@ -111,20 +105,4 @@ public void onRunTickEnd(CallbackInfo ci) {
             this.running = false;
         }
     }
-
-    @Inject(method = "startWorld", at = @At("RETURN"))
-    public void onStartWorldHook(String var1, String var2, WorldSettings worldInfo, CallbackInfo ci) {
-        try {
-            int loadedTextures = 0;
-            for (ServerDynamicTexture serverDynamicTexture : ServerDynamicTexture.readFromWorld(
-                    new File(new File(this.mcDataDir, "saves_ReIndev"), var1))) {
-                TextureDynamic.Hooks.getServerDynTex(serverDynamicTexture.slot)
-                        .setRenderingData(serverDynamicTexture.texture);
-                loadedTextures++;
-            }
-            ModLoader.getModLoaderLogger().info("Loaded " + loadedTextures + " dynamic textures!");
-        } catch (IOException e) {
-            ModLoader.getModLoaderLogger().log(Level.WARNING, "Failed to load dynamic textures!", e);
-        }
-    }
 }