From 582b98854534c8755bdaa2305188cfe82a78bf1b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 29 Sep 2015 17:08:47 +0200 Subject: [PATCH] Little bit of cleaning upping --- .../actuallyadditions/event/InitEvents.java | 11 +++++++++++ .../actuallyadditions/proxy/ClientProxy.java | 13 ++----------- .../actuallyadditions/update/UpdateChecker.java | 9 ++++++--- .../textures/items/itemDiggersShovel.png | Bin 371 -> 0 bytes .../textures/items/itemDiggersShovelBroken.png | Bin 368 -> 0 bytes .../textures/items/itemFastDiggersShovel.png | Bin 350 -> 0 bytes .../items/itemFastDiggersShovelBroken.png | Bin 337 -> 0 bytes .../textures/items/itemMinersPickaxe.png | Bin 411 -> 0 bytes .../textures/items/itemMinersPickaxeBroken.png | Bin 491 -> 0 bytes .../textures/items/itemSilkyMinersPickaxe.png | Bin 321 -> 0 bytes .../items/itemSilkyMinersPickaxeBroken.png | Bin 306 -> 0 bytes 11 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovelBroken.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovelBroken.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxe.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxeBroken.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxe.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxeBroken.png diff --git a/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java index 798ab82dd..230c5b2cd 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java +++ b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java @@ -10,6 +10,8 @@ package ellpeck.actuallyadditions.event; +import ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import ellpeck.actuallyadditions.update.UpdateCheckerClientNotifier; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.Util; import net.minecraftforge.common.MinecraftForge; @@ -30,4 +32,13 @@ public class InitEvents{ MinecraftForge.TERRAIN_GEN_BUS.register(new WorldDecorationEvent()); } + public static void initClient(){ + Util.registerEvent(new TooltipEvent()); + Util.registerEvent(new RenderPlayerEventAA()); + + if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){ + Util.registerEvent(new UpdateCheckerClientNotifier()); + } + } + } diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java index cbcf23a35..822711d21 100644 --- a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java @@ -19,16 +19,12 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.VillagerRegistry; import ellpeck.actuallyadditions.blocks.InitBlocks; import ellpeck.actuallyadditions.blocks.render.*; -import ellpeck.actuallyadditions.config.values.ConfigBoolValues; import ellpeck.actuallyadditions.config.values.ConfigIntValues; -import ellpeck.actuallyadditions.event.RenderPlayerEventAA; -import ellpeck.actuallyadditions.event.TooltipEvent; +import ellpeck.actuallyadditions.event.InitEvents; import ellpeck.actuallyadditions.tile.*; -import ellpeck.actuallyadditions.update.UpdateCheckerClientNotifier; import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.KeyBinds; import ellpeck.actuallyadditions.util.ModUtil; -import ellpeck.actuallyadditions.util.Util; import ellpeck.actuallyadditions.util.playerdata.PersistantClientData; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; @@ -53,9 +49,7 @@ public class ClientProxy implements IProxy{ public void init(FMLInitializationEvent event){ ModUtil.LOGGER.info("Initializing ClientProxy..."); - if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){ - Util.registerEvent(new UpdateCheckerClientNotifier()); - } + InitEvents.initClient(); AssetUtil.COMPOST_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); AssetUtil.FISHING_NET_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); @@ -84,9 +78,6 @@ public class ClientProxy implements IProxy{ MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockSmileyCloud), new RenderItems(new ModelSmileyCloud())); VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png")); - - Util.registerEvent(new TooltipEvent()); - Util.registerEvent(new RenderPlayerEventAA()); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java index ed3404ff1..f5edc25e5 100644 --- a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java +++ b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java @@ -10,6 +10,7 @@ package ellpeck.actuallyadditions.update; +import ellpeck.actuallyadditions.config.values.ConfigBoolValues; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.Util; @@ -25,8 +26,10 @@ public class UpdateChecker{ public static final String DOWNLOAD_LINK = "http://minecraft.curseforge.com/mc-mods/228404-actually-additions/files"; public void init(){ - ModUtil.LOGGER.info("Initializing Update Checker..."); - Util.registerEvent(this); - new ThreadUpdateChecker(); + if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){ + ModUtil.LOGGER.info("Initializing Update Checker..."); + Util.registerEvent(this); + new ThreadUpdateChecker(); + } } } diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovel.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovel.png deleted file mode 100644 index 00fc90d986e5d84c04adafbf9bd29a58630e9f88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~r-Y!mRc2PN1p@;kgQtsQh{fr>lkB|@2Z$U!KUweA z+9$2%p>y7d#aOXE68q&D^NDp+O8JTO7soXkS!VetPIhK0)y;b}!QQFOd);Kw(i7cI z?<;oNzq6dfJg2xx;lX@sL)LA%(w>tVIt1DlGBn&2*^wy~F^yGI_0*;(8eK(Cw%?=^dDcJn;+iioGuy3 zA$j1?nFAmGpU-c5Z(naXWA;pg6Pg;vJL-R)`0)3(IGdWTd%#0m0zu L>gTe~DWM4ffl`~8 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovel.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovel.png deleted file mode 100644 index 4aa2e2e8b76566ca8b6b678b625404cfc6f765db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~r-Yyq3zt=pDp2UPr;B5V#p$Dy6|)Zqh_w12I}?_~ z)@nDgZ)F&(*8;sI0$=M~Qf|a|bamZaKcnNc{ED@e%d(V`tj_d0`c&?G<+F9e%)RCt zWlN9#wRm3ip7mdJqkh0N)#aH@9SdIXdT>iLXI5LHgwpw9p2H2RR^5qxz3Z7ppNeO; z?(co+lT=EYx)&`lY`YdUZ|T;32kiSUY|9mJ6`UFr;N|F|p!DwJ*RpfVkBeS5S!&o8 zIqjl!oPIh>gGJxVJ#KsFey%HQK75)zu6^?TUHh%8Whbrwyfks|oR5ix-FKhyo&RnA s{6_fmN9G@FVdQ&MBb@0G0cb5&!@I diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovelBroken.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovelBroken.png deleted file mode 100644 index 34bb80c722aae61757e6467abffa292f3b638179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~r-Y!AVEXfI=YT@@JY5_^EKVmUNPKFT7||*`yZhhf z;zDDC%?8GMs{ZvPo}I?b^L+gsCBOQ7=X?M8-{1fD|J&Qk|LyJV|L-sR`KO*c`R;$0 zOux=AKkHw;*!TbbzPf+^-`~Igf8)V-|7-8&{Ga^f{IsqfpvHSYYZ9pOgCF=~E@$7TdEf|I3%H{(pVKBa{oo@BUn9(%hy&e+Jn f;Lq~vG$w|4pOhZ$Lr&E|pE7v5`njxgN@xNAmtLE6 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxe.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxe.png deleted file mode 100644 index 4f32391676212989ed01300f44baccc3eb3e48ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)07>Q0e)yoj?)J0*}aI z1_o|n5N2eUHAey{$X?><>&kwgQ$mnc;>f=}{6Hbu%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dDE{Bm#WBR<^wQwnUPl~6Y=zZWk`o*_BF=_6>gERBUUu_- zLH*J7AM}%U&risdZ3z)#TgN%2w3EuQY2bNtR}263me6LW8S1&SCPQ#fB7 z61sF6&lefVqZbn-*gPk(9Fr(5a(zC>U~`K=%gm)Ky>G5rd!+Ky{6<5!)W~I9u3dQ0e)yoj?)J0*}aI z1_o|n5N2eUHAey{$X?><>&kwgQ$mo9OD1bx3s6WlGbEzKIX^cyHLnE7WngeFN=+H(YqgS&R#p&^FC+QJx2XqvBzJQCC^f8VBlc=o0W0F^^J`_ z!Z}e&T3eRX;*m8v-&h)P1GnJ(b$K3a(6dz@~yhC@_t~Z4{V^vqa{!vpm zr&eyslow_<`KRQqThGzgsv+L(!6x<}Pyzs*^9;$2=-)KaIr z70FsQ|7&+HToCUn-gebvfqUdVSFM#n?1opjIjY~7RWp0N*}r9vf3Nx$a?GUXnvngW zu*9Q0e)yoj?)J0*}aI z1_o|n5N2eUHAey{$X?><>&kwgQ$mnWL~oDgd!UePW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6kqD;;uvCa`t5{;d`yM{F591Tgtn-u`1UP%wjq7h#`JgQ zJLFeBXrFcEBfD!-^~t%;lcqL1F?ddHI`HAmyEkumF3#6EXIb%n;_a11&YG%{$sIE< zMz$_oANc2}i7!LL``;Hj)bDNA zwwk-XL^9tgTi1z0B)R66u;ugi9Tvr&iI39H<@413-T6cM-NV!2uO{5Qb_(PZPgg&e IbxsLQ0B2Zto&W#< diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxeBroken.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxeBroken.png deleted file mode 100644 index 2ed084cd968903e9cec4f60301157481adb9557b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)07>Q0e)yoj?)J0*}aI z1_o|n5N2eUHAey{$X?><>&kwgQ$mnWerMi?bfA!IW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6rbkl;uvCaIypgtbqnj+rG@{uub=t#|Cxzz|J$B*`Jevd z5 zJMCRybi}3AU{C$$IS;>fALrp#zy3%4*0XaZU;j%L-Kj7&c(nQFf!6Ij=5n>EDmTv` pxzTf#wPdR#bIOmC6W7laVqn7K5BF6*2UngFtHc)0)o