diff --git a/MODSRC/vazkii/botania/client/core/handler/CapeHandler.java b/MODSRC/vazkii/botania/client/core/handler/CapeHandler.java new file mode 100644 index 000000000..c9efdb6e0 --- /dev/null +++ b/MODSRC/vazkii/botania/client/core/handler/CapeHandler.java @@ -0,0 +1,78 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [? (GMT)] + */ +package vazkii.botania.client.core.handler; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.ArrayList; + +import javax.imageio.ImageIO; + +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.renderer.ThreadDownloadImageData; +import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.event.ForgeSubscribe; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.LibObfuscation; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.ReflectionHelper; + +public class CapeHandler { + + private ArrayList capePlayers = new ArrayList(); + + public static CapeHandler instance; + + public CapeHandler() { + instance = this; + } + + @ForgeSubscribe + public void onPreRenderSpecials (RenderPlayerEvent.Specials.Pre event) { + if(Loader.isModLoaded("shadersmod")) + return; + + if(event.entityPlayer instanceof AbstractClientPlayer && (event.entityPlayer.username.equals("Vazkii") || event.entityPlayer.username.equals("Lizbeth"))) { + AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) event.entityPlayer; + + if (!capePlayers.contains(abstractClientPlayer)) { + ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), false, LibObfuscation.TEXTURE_UPLOADED); + new Thread(new CloakThread(abstractClientPlayer)).start(); + event.renderCape = true; + } + } + } + + private class CloakThread implements Runnable { + + AbstractClientPlayer abstractClientPlayer; + + public CloakThread(AbstractClientPlayer player) { + abstractClientPlayer = player; + } + + @Override + public void run() { + try { + BufferedImage bo = ImageIO.read(Botania.class.getResourceAsStream(LibResources.MODEL_CAPE)); + ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), bo, LibObfuscation.BUFFERED_IMAGE); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public void refreshCapes() { + capePlayers.clear(); + } +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 9201abda2..596c74474 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -21,6 +21,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaCollector; +import vazkii.botania.client.core.handler.CapeHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; @@ -66,6 +67,7 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new HUDHandler()); MinecraftForge.EVENT_BUS.register(new LightningHandler()); + MinecraftForge.EVENT_BUS.register(new CapeHandler()); initRenderers(); } diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index 4d6a17d1e..e69c675c4 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -41,6 +41,7 @@ public final class LibResources { public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png"; public static final String MODEL_POOL = PREFIX_MODEL + "pool.png"; public static final String MODEL_PYLON = PREFIX_MODEL + "pylon.png"; + public static final String MODEL_CAPE = "/assets/botania/textures/model/cape.png"; public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png"; public static final String MISC_WISP_LARGE = PREFIX_MISC + "wispLarge.png"; diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index e34f35b07..68536818e 100644 --- a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -24,7 +24,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.ISpecialFlower; import vazkii.botania.api.SubTileEntity; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java index 05ccef777..05cf6bf9c 100644 --- a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java +++ b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java @@ -27,4 +27,8 @@ public final class LibObfuscation { // EntityCreeper public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "bq" }; + + // ThreadDownloadImageData + public static final String[] TEXTURE_UPLOADED = new String[] { "textureUploaded", "field_110559_g", "g" }; + public static final String[] BUFFERED_IMAGE = new String[] { "bufferedImage", "field_110560_d", "d" }; } diff --git a/resources/assets/botania/textures/model/cape.png b/resources/assets/botania/textures/model/cape.png new file mode 100644 index 000000000..8bc40ff83 Binary files /dev/null and b/resources/assets/botania/textures/model/cape.png differ