From c2470f80eeaffc51c21d4329d4f835465ff32c09 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 13:11:18 -0600 Subject: [PATCH] Fixes so server works --- .../handler/ContributorFancinessHandler.java | 6 +- .../core/handler/RenderEventHandler.java | 108 ++++++++++++++++++ .../client/core/helper/IconHelper.java | 24 ---- .../client/core/proxy/ClientProxy.java | 8 +- .../render/entity/RenderBabylonWeapon.java | 3 +- .../render/entity/RenderCorporeaSpark.java | 5 +- .../client/render/entity/RenderSpark.java | 3 +- .../render/tile/RenderTileAlfPortal.java | 5 +- .../render/tile/RenderTileEnchanter.java | 3 +- .../render/tile/RenderTileLightRelay.java | 3 +- .../client/render/tile/RenderTilePool.java | 3 +- .../render/tile/RenderTileTerraPlate.java | 3 +- .../render/tile/RenderTileTinyPotato.java | 7 +- .../common/achievement/ModAchievements.java | 3 +- .../botania/common/block/BlockAlfPortal.java | 8 -- .../block/BlockFloatingSpecialFlower.java | 1 - .../botania/common/block/BlockLightRelay.java | 10 -- .../common/block/BlockSpecialFlower.java | 13 --- .../block/decor/BlockFloatingFlower.java | 9 -- .../block/mana/BlockAlchemyCatalyst.java | 11 +- .../common/block/mana/BlockEnchanter.java | 8 -- .../common/block/mana/BlockManaVoid.java | 17 +-- .../botania/common/block/mana/BlockPool.java | 11 +- .../common/block/mana/BlockTerraPlate.java | 9 -- .../buildcraft/StatementAPIPlugin.java | 9 -- .../integration/buildcraft/StatementBase.java | 5 +- .../buildcraft/TriggerManaDetector.java | 12 +- .../buildcraft/TriggerManaLevel.java | 8 +- .../buildcraft/TriggerRuneAltarCanCraft.java | 8 +- .../common/item/ItemCorporeaSpark.java | 11 -- .../vazkii/botania/common/item/ItemSpark.java | 7 -- .../botania/common/item/ItemSparkUpgrade.java | 14 +-- .../item/material/ItemManaResource.java | 17 --- .../common/item/relic/ItemKingKey.java | 10 +- .../common/lexicon/page/PageElvenRecipe.java | 3 +- 35 files changed, 167 insertions(+), 218 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 079dd5a16..b32ae3dd8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -92,7 +92,7 @@ public final class ContributorFancinessHandler { private static void renderTwintails(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).tailIcon; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.tailIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -122,7 +122,7 @@ public final class ContributorFancinessHandler { private static void renderPhiFlower(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).phiFlowerIcon; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.phiFlowerIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -142,7 +142,7 @@ public final class ContributorFancinessHandler { private static void renderGoldfish(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).goldfishIcon; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.goldfishIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java new file mode 100644 index 000000000..0b03208ea --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java @@ -0,0 +1,108 @@ +package vazkii.botania.client.core.handler; + +import com.google.common.collect.Maps; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.commons.lang3.text.WordUtils; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; +import vazkii.botania.common.item.ItemSparkUpgrade; +import vazkii.botania.common.item.relic.ItemKingKey; + +import java.util.Map; + +public class RenderEventHandler { + + public static final RenderEventHandler INSTANCE = new RenderEventHandler(); + + public TextureAtlasSprite + alfPortalTex, + lightRelayWorldIcon, + lightRelayWorldIconRed, + alchemyCatalystOverlay, + enchanterOverlay, + manaVoidOverlay, + manaWater, + terraPlateOverlay, + corporeaWorldIcon, + corporeaWorldIconMaster, + corporeaIconStar, + sparkWorldIcon, + manaDetectorIcon, + runeAltarTriggerIcon; + + public TextureAtlasSprite[] sparkUpgradeIcons; + public TextureAtlasSprite[] kingKeyWeaponIcons; + public Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + + // begin dank_memes todo 1.8 if I can figure out how to render arbitrary baked models then these will no longer be needed + public TextureAtlasSprite tailIcon = null; + public TextureAtlasSprite phiFlowerIcon = null; + public TextureAtlasSprite goldfishIcon = null; + public TextureAtlasSprite nerfBatIcon = null; + // end dank_memes + + @SubscribeEvent + public void onModelBake(ModelBakeEvent evt) { + // BlockSpecialFlower + // Ignore all vanilla rules, redirect all blockstates to blockstates/specialFlower.json#normal + evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(ModBlocks.specialFlower, new DefaultStateMapper() { + @Override + public ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("botania:specialFlower"); + } + }); + + // Floating flowers + evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + } + + @SubscribeEvent + public void onTextureStitch(TextureStitchEvent.Pre evt) { + alfPortalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); + lightRelayWorldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); + lightRelayWorldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); + alchemyCatalystOverlay = IconHelper.forName(evt.map, "alchemyCatalyst3", "blocks"); + enchanterOverlay = IconHelper.forName(evt.map, "enchanterOverlay", "blocks"); + manaVoidOverlay = IconHelper.forName(evt.map, "manaVoid1", "blocks"); + manaWater = IconHelper.forName(evt.map, "manaWater", "blocks"); + terraPlateOverlay = IconHelper.forName(evt.map, "terraPlateOverlay", "blocks"); + corporeaWorldIcon = IconHelper.forName(evt.map, "corporeaSpark1", "items"); + corporeaWorldIconMaster = IconHelper.forName(evt.map, "corporeaSpark3", "items"); + corporeaIconStar = IconHelper.forName(evt.map, "corporeaSparkStar", "items"); + sparkWorldIcon = IconHelper.forName(evt.map, "spark1", "items"); + + sparkUpgradeIcons = new TextureAtlasSprite[ItemSparkUpgrade.VARIANTS]; + for(int i = 0; i < ItemSparkUpgrade.VARIANTS; i++) { + sparkUpgradeIcons[i] = IconHelper.forName(evt.map, "sparkUpgradeL" + i, "items"); + } + + tailIcon = IconHelper.forName(evt.map, "tail", "items"); + phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower", "items"); + goldfishIcon = IconHelper.forName(evt.map, "goldfish", "items"); + nerfBatIcon = IconHelper.forName(evt.map, "nerfBat", "items"); + + kingKeyWeaponIcons = new TextureAtlasSprite[ItemKingKey.WEAPON_TYPES]; + for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) + kingKeyWeaponIcons[i] = IconHelper.forName(evt.map, "gateWeapon" + i, "items"); + + manaDetectorIcon = IconHelper.forName(evt.map, "triggers/manaDetector", "items"); + runeAltarTriggerIcon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft", "items"); + + for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { + manaLevelTriggerIcons.put(s, IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); + } + } + + private RenderEventHandler() {} +} diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index d54099033..573998ad7 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -10,34 +10,10 @@ */ package vazkii.botania.client.core.helper; -import com.google.common.base.Function; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelRotation; -import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.model.IFlexibleBakedModel; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ITransformation; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nullable; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Locale; public final class IconHelper { diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 1a5b0291c..0e80d24e8 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -56,6 +56,7 @@ import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -182,6 +183,7 @@ public class ClientProxy extends CommonProxy { super.preInit(event); + MinecraftForge.EVENT_BUS.register(RenderEventHandler.INSTANCE); ModelHandler.registerModels(); } @@ -191,7 +193,7 @@ public class ClientProxy extends CommonProxy { ModChallenges.init(); - FMLCommonHandler.instance().bus().register(new ClientTickHandler()); + MinecraftForge.EVENT_BUS.register(new ClientTickHandler()); MinecraftForge.EVENT_BUS.register(new HUDHandler()); MinecraftForge.EVENT_BUS.register(new LightningHandler()); if(ConfigHandler.boundBlockWireframe) @@ -202,10 +204,10 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); - FMLCommonHandler.instance().bus().register(new CorporeaAutoCompleteHandler()); + MinecraftForge.EVENT_BUS.register(new CorporeaAutoCompleteHandler()); if(ConfigHandler.useAdaptativeConfig) - FMLCommonHandler.instance().bus().register(new AdaptorNotifier()); + MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); if(ConfigHandler.versionCheckEnabled) new VersionChecker().init(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index edd749e57..8df06e2eb 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -27,6 +27,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; @@ -60,7 +61,7 @@ public class RenderBabylonWeapon extends Render { GlStateManager.scale(s, s, s); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.rotate(45F, 0F, 0F, 1F); - TextureAtlasSprite icon = ItemKingKey.weaponIcons[weapon.getVariety()]; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; GlStateManager.color(1F, 1F, 1F, chargeMul); float f = icon.getMinU(); float f1 = icon.getMaxU(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index aa83257c9..521b7a1fa 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.item.ItemCorporeaSpark; @@ -38,7 +39,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; + return entity.isMaster() ? RenderEventHandler.INSTANCE.corporeaWorldIconMaster : RenderEventHandler.INSTANCE.corporeaWorldIcon; } @Override @@ -53,7 +54,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return ItemCorporeaSpark.iconColorStar; + return RenderEventHandler.INSTANCE.corporeaIconStar; } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 44febf9c5..3992b8628 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.item.ItemSparkUpgrade; @@ -24,7 +25,7 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null; + return upgrade >= 0 && upgrade < RenderEventHandler.INSTANCE.sparkUpgradeIcons.length ? RenderEventHandler.INSTANCE.sparkUpgradeIcons[upgrade] : null; } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index f1934498a..4107eb492 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -22,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.block.BlockAlfPortal; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -55,11 +56,11 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { GlStateManager.disableCull(); GlStateManager.disableLighting(); - renderIcon(0, 0, BlockAlfPortal.portalTex, 3, 3, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.alfPortalTex, 3, 3, 240); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.translate(0F, 0F, 0.5F); - renderIcon(0, 0, BlockAlfPortal.portalTex, 3, 3, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.alfPortalTex, 3, 3, 240); GlStateManager.enableCull(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index f9ff5bb5f..54537f64a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.mana.BlockEnchanter; import vazkii.botania.common.block.tile.TileEnchanter; @@ -100,7 +101,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { } ShaderHelper.useShader(ShaderHelper.enchanterRune); - renderIcon(0, 0, BlockEnchanter.overlay, 5, 5, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.enchanterOverlay, 5, 5, 240); ShaderHelper.releaseShader(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 8239fb548..f6ac769ef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -24,6 +24,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.BlockLightRelay; @@ -32,7 +33,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks, int digProgress) { Minecraft mc = Minecraft.getMinecraft(); - TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon; + TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? RenderEventHandler.INSTANCE.lightRelayWorldIconRed : RenderEventHandler.INSTANCE.lightRelayWorldIcon; GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 217bbfecd..057b0d03f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -29,6 +29,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; @@ -139,7 +140,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.scale(s, s, s); ShaderHelper.useShader(ShaderHelper.manaPool); - renderIcon(0, 0, BlockPool.manaIcon, 16, 16, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.manaWater, 16, 16, 240); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 8e5c1ece4..0e664848f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.mana.BlockTerraPlate; import vazkii.botania.common.block.tile.TileTerraPlate; @@ -59,7 +60,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ShaderHelper.useShader(ShaderHelper.terraPlateRune); - renderIcon(0, 0, BlockTerraPlate.overlay, 1, 1, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.terraPlateOverlay, 1, 1, 240); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 1d051bcdf..854862092 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -33,6 +33,7 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.item.TinyPotatoRenderEvent; import vazkii.botania.client.core.handler.ContributorFancinessHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -140,14 +141,14 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.translate(0.45F, 0F, 0.4F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(20F, 1F, 0F, 1F); - renderIcon(((ItemManaResource) ModItems.manaResource).phiFlowerIcon); + renderIcon(RenderEventHandler.INSTANCE.phiFlowerIcon); if(name.equals("vazkii")) { GlStateManager.rotate(-20F, 1F, 0F, 1F); GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-1.5F, -1.3F, -0.75F); - renderIcon(((ItemManaResource) ModItems.manaResource).nerfBatIcon); + renderIcon(RenderEventHandler.INSTANCE.nerfBatIcon); } } else if(name.equals("skull kid")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); @@ -164,7 +165,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(((ItemManaResource) ModItems.manaResource).goldfishIcon); + renderIcon(RenderEventHandler.INSTANCE.goldfishIcon); } else if(name.equals("chitoge")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 5e16c5322..5a4f009f3 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -14,6 +14,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; @@ -157,7 +158,7 @@ public final class ModAchievements { botaniaPage = new AchievementPage(LibMisc.MOD_NAME, AchievementMod.achievements.toArray(new Achievement[AchievementMod.achievements.size()])); AchievementPage.registerAchievementPage(botaniaPage); - FMLCommonHandler.instance().bus().register(new AchievementTriggerer()); + MinecraftForge.EVENT_BUS.register(new AchievementTriggerer()); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index e3334034a..dfdb23634 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -37,20 +37,12 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { - public static TextureAtlasSprite portalTex; - public BlockAlfPortal() { super(Material.wood); setHardness(10F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.ALF_PORTAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre evt) { - portalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index b79b78d41..0dec520f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -74,7 +74,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE) .withProperty(ISLAND_TYPE, IFloatingFlower.IslandType.GRASS)); - MinecraftForge.EVENT_BUS.register(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 8cc774d0b..144684c96 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -48,14 +48,11 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { - public static TextureAtlasSprite worldIcon, worldIconRed; - protected BlockLightRelay() { super(Material.glass); float f = 5F / 16F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setUnlocalizedName(LibBlockNames.LIGHT_RELAY); - MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } @@ -82,13 +79,6 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe return getDefaultState().withProperty(BotaniaStateProps.POWERED, powered).withProperty(BotaniaStateProps.LUMINIZER_VARIANT, meta == 1 ? LuminizerVariant.DETECTOR : LuminizerVariant.DEFAULT); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); - worldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); - } - @Override public Block setUnlocalizedName(String par1Str) { register(par1Str); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index fa661d7f1..1281c26f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -137,19 +137,6 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onModelBake(ModelBakeEvent evt) { - // Ignore all vanilla rules, redirect all blockstates to blockstates/specialFlower.json#normal - evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(this, new DefaultStateMapper() { - @Override - public ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("botania:specialFlower"); - } - }); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 16114cc93..899bd9856 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -97,15 +97,6 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab return 2; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onModelBake(ModelBakeEvent evt) { - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); - } - @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR, ISLAND_TYPE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index 8b249caad..2d2075a60 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -23,6 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -30,8 +31,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoolOverlayProvider { - TextureAtlasSprite overlay; - public BlockAlchemyCatalyst() { this(LibBlockNames.ALCHEMY_CATALYST); } @@ -42,12 +41,6 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo setResistance(10.0F); setStepSound(Block.soundTypeStone); setUnlocalizedName(name); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "alchemyCatalyst3", "blocks"); } @Override @@ -57,7 +50,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo @Override public TextureAtlasSprite getIcon(World world, BlockPos pos) { - return overlay; + return RenderEventHandler.INSTANCE.alchemyCatalystOverlay; } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 69438e442..f33be0a81 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -51,7 +51,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD { Random random; - public static TextureAtlasSprite overlay; public BlockEnchanter() { super(Material.rock); @@ -62,13 +61,6 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex setUnlocalizedName(LibBlockNames.ENCHANTER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); random = new Random(); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "enchanterOverlay", "blocks"); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 4e2757349..e3c83e761 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -26,6 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileManaVoid; @@ -34,26 +35,12 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaVoid extends BlockModContainer implements ILexiconable, IPoolOverlayProvider { - TextureAtlasSprite overlay; - public BlockManaVoid() { super(Material.rock); setHardness(2.0F); setResistance(2000F); setStepSound(Block.soundTypeStone); setUnlocalizedName(LibBlockNames.MANA_VOID); - MinecraftForge.EVENT_BUS.register(this); - } - - @Override - public int getRenderType() { - return 3; - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "manaVoid1", "blocks"); } @Override @@ -68,7 +55,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP @Override public TextureAtlasSprite getIcon(World world, BlockPos pos) { - return overlay; + return RenderEventHandler.INSTANCE.manaVoidOverlay; } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index d0931ee96..a82ebae64 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -64,8 +64,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, boolean lastFragile = false; - public static TextureAtlasSprite manaIcon; - public BlockPool() { super(Material.rock); setHardness(2.0F); @@ -74,7 +72,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, setUnlocalizedName(LibBlockNames.POOL); setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); - MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); @@ -87,7 +84,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public int getMetaFromState(IBlockState state) { - return ((PoolVariant) state.getValue(BotaniaStateProps.POOL_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal(); } @Override @@ -98,12 +95,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - manaIcon = IconHelper.forName(evt.map, "manaWater", "blocks"); - } - @Override protected boolean shouldRegisterInNameSet() { return false; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index fbd89f4e5..cc36f1387 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -40,8 +40,6 @@ import vazkii.botania.common.lib.LibObfuscation; public class BlockTerraPlate extends BlockModContainer implements ILexiconable { - public static TextureAtlasSprite overlay; - public BlockTerraPlate() { super(Material.iron); setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); @@ -50,7 +48,6 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.TERRA_PLATE); - MinecraftForge.EVENT_BUS.register(this); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } @@ -79,12 +76,6 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { return false; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "terraPlateOverlay", "blocks"); - } - @Override public boolean isFullCube() { return false; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 838d8beb9..c417584d6 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -35,15 +35,6 @@ public class StatementAPIPlugin implements ITriggerProvider { StatementManager.registerStatement(triggerRuneAltarCanCraft); StatementManager.registerTriggerProvider(this); - - // Register them all to the event bus so they can stitch textures - MinecraftForge.EVENT_BUS.register(triggerManaEmpty); - MinecraftForge.EVENT_BUS.register(triggerManaContains); - MinecraftForge.EVENT_BUS.register(triggerManaSpace); - MinecraftForge.EVENT_BUS.register(triggerManaFull); - MinecraftForge.EVENT_BUS.register(triggerManaDetector); - - MinecraftForge.EVENT_BUS.register(triggerRuneAltarCanCraft); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index ab08cb575..b0ca61875 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -5,12 +5,9 @@ import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; public abstract class StatementBase implements IStatement { - protected TextureAtlasSprite icon; @Override - public TextureAtlasSprite getGuiSprite() { - return icon; - } + public abstract TextureAtlasSprite getGuiSprite(); @Override public int maxParameters() { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index ac6a9f875..fd6f85d83 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -1,6 +1,7 @@ package vazkii.botania.common.integration.buildcraft; import com.google.common.base.Predicates; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; @@ -9,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibTriggerNames; @@ -19,13 +21,13 @@ import buildcraft.api.statements.ITriggerInternal; public class TriggerManaDetector extends StatementBase implements ITriggerInternal { @Override - public String getUniqueTag() { - return "botania:manaDetector"; + public TextureAtlasSprite getGuiSprite() { + return RenderEventHandler.INSTANCE.manaDetectorIcon; } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/manaDetector", "items"); + @Override + public String getUniqueTag() { + return "botania:manaDetector"; } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 6b0767bd2..c554dd817 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -1,5 +1,6 @@ package vazkii.botania.common.integration.buildcraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -11,6 +12,7 @@ import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibTriggerNames; import buildcraft.api.statements.IStatementContainer; @@ -36,9 +38,9 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal return "botania:mana" + state.name(); } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(state.name()), "items"); + @Override + public TextureAtlasSprite getGuiSprite() { + return RenderEventHandler.INSTANCE.manaLevelTriggerIcons.get(state); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index c6a707136..b4bdd4059 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -1,11 +1,13 @@ package vazkii.botania.common.integration.buildcraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -20,9 +22,9 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE return "botania:runeAltarCanCraft"; } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft", "items"); + @Override + public TextureAtlasSprite getGuiSprite() { + return RenderEventHandler.INSTANCE.runeAltarTriggerIcon; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 876d7dbb3..9eaf26dfc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -34,12 +34,9 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { - public static TextureAtlasSprite worldIcon, worldIconMaster, iconColorStar; - public ItemCorporeaSpark() { setUnlocalizedName(LibItemNames.CORPOREA_SPARK); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); } @Override @@ -66,14 +63,6 @@ public class ItemCorporeaSpark extends ItemMod { return false; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcon = IconHelper.forName(evt.map, "corporeaSpark1", "items"); - worldIconMaster = IconHelper.forName(evt.map, "corporeaSpark3", "items"); - iconColorStar = IconHelper.forName(evt.map, "corporeaSparkStar", "items"); - } - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 3ddfeb2a6..985f233c9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -39,13 +39,6 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving public ItemSpark() { setUnlocalizedName(LibItemNames.SPARK); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcon = IconHelper.forName(evt.map, "items/spark1"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index e84d6513e..38c400024 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -26,23 +26,11 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSparkUpgrade extends ItemMod { - private static final int VARIANTS = 4; - - public static TextureAtlasSprite[] worldIcons; + public static final int VARIANTS = 4; public ItemSparkUpgrade() { setUnlocalizedName(LibItemNames.SPARK_UPGRADE); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcons = new TextureAtlasSprite[VARIANTS]; - for(int i = 0; i < VARIANTS; i++) { - worldIcons[i] = IconHelper.forName(evt.map, "sparkUpgradeL" + i, "items"); - } } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 89bbd2239..412a669da 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -55,27 +55,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve final int types = 24; - // begin dank_memes todo 1.8 if I can figure out how to render arbitrary baked models then these will no longer be needed - public TextureAtlasSprite tailIcon = null; - public TextureAtlasSprite phiFlowerIcon = null; - public TextureAtlasSprite goldfishIcon = null; - public TextureAtlasSprite nerfBatIcon = null; - // end dank_memes - public ItemManaResource() { super(); setUnlocalizedName(LibItemNames.MANA_RESOURCE); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - tailIcon = IconHelper.forName(evt.map, "tail", "items"); - phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower", "items"); - goldfishIcon = IconHelper.forName(evt.map, "goldfish", "items"); - nerfBatIcon = IconHelper.forName(evt.map, "nerfBat", "items"); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 4e8bd5bbd..9ba124565 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -33,20 +33,12 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_WEAPONS_SPAWNED = "weaponsSpawned"; private static final String TAG_CHARGING = "charging"; - private static final int WEAPON_TYPES = 12; - public static TextureAtlasSprite[] weaponIcons; + public static final int WEAPON_TYPES = 12; public ItemKingKey() { super(LibItemNames.KING_KEY); } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre event) { - weaponIcons = new TextureAtlasSprite[WEAPON_TYPES]; - for(int i = 0; i < WEAPON_TYPES; i++) - weaponIcons[i] = IconHelper.forName(event.map, "gateWeapon" + i, "items"); - } - @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index b4a05becb..dd22cc9d3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -21,6 +21,7 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.BlockAlfPortal; import net.minecraftforge.fml.relauncher.Side; @@ -74,7 +75,7 @@ public class PageElvenRecipe extends PageRecipe { i++; } - TextureAtlasSprite portalIcon = BlockAlfPortal.portalTex; + TextureAtlasSprite portalIcon = RenderEventHandler.INSTANCE.alfPortalTex; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); }