From 3218fe94babcf3cd944a1dcd119b90faa13f1650 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 6 Mar 2014 21:28:15 +0000 Subject: [PATCH] Hey look a cape (aka me being bored). --- .../client/core/handler/CapeHandler.java | 78 ++++++++++++++++++ .../client/core/proxy/ClientProxy.java | 2 + .../botania/client/lib/LibResources.java | 1 + .../item/block/ItemBlockSpecialFlower.java | 1 - .../botania/common/lib/LibObfuscation.java | 4 + .../assets/botania/textures/model/cape.png | Bin 0 -> 3329 bytes 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 MODSRC/vazkii/botania/client/core/handler/CapeHandler.java create mode 100644 resources/assets/botania/textures/model/cape.png 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 0000000000000000000000000000000000000000..8bc40ff83fc3692ef7d36c61cf43574306ef0e96 GIT binary patch literal 3329 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 LNkvXXu0mjfO;k7w literal 0 HcmV?d00001