From ca3018b5b78def2183ab284144728fc2549e71d4 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Sun, 23 Dec 2012 14:46:11 -0500 Subject: [PATCH] v5.0.1 Release *Fixed incorrect repo location. *Formatting. *Fixed minor bugs in Metallurgic Infuser. *Fixed unobtainable machines. --- .../render/TheoreticalElementizer.png | Bin 0 -> 3693 bytes src/{ => minecraft}/mekanism/api/EnumGas.java | 0 .../mekanism/api/IAccessibleGui.java | 0 .../mekanism/api/IActiveState.java | 0 .../mekanism/api/IElectricMachine.java | 0 .../mekanism/api/IEnergyCube.java | 0 .../mekanism/api/IGasAcceptor.java | 0 .../mekanism/api/IGasStorage.java | 0 .../mekanism/api/IMachineUpgrade.java | 0 .../mekanism/api/IStorageTank.java | 0 .../mekanism/api/ITileNetwork.java | 0 .../mekanism/api/Infusion.java | 0 .../mekanism/api/InfusionType.java | 0 .../mekanism/api/ItemMachineUpgrade.java | 0 .../mekanism/api/ItemRetriever.java | 0 .../mekanism/api/TabProxy.java | 0 src/{ => minecraft}/mekanism/api/Tier.java | 0 .../client/BlockRenderingHandler.java | 125 +++++++++++ .../mekanism/client/ClientProxy.java | 21 ++ .../mekanism/client/ClientTickHandler.java | 0 .../client/GuiAdvancedElectricMachine.java | 0 .../mekanism/client/GuiControlPanel.java | 0 .../mekanism/client/GuiCredits.java | 0 .../mekanism/client/GuiElectricMachine.java | 0 .../mekanism/client/GuiEnergyCube.java | 0 .../mekanism/client/GuiGasTank.java | 0 .../client/GuiMetallurgicInfuser.java | 0 .../mekanism/client/GuiSmeltingFactory.java | 0 .../mekanism/client/GuiStopwatch.java | 0 .../client/GuiTheoreticalElementizer.java | 0 .../mekanism/client/GuiWeatherOrb.java | 0 .../mekanism/client/ItemRenderingHandler.java | 0 .../client/ModelTheoreticalElementizer.java | 200 ++++++++++++++++++ .../mekanism/client/RenderObsidianTNT.java | 0 .../client/RenderTheoreticalElementizer.java | 38 ++++ .../mekanism/client/Sound.java | 0 .../mekanism/client/SoundHandler.java | 0 .../mekanism/client/TextureAnimatedFX.java | 0 .../mekanism/client/ThreadClientUpdate.java | 0 .../mekanism/client/ThreadSendData.java | 0 .../mekanism/common/BlockBasic.java | 0 .../mekanism/common/BlockEnergyCube.java | 0 .../mekanism/common/BlockGasTank.java | 0 .../mekanism/common/BlockMachine.java | 42 +++- .../mekanism/common/BlockObsidianTNT.java | 0 .../mekanism/common/BlockOre.java | 0 .../mekanism/common/CommandMekanism.java | 0 .../mekanism/common/CommonProxy.java | 0 .../ContainerAdvancedElectricMachine.java | 0 .../common/ContainerElectricMachine.java | 0 .../mekanism/common/ContainerEnergyCube.java | 0 .../mekanism/common/ContainerGasTank.java | 0 .../common/ContainerMetallurgicInfuser.java | 0 .../common/ContainerSmeltingFactory.java | 0 .../mekanism/common/CoreGuiHandler.java | 0 .../mekanism/common/CreativeTabMekanism.java | 0 .../mekanism/common/DamageSourceMekanism.java | 0 .../mekanism/common/EntityObsidianTNT.java | 0 .../mekanism/common/EnumColor.java | 0 .../mekanism/common/EnumPacketType.java | 0 .../mekanism/common/EnumWeatherType.java | 0 .../common/ItemAtomicDisassembler.java | 0 .../mekanism/common/ItemBlockBasic.java | 0 .../mekanism/common/ItemBlockEnergyCube.java | 0 .../mekanism/common/ItemBlockMachine.java | 0 .../mekanism/common/ItemBlockOre.java | 0 .../mekanism/common/ItemDust.java | 0 .../mekanism/common/ItemElectricBow.java | 0 .../mekanism/common/ItemEnergized.java | 0 .../mekanism/common/ItemIngot.java | 0 .../mekanism/common/ItemLightningRod.java | 0 .../mekanism/common/ItemMekanism.java | 0 .../mekanism/common/ItemStopwatch.java | 0 .../mekanism/common/ItemStorageTank.java | 0 .../mekanism/common/ItemWeatherOrb.java | 0 .../mekanism/common/LiquidSlot.java | 0 .../mekanism/common/MachineryManager.java | 0 .../mekanism/common/Mekanism.java | 12 +- .../mekanism/common/MekanismHooks.java | 16 +- .../mekanism/common/MekanismUtils.java | 0 .../mekanism/common/OreHandler.java | 0 .../mekanism/common/PacketHandler.java | 0 .../mekanism/common/RecipeHandler.java | 0 .../mekanism/common/ServerCommandHandler.java | 0 .../mekanism/common/SlotEnergy.java | 0 .../mekanism/common/SlotMachineUpgrade.java | 0 .../mekanism/common/SlotStorageTank.java | 0 .../mekanism/common/ThreadGetData.java | 0 .../TileEntityAdvancedElectricMachine.java | 0 .../TileEntityAdvancedSmeltingFactory.java | 0 .../mekanism/common/TileEntityBasicBlock.java | 0 .../common/TileEntityBasicMachine.java | 16 +- .../mekanism/common/TileEntityCombiner.java | 0 .../common/TileEntityContainerBlock.java | 0 .../common/TileEntityControlPanel.java | 0 .../mekanism/common/TileEntityCrusher.java | 0 .../common/TileEntityElectricBlock.java | 1 + .../common/TileEntityElectricMachine.java | 0 .../mekanism/common/TileEntityEnergyCube.java | 10 +- .../common/TileEntityEnrichmentChamber.java | 0 .../mekanism/common/TileEntityGasTank.java | 0 .../common/TileEntityMetallurgicInfuser.java | 16 +- .../common/TileEntityPlatinumCompressor.java | 0 .../common/TileEntitySmeltingFactory.java | 16 +- .../TileEntityTheoreticalElementizer.java | 0 .../TileEntityUltimateSmeltingFactory.java | 0 .../mekanism/common/Version.java | 0 .../client/BlockRenderingHandler.java | 0 .../client/GeneratorsClientProxy.java | 0 .../generators/client/GuiBioGenerator.java | 0 .../client/GuiElectrolyticSeparator.java | 0 .../generators/client/GuiHeatGenerator.java | 0 .../client/GuiHydrogenGenerator.java | 0 .../generators/client/GuiSolarGenerator.java | 0 .../client/ModelAdvancedSolarGenerator.java | 0 .../generators/client/ModelBioGenerator.java | 0 .../client/ModelElectrolyticSeparator.java | 0 .../generators/client/ModelHeatGenerator.java | 0 .../client/ModelHydrogenGenerator.java | 0 .../client/RenderAdvancedSolarGenerator.java | 0 .../generators/client/RenderBioGenerator.java | 0 .../client/RenderElectrolyticSeparator.java | 0 .../client/RenderHeatGenerator.java | 0 .../client/RenderHydrogenGenerator.java | 0 .../generators/common/BlockGenerator.java | 0 .../common/ContainerBioGenerator.java | 0 .../ContainerElectrolyticSeparator.java | 0 .../common/ContainerHeatGenerator.java | 0 .../common/ContainerHydrogenGenerator.java | 0 .../common/ContainerSolarGenerator.java | 0 .../common/GeneratorsCommonProxy.java | 0 .../common/GeneratorsGuiHandler.java | 0 .../generators/common/ItemBlockGenerator.java | 0 .../generators/common/MekanismGenerators.java | 0 .../TileEntityAdvancedSolarGenerator.java | 0 .../common/TileEntityBioGenerator.java | 0 .../TileEntityElectrolyticSeparator.java | 16 +- .../common/TileEntityGenerator.java | 15 +- .../common/TileEntityHeatGenerator.java | 0 .../common/TileEntityHydrogenGenerator.java | 0 .../common/TileEntitySolarGenerator.java | 0 .../tools/common/ItemMekanismArmor.java | 0 .../tools/common/ItemMekanismAxe.java | 0 .../tools/common/ItemMekanismHoe.java | 0 .../tools/common/ItemMekanismPaxel.java | 0 .../tools/common/ItemMekanismPickaxe.java | 0 .../tools/common/ItemMekanismSpade.java | 0 .../tools/common/ItemMekanismSword.java | 0 .../tools/common/ItemMekanismTool.java | 0 .../mekanism/tools/common/MekanismTools.java | 0 150 files changed, 487 insertions(+), 57 deletions(-) create mode 100644 bin/minecraft/resources/mekanism/render/TheoreticalElementizer.png rename src/{ => minecraft}/mekanism/api/EnumGas.java (100%) rename src/{ => minecraft}/mekanism/api/IAccessibleGui.java (100%) rename src/{ => minecraft}/mekanism/api/IActiveState.java (100%) rename src/{ => minecraft}/mekanism/api/IElectricMachine.java (100%) rename src/{ => minecraft}/mekanism/api/IEnergyCube.java (100%) rename src/{ => minecraft}/mekanism/api/IGasAcceptor.java (100%) rename src/{ => minecraft}/mekanism/api/IGasStorage.java (100%) rename src/{ => minecraft}/mekanism/api/IMachineUpgrade.java (100%) rename src/{ => minecraft}/mekanism/api/IStorageTank.java (100%) rename src/{ => minecraft}/mekanism/api/ITileNetwork.java (100%) rename src/{ => minecraft}/mekanism/api/Infusion.java (100%) rename src/{ => minecraft}/mekanism/api/InfusionType.java (100%) rename src/{ => minecraft}/mekanism/api/ItemMachineUpgrade.java (100%) rename src/{ => minecraft}/mekanism/api/ItemRetriever.java (100%) rename src/{ => minecraft}/mekanism/api/TabProxy.java (100%) rename src/{ => minecraft}/mekanism/api/Tier.java (100%) create mode 100644 src/minecraft/mekanism/client/BlockRenderingHandler.java rename src/{ => minecraft}/mekanism/client/ClientProxy.java (85%) rename src/{ => minecraft}/mekanism/client/ClientTickHandler.java (100%) rename src/{ => minecraft}/mekanism/client/GuiAdvancedElectricMachine.java (100%) rename src/{ => minecraft}/mekanism/client/GuiControlPanel.java (100%) rename src/{ => minecraft}/mekanism/client/GuiCredits.java (100%) rename src/{ => minecraft}/mekanism/client/GuiElectricMachine.java (100%) rename src/{ => minecraft}/mekanism/client/GuiEnergyCube.java (100%) rename src/{ => minecraft}/mekanism/client/GuiGasTank.java (100%) rename src/{ => minecraft}/mekanism/client/GuiMetallurgicInfuser.java (100%) rename src/{ => minecraft}/mekanism/client/GuiSmeltingFactory.java (100%) rename src/{ => minecraft}/mekanism/client/GuiStopwatch.java (100%) rename src/{ => minecraft}/mekanism/client/GuiTheoreticalElementizer.java (100%) rename src/{ => minecraft}/mekanism/client/GuiWeatherOrb.java (100%) rename src/{ => minecraft}/mekanism/client/ItemRenderingHandler.java (100%) create mode 100644 src/minecraft/mekanism/client/ModelTheoreticalElementizer.java rename src/{ => minecraft}/mekanism/client/RenderObsidianTNT.java (100%) create mode 100644 src/minecraft/mekanism/client/RenderTheoreticalElementizer.java rename src/{ => minecraft}/mekanism/client/Sound.java (100%) rename src/{ => minecraft}/mekanism/client/SoundHandler.java (100%) rename src/{ => minecraft}/mekanism/client/TextureAnimatedFX.java (100%) rename src/{ => minecraft}/mekanism/client/ThreadClientUpdate.java (100%) rename src/{ => minecraft}/mekanism/client/ThreadSendData.java (100%) rename src/{ => minecraft}/mekanism/common/BlockBasic.java (100%) rename src/{ => minecraft}/mekanism/common/BlockEnergyCube.java (100%) rename src/{ => minecraft}/mekanism/common/BlockGasTank.java (100%) rename src/{ => minecraft}/mekanism/common/BlockMachine.java (94%) rename src/{ => minecraft}/mekanism/common/BlockObsidianTNT.java (100%) rename src/{ => minecraft}/mekanism/common/BlockOre.java (100%) rename src/{ => minecraft}/mekanism/common/CommandMekanism.java (100%) rename src/{ => minecraft}/mekanism/common/CommonProxy.java (100%) rename src/{ => minecraft}/mekanism/common/ContainerAdvancedElectricMachine.java (100%) rename src/{ => minecraft}/mekanism/common/ContainerElectricMachine.java (100%) rename src/{ => minecraft}/mekanism/common/ContainerEnergyCube.java (100%) rename src/{ => minecraft}/mekanism/common/ContainerGasTank.java (100%) rename src/{ => minecraft}/mekanism/common/ContainerMetallurgicInfuser.java (100%) rename src/{ => minecraft}/mekanism/common/ContainerSmeltingFactory.java (100%) rename src/{ => minecraft}/mekanism/common/CoreGuiHandler.java (100%) rename src/{ => minecraft}/mekanism/common/CreativeTabMekanism.java (100%) rename src/{ => minecraft}/mekanism/common/DamageSourceMekanism.java (100%) rename src/{ => minecraft}/mekanism/common/EntityObsidianTNT.java (100%) rename src/{ => minecraft}/mekanism/common/EnumColor.java (100%) rename src/{ => minecraft}/mekanism/common/EnumPacketType.java (100%) rename src/{ => minecraft}/mekanism/common/EnumWeatherType.java (100%) rename src/{ => minecraft}/mekanism/common/ItemAtomicDisassembler.java (100%) rename src/{ => minecraft}/mekanism/common/ItemBlockBasic.java (100%) rename src/{ => minecraft}/mekanism/common/ItemBlockEnergyCube.java (100%) rename src/{ => minecraft}/mekanism/common/ItemBlockMachine.java (100%) rename src/{ => minecraft}/mekanism/common/ItemBlockOre.java (100%) rename src/{ => minecraft}/mekanism/common/ItemDust.java (100%) rename src/{ => minecraft}/mekanism/common/ItemElectricBow.java (100%) rename src/{ => minecraft}/mekanism/common/ItemEnergized.java (100%) rename src/{ => minecraft}/mekanism/common/ItemIngot.java (100%) rename src/{ => minecraft}/mekanism/common/ItemLightningRod.java (100%) rename src/{ => minecraft}/mekanism/common/ItemMekanism.java (100%) rename src/{ => minecraft}/mekanism/common/ItemStopwatch.java (100%) rename src/{ => minecraft}/mekanism/common/ItemStorageTank.java (100%) rename src/{ => minecraft}/mekanism/common/ItemWeatherOrb.java (100%) rename src/{ => minecraft}/mekanism/common/LiquidSlot.java (100%) rename src/{ => minecraft}/mekanism/common/MachineryManager.java (100%) rename src/{ => minecraft}/mekanism/common/Mekanism.java (98%) rename src/{ => minecraft}/mekanism/common/MekanismHooks.java (91%) rename src/{ => minecraft}/mekanism/common/MekanismUtils.java (100%) rename src/{ => minecraft}/mekanism/common/OreHandler.java (100%) rename src/{ => minecraft}/mekanism/common/PacketHandler.java (100%) rename src/{ => minecraft}/mekanism/common/RecipeHandler.java (100%) rename src/{ => minecraft}/mekanism/common/ServerCommandHandler.java (100%) rename src/{ => minecraft}/mekanism/common/SlotEnergy.java (100%) rename src/{ => minecraft}/mekanism/common/SlotMachineUpgrade.java (100%) rename src/{ => minecraft}/mekanism/common/SlotStorageTank.java (100%) rename src/{ => minecraft}/mekanism/common/ThreadGetData.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityAdvancedElectricMachine.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityAdvancedSmeltingFactory.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityBasicBlock.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityBasicMachine.java (96%) rename src/{ => minecraft}/mekanism/common/TileEntityCombiner.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityContainerBlock.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityControlPanel.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityCrusher.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityElectricBlock.java (99%) rename src/{ => minecraft}/mekanism/common/TileEntityElectricMachine.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityEnergyCube.java (98%) rename src/{ => minecraft}/mekanism/common/TileEntityEnrichmentChamber.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityGasTank.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityMetallurgicInfuser.java (97%) rename src/{ => minecraft}/mekanism/common/TileEntityPlatinumCompressor.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntitySmeltingFactory.java (97%) rename src/{ => minecraft}/mekanism/common/TileEntityTheoreticalElementizer.java (100%) rename src/{ => minecraft}/mekanism/common/TileEntityUltimateSmeltingFactory.java (100%) rename src/{ => minecraft}/mekanism/common/Version.java (100%) rename src/{ => minecraft}/mekanism/generators/client/BlockRenderingHandler.java (100%) rename src/{ => minecraft}/mekanism/generators/client/GeneratorsClientProxy.java (100%) rename src/{ => minecraft}/mekanism/generators/client/GuiBioGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/GuiElectrolyticSeparator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/GuiHeatGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/GuiHydrogenGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/GuiSolarGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/ModelAdvancedSolarGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/ModelBioGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/ModelElectrolyticSeparator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/ModelHeatGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/ModelHydrogenGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/RenderAdvancedSolarGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/RenderBioGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/RenderElectrolyticSeparator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/RenderHeatGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/client/RenderHydrogenGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/BlockGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/ContainerBioGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/ContainerElectrolyticSeparator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/ContainerHeatGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/ContainerHydrogenGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/ContainerSolarGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/GeneratorsCommonProxy.java (100%) rename src/{ => minecraft}/mekanism/generators/common/GeneratorsGuiHandler.java (100%) rename src/{ => minecraft}/mekanism/generators/common/ItemBlockGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/MekanismGenerators.java (100%) rename src/{ => minecraft}/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/TileEntityBioGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/TileEntityElectrolyticSeparator.java (98%) rename src/{ => minecraft}/mekanism/generators/common/TileEntityGenerator.java (95%) rename src/{ => minecraft}/mekanism/generators/common/TileEntityHeatGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/TileEntityHydrogenGenerator.java (100%) rename src/{ => minecraft}/mekanism/generators/common/TileEntitySolarGenerator.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismArmor.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismAxe.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismHoe.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismPaxel.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismPickaxe.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismSpade.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismSword.java (100%) rename src/{ => minecraft}/mekanism/tools/common/ItemMekanismTool.java (100%) rename src/{ => minecraft}/mekanism/tools/common/MekanismTools.java (100%) diff --git a/bin/minecraft/resources/mekanism/render/TheoreticalElementizer.png b/bin/minecraft/resources/mekanism/render/TheoreticalElementizer.png new file mode 100644 index 0000000000000000000000000000000000000000..aac919200256494ba7079c55cc24ee5df28cbd9e GIT binary patch literal 3693 zcma)9i8s{m_kYhAV;c;@WKXuTjddzyiR^|DVzOqZ$u5i~%h*XFvL=b_Yh@W!)(pu` zhU`9=$kv3fet*I5Jm)^IbMHCNa_)V-o+aMcNSl$Kiyi;~MqM4vJLeej&uF3NefLfK zfpY-)-qF?os)l&h&mE|PzP2V{@~56hg+gEW4+hFUbU zFg9i(mUis&*7@{Xx|-@{LDO3pFHbXbF5I@Z%ZKDjH%?Ad!8&8TDSJ&Ui}-;fl7o+U);?_CANA)=`AK-h!=n`7X>@k_K9(=>GvZ9vu@=E* z>y+|Dyfo#JDUGl9e@~W4+_4My>m?YPytm6Kmf z0U1u1I8x<&0T_q<46lC^6{&hGhJjt>Z(G1l8seKb=7%US8J1&TnWJ(7QJWP{CqQHK zoF~!%cmx3x_*2g?n2Fdu>8Yk<^f+$g;)3$Ezb-OIK#kkl&DII>&8~$S3NC%oTs855 z=Ki#eC`g)mac$Lra}AOfGoRdrgw3KFSaM2#cJqg>1xsf15s*o(cd!m)G?Sq#px+YV zL`EmE3%fP3divy5<@YO8K5Zz&QA2S0KKLt8YngPu?375ic6#cYEntcC`p%V-G;nMr zyZGIukv6@pJ?){Zt%HLV4w)M`t7m}8agT${_}pArx2~NPha#ibr+9PGu(#HHV*{Cz z-DGl2T}f{zXLX|RE6bp@qBsO|sU9i5y03aqkp+;#d{{c}U}j><3{7+$5+V5zx)zWk zRYoh+si~*NVoOEFGfnAwub&AT8S&j*)G{>jWF(W>tSski(<|$+i-gMl5h;;4dZ&2}Ov%U^rxFpHo~RFb~?_*8n9e3b%0!l(`lrj}$Ln}JhuQGf5r zz8Ew;DUXK7jN3GZrTipKGBmfSqD~j|(PV!NaTBtAv=?(F^}^bEd2H3@`C$D_iOz4Y z^;aiwxAx)L6(PvnF2wo*Zdak_5!T(->wYdm zD7VEGR^#UCn7=>ZW?H&)Xu;Q`(zic4B+ySA*Uk5)Haka+-BYG)*P!qvT>XGLp$ibT zDCno2YUe{dXAl$V?HL(G7IGvzh`-Gdlxkug9vx*{yE2y>$&uRg;@Z=eJ6V+AG3A>N zlY?r^Z>K2#S=Qwr%K?q-|LnAALz~~!C`zkPJyMQ#RT$9qTk1`J=tW*Qkby8CfiJ#S z#!nNfe{6n8$<4E+D}joM;?C8GWphHC6oG%Kjb{-=sZOdF!L1i%RenlXin0oW?K_K_5zoe~Cvf?>}K#X~tg0 z8&liZ9HKJ(LFFVG`?u6}?Xzr6SG<=$}7-8cry@Lagtl1zD}S zqq=}yot4W4s^w8Ts0}Jxa7!3Hff1KaQVKMh;}wcpm81>}nJ^S3WH>qoz5OtKYb(}X zZ8YEFEVC4}-XJT(#2--OmCG0ONKER$Y@OPQyBEgttVGsp<^WPaGm4)4Rk+brtnCe7 z4oG_*_wnUynx^8@&tsJ8#gATz4IE^-?9|!Q?e}+p^Dmi0sE4Zs&JV{z6cQG>vgD>Oqj z=hNhY%~gv|B00&y>OUi*D{}+OQuFm!2oNJZ6<+DdY{_=B9n*`NQ<>$| zS?DYd*?e#Ety!X4I_StHVM5;o@dHkEgprQJ)Gg9-Bwtc(lt!~9-cB#*F|NZ93?982 zgqN@iRR1+;3<&kbyX6EA74>T{X;>i{8bjpX^Zo8Cd|1y?LZK#B&wVrr5P;M$WPdG_ z(smYr_w!ME*m`(~Z*Ffxfuxj_qAICoc6X;G?(g51B$g~CGEs}>6nfbgu>0XB{`V5@ z>j`2-zI*40yDXtjxBzYV&~{WT;eBRPsp_-n}mq2spSHq?wcyN(Hn~G8!%C zLr{vp&)|o+CQzx{;%4<(7H3etdrm&4O_Xk8$t+M3VIY^PZ~8(t$7u`{x>zTVl}iz=(Ah!oq^@_Mive7egbfeSe^ryRa_5%@zTc-bI}w#h34jhq*b$dwQM-49}C z4t?g)at&oSqxd6q&u{`MYsfY?Hy3=!04M&*-8N9`QWlQbkhuBlf|M1ZuQTI?gP$Kv zL1C;au<*v1zJZh!&vhj@hb0wWJqvwombWflu#2&iJWq>N*7Y`t@sYeDMt>ozoDyy+Hs+gEDNEHuiTNC6kev5>|_+ z%19(BpH3qDevxk^-Ci%?LvhY2-O>GVH2}`f&CLy3VtR6*FJLZ9y&kb#hl(my$_W2( z#TL+ceJ5XAHLS>idY6vF81g5tb0?6S)7+z1JG>}5eSo$o8WCYC^JZBC<$b};y5!e7 zt^mRxsU`rYWnf}F!bCPJn;uH>N*p_MeV@Q6E&|V+n!mjBM$tn)& zxH$RRYNAS=JrtN!Y0(Zj?v!fsUHzV2phaHZr;cX53L04xZ-1C=NQdwFnKaMQR9kDZ zE|p-~ZN|Zo1}Yx07;e0pE4s!yP>lrexBdOzxw_;)(PSmA8(~^@SD$O#$oq1Q#ZH23(D(qN!iquo(`@D1pD4L92e1YqEFwsG=*ZK~(ec#|W3iKp zny?+{q8i`+B2jiOuyVs81~Pws1wZ<=sKul5Sbhg~DHsFthcfg7pSAt{6}WkMyQdoi zJDa>pM%@B~vu)@U;N?!F zfo?j6Pe9!v(ORuqWbLIf40xwqapV^Q;+C~F zvriKC1TE|Kv05}k5fC}K1jz^8un3Sf4EZ6)B9wFMU*@ITv4mBySvzp45Car2^6(Q2 zKl~A&G?5$h`A~ZM*0RFDNl?phnyT=9x zzXZ<95Zts~rEdDO7|As@^1d!(OX;Hp+bS5=-SH$zQ&5669@#F6^T!ai%CANh}zur zcjcPpRyU;+V9^mwJC{cp1l~VLqw_A?E}oqY79mbM>PEvWe#6o__sP)nymu#*25^~Y zSVTes{eOJ#dj0>t-IQGTQBNrijcB_!ljrpeSl*x_lhCVFLPNrM%D@;+P=L8TKZ&5{ r1J;E+r4@qHLcsqg!~ZvMFrCqurqM(d=7AvRe?dT3%Sf|I!!GK7OX9?` literal 0 HcmV?d00001 diff --git a/src/mekanism/api/EnumGas.java b/src/minecraft/mekanism/api/EnumGas.java similarity index 100% rename from src/mekanism/api/EnumGas.java rename to src/minecraft/mekanism/api/EnumGas.java diff --git a/src/mekanism/api/IAccessibleGui.java b/src/minecraft/mekanism/api/IAccessibleGui.java similarity index 100% rename from src/mekanism/api/IAccessibleGui.java rename to src/minecraft/mekanism/api/IAccessibleGui.java diff --git a/src/mekanism/api/IActiveState.java b/src/minecraft/mekanism/api/IActiveState.java similarity index 100% rename from src/mekanism/api/IActiveState.java rename to src/minecraft/mekanism/api/IActiveState.java diff --git a/src/mekanism/api/IElectricMachine.java b/src/minecraft/mekanism/api/IElectricMachine.java similarity index 100% rename from src/mekanism/api/IElectricMachine.java rename to src/minecraft/mekanism/api/IElectricMachine.java diff --git a/src/mekanism/api/IEnergyCube.java b/src/minecraft/mekanism/api/IEnergyCube.java similarity index 100% rename from src/mekanism/api/IEnergyCube.java rename to src/minecraft/mekanism/api/IEnergyCube.java diff --git a/src/mekanism/api/IGasAcceptor.java b/src/minecraft/mekanism/api/IGasAcceptor.java similarity index 100% rename from src/mekanism/api/IGasAcceptor.java rename to src/minecraft/mekanism/api/IGasAcceptor.java diff --git a/src/mekanism/api/IGasStorage.java b/src/minecraft/mekanism/api/IGasStorage.java similarity index 100% rename from src/mekanism/api/IGasStorage.java rename to src/minecraft/mekanism/api/IGasStorage.java diff --git a/src/mekanism/api/IMachineUpgrade.java b/src/minecraft/mekanism/api/IMachineUpgrade.java similarity index 100% rename from src/mekanism/api/IMachineUpgrade.java rename to src/minecraft/mekanism/api/IMachineUpgrade.java diff --git a/src/mekanism/api/IStorageTank.java b/src/minecraft/mekanism/api/IStorageTank.java similarity index 100% rename from src/mekanism/api/IStorageTank.java rename to src/minecraft/mekanism/api/IStorageTank.java diff --git a/src/mekanism/api/ITileNetwork.java b/src/minecraft/mekanism/api/ITileNetwork.java similarity index 100% rename from src/mekanism/api/ITileNetwork.java rename to src/minecraft/mekanism/api/ITileNetwork.java diff --git a/src/mekanism/api/Infusion.java b/src/minecraft/mekanism/api/Infusion.java similarity index 100% rename from src/mekanism/api/Infusion.java rename to src/minecraft/mekanism/api/Infusion.java diff --git a/src/mekanism/api/InfusionType.java b/src/minecraft/mekanism/api/InfusionType.java similarity index 100% rename from src/mekanism/api/InfusionType.java rename to src/minecraft/mekanism/api/InfusionType.java diff --git a/src/mekanism/api/ItemMachineUpgrade.java b/src/minecraft/mekanism/api/ItemMachineUpgrade.java similarity index 100% rename from src/mekanism/api/ItemMachineUpgrade.java rename to src/minecraft/mekanism/api/ItemMachineUpgrade.java diff --git a/src/mekanism/api/ItemRetriever.java b/src/minecraft/mekanism/api/ItemRetriever.java similarity index 100% rename from src/mekanism/api/ItemRetriever.java rename to src/minecraft/mekanism/api/ItemRetriever.java diff --git a/src/mekanism/api/TabProxy.java b/src/minecraft/mekanism/api/TabProxy.java similarity index 100% rename from src/mekanism/api/TabProxy.java rename to src/minecraft/mekanism/api/TabProxy.java diff --git a/src/mekanism/api/Tier.java b/src/minecraft/mekanism/api/Tier.java similarity index 100% rename from src/mekanism/api/Tier.java rename to src/minecraft/mekanism/api/Tier.java diff --git a/src/minecraft/mekanism/client/BlockRenderingHandler.java b/src/minecraft/mekanism/client/BlockRenderingHandler.java new file mode 100644 index 000000000..b777da526 --- /dev/null +++ b/src/minecraft/mekanism/client/BlockRenderingHandler.java @@ -0,0 +1,125 @@ +package mekanism.client; + +import mekanism.common.BlockMachine.MachineType; +import mekanism.common.Mekanism; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.ForgeHooksClient; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + +public class BlockRenderingHandler implements ISimpleBlockRenderingHandler +{ + public ModelTheoreticalElementizer theoreticalElementizer = new ModelTheoreticalElementizer(); + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) + { + GL11.glPushMatrix(); + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + + if(block.blockID == Mekanism.machineBlockID) + { + if(metadata == MachineType.THEORETICAL_ELEMENTIZER.meta) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); + GL11.glTranslated(0.0F, -1.0F, 0.0F); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/TheoreticalElementizer.png")); + theoreticalElementizer.render(0.0625F); + } + else { + ForgeHooksClient.bindTexture(block.getTextureFile(), 0); + renderItem(renderer, metadata, block); + } + } + + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) + { + if(block.blockID == Mekanism.machineBlockID) + { + int metadata = world.getBlockMetadata(x, y, z); + + if(!MachineType.getFromMetadata(metadata).hasModel) + { + renderer.renderStandardBlock(block, x, y, z); + renderer.updateCustomBlockBounds(block); + return true; + } + } + + return false; + } + + @Override + public boolean shouldRender3DInInventory() + { + return true; + } + + @Override + public int getRenderId() + { + return ClientProxy.RENDER_ID; + } + + /** + * Cleaned-up snip of RenderBlocks.renderBlockAsItem() -- used for rendering an item as an entity, + * in a player's inventory, and in a player's hand. + * @param renderer - RenderBlocks renderer to render the item with + * @param metadata - block/item metadata + * @param block - block to render + */ + public void renderItem(RenderBlocks renderer, int metadata, Block block) + { + block.setBlockBoundsForItemRender(); + + renderer.updateCustomBlockBounds(block); + + if (renderer.useInventoryTint) + { + int renderColor = block.getRenderColor(metadata); + float red = (float)(renderColor >> 16 & 255) / 255.0F; + float green = (float)(renderColor >> 8 & 255) / 255.0F; + float blue = (float)(renderColor & 255) / 255.0F; + GL11.glColor4f(red, green, blue, 1.0F); + } + + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1.0F, 0.0F); + renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, metadata)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, metadata)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1.0F); + renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, metadata)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, metadata)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1.0F, 0.0F, 0.0F); + renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, metadata)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, metadata)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } +} diff --git a/src/mekanism/client/ClientProxy.java b/src/minecraft/mekanism/client/ClientProxy.java similarity index 85% rename from src/mekanism/client/ClientProxy.java rename to src/minecraft/mekanism/client/ClientProxy.java index a04604034..0c40d76b4 100644 --- a/src/mekanism/client/ClientProxy.java +++ b/src/minecraft/mekanism/client/ClientProxy.java @@ -13,6 +13,17 @@ import mekanism.common.TileEntityGasTank; import mekanism.common.TileEntityMetallurgicInfuser; import mekanism.common.TileEntitySmeltingFactory; import mekanism.common.TileEntityTheoreticalElementizer; +import mekanism.generators.client.ModelAdvancedSolarGenerator; +import mekanism.generators.client.RenderAdvancedSolarGenerator; +import mekanism.generators.client.RenderBioGenerator; +import mekanism.generators.client.RenderElectrolyticSeparator; +import mekanism.generators.client.RenderHeatGenerator; +import mekanism.generators.client.RenderHydrogenGenerator; +import mekanism.generators.common.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.TileEntityBioGenerator; +import mekanism.generators.common.TileEntityElectrolyticSeparator; +import mekanism.generators.common.TileEntityHeatGenerator; +import mekanism.generators.common.TileEntityHydrogenGenerator; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -20,6 +31,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.TextureFXManager; +import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; @@ -39,6 +51,12 @@ public class ClientProxy extends CommonProxy return RenderingRegistry.addNewArmourRendererPrefix(string); } + @Override + public void registerSpecialTileEntities() + { + ClientRegistry.registerTileEntity(TileEntityTheoreticalElementizer.class, "TheoreticalElementizer", new RenderTheoreticalElementizer()); + } + @Override public void registerRenderInformation() { @@ -76,6 +94,9 @@ public class ClientProxy extends CommonProxy //Register item handler MinecraftForgeClient.registerItemRenderer(Mekanism.energyCubeID, new ItemRenderingHandler()); + //Register block handler + RenderingRegistry.registerBlockHandler(new BlockRenderingHandler()); + System.out.println("[Mekanism] Render registrations complete."); } diff --git a/src/mekanism/client/ClientTickHandler.java b/src/minecraft/mekanism/client/ClientTickHandler.java similarity index 100% rename from src/mekanism/client/ClientTickHandler.java rename to src/minecraft/mekanism/client/ClientTickHandler.java diff --git a/src/mekanism/client/GuiAdvancedElectricMachine.java b/src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java similarity index 100% rename from src/mekanism/client/GuiAdvancedElectricMachine.java rename to src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java diff --git a/src/mekanism/client/GuiControlPanel.java b/src/minecraft/mekanism/client/GuiControlPanel.java similarity index 100% rename from src/mekanism/client/GuiControlPanel.java rename to src/minecraft/mekanism/client/GuiControlPanel.java diff --git a/src/mekanism/client/GuiCredits.java b/src/minecraft/mekanism/client/GuiCredits.java similarity index 100% rename from src/mekanism/client/GuiCredits.java rename to src/minecraft/mekanism/client/GuiCredits.java diff --git a/src/mekanism/client/GuiElectricMachine.java b/src/minecraft/mekanism/client/GuiElectricMachine.java similarity index 100% rename from src/mekanism/client/GuiElectricMachine.java rename to src/minecraft/mekanism/client/GuiElectricMachine.java diff --git a/src/mekanism/client/GuiEnergyCube.java b/src/minecraft/mekanism/client/GuiEnergyCube.java similarity index 100% rename from src/mekanism/client/GuiEnergyCube.java rename to src/minecraft/mekanism/client/GuiEnergyCube.java diff --git a/src/mekanism/client/GuiGasTank.java b/src/minecraft/mekanism/client/GuiGasTank.java similarity index 100% rename from src/mekanism/client/GuiGasTank.java rename to src/minecraft/mekanism/client/GuiGasTank.java diff --git a/src/mekanism/client/GuiMetallurgicInfuser.java b/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java similarity index 100% rename from src/mekanism/client/GuiMetallurgicInfuser.java rename to src/minecraft/mekanism/client/GuiMetallurgicInfuser.java diff --git a/src/mekanism/client/GuiSmeltingFactory.java b/src/minecraft/mekanism/client/GuiSmeltingFactory.java similarity index 100% rename from src/mekanism/client/GuiSmeltingFactory.java rename to src/minecraft/mekanism/client/GuiSmeltingFactory.java diff --git a/src/mekanism/client/GuiStopwatch.java b/src/minecraft/mekanism/client/GuiStopwatch.java similarity index 100% rename from src/mekanism/client/GuiStopwatch.java rename to src/minecraft/mekanism/client/GuiStopwatch.java diff --git a/src/mekanism/client/GuiTheoreticalElementizer.java b/src/minecraft/mekanism/client/GuiTheoreticalElementizer.java similarity index 100% rename from src/mekanism/client/GuiTheoreticalElementizer.java rename to src/minecraft/mekanism/client/GuiTheoreticalElementizer.java diff --git a/src/mekanism/client/GuiWeatherOrb.java b/src/minecraft/mekanism/client/GuiWeatherOrb.java similarity index 100% rename from src/mekanism/client/GuiWeatherOrb.java rename to src/minecraft/mekanism/client/GuiWeatherOrb.java diff --git a/src/mekanism/client/ItemRenderingHandler.java b/src/minecraft/mekanism/client/ItemRenderingHandler.java similarity index 100% rename from src/mekanism/client/ItemRenderingHandler.java rename to src/minecraft/mekanism/client/ItemRenderingHandler.java diff --git a/src/minecraft/mekanism/client/ModelTheoreticalElementizer.java b/src/minecraft/mekanism/client/ModelTheoreticalElementizer.java new file mode 100644 index 000000000..41859ae69 --- /dev/null +++ b/src/minecraft/mekanism/client/ModelTheoreticalElementizer.java @@ -0,0 +1,200 @@ +package mekanism.client; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelTheoreticalElementizer extends ModelBase +{ + ModelRenderer A; + ModelRenderer B; + ModelRenderer C; + ModelRenderer DROT; + ModelRenderer E; + ModelRenderer F; + ModelRenderer G; + ModelRenderer H; + ModelRenderer I; + ModelRenderer J; + ModelRenderer K; + ModelRenderer L; + ModelRenderer M; + ModelRenderer N; + ModelRenderer O; + ModelRenderer P; + ModelRenderer Q; + ModelRenderer R; + + public ModelTheoreticalElementizer() + { + textureWidth = 128; + textureHeight = 128; + + A = new ModelRenderer(this, 0, 0); + A.addBox(-8F, 0F, -8F, 16, 1, 16); + A.setRotationPoint(0F, 23F, 0F); + A.setTextureSize(64, 32); + A.mirror = true; + setRotation(A, 0F, 0F, 0F); + B = new ModelRenderer(this, 0, 40); + B.addBox(-5F, 0F, -4F, 10, 10, 8); + B.setRotationPoint(0F, 13F, 0F); + B.setTextureSize(64, 32); + B.mirror = true; + setRotation(B, 0F, 0F, 0F); + C = new ModelRenderer(this, 0, 19); + C.addBox(-3F, 0F, -3F, 6, 14, 6); + C.setRotationPoint(0F, 8F, 0F); + C.setTextureSize(64, 32); + C.mirror = true; + setRotation(C, 0F, 0F, 0F); + DROT = new ModelRenderer(this, 5, 0); + DROT.addBox(-1F, -1F, -1F, 2, 2, 2); + DROT.setRotationPoint(0F, 5F, 0F); + DROT.setTextureSize(64, 32); + DROT.mirror = true; + setRotation(DROT, 0.7853982F, 0.7853982F, 0.7853982F); + E = new ModelRenderer(this, 65, 0); + E.addBox(-2F, 0F, 2F, 4, 8, 7); + E.setRotationPoint(0F, 15F, 0F); + E.setTextureSize(64, 32); + E.mirror = true; + setRotation(E, 0F, 0.7853982F, 0F); + F = new ModelRenderer(this, 65, 0); + F.addBox(-2F, 0F, 2F, 4, 8, 7); + F.setRotationPoint(0F, 15F, 0F); + F.setTextureSize(64, 32); + F.mirror = true; + setRotation(F, 0F, -0.7853982F, 0F); + G = new ModelRenderer(this, 0, 0); + G.addBox(6F, 0F, 0F, 1, 4, 1); + G.setRotationPoint(0F, 19F, -2F); + G.setTextureSize(64, 32); + G.mirror = true; + setRotation(G, 0F, 0F, 0F); + H = new ModelRenderer(this, 0, 6); + H.addBox(5F, 0F, 0F, 1, 1, 1); + H.setRotationPoint(0F, 19F, -2F); + H.setTextureSize(64, 32); + H.mirror = true; + setRotation(H, 0F, 0F, 0F); + I = new ModelRenderer(this, 0, 6); + I.addBox(5F, 0F, 0F, 1, 1, 1); + I.setRotationPoint(0F, 19F, 0F); + I.setTextureSize(64, 32); + I.mirror = true; + setRotation(I, 0F, 0F, 0F); + J = new ModelRenderer(this, 0, 0); + J.addBox(6F, 0F, 0F, 1, 4, 1); + J.setRotationPoint(0F, 19F, 0F); + J.setTextureSize(64, 32); + J.mirror = true; + setRotation(J, 0F, 0F, 0F); + K = new ModelRenderer(this, 21, 61); + K.addBox(0F, -1F, -4F, 2, 9, 5); + K.setRotationPoint(-7F, 15F, 1F); + K.setTextureSize(64, 32); + K.mirror = true; + setRotation(K, 0F, 0F, 0F); + L = new ModelRenderer(this, 21, 77); + L.addBox(0F, -1F, -1F, 1, 2, 2); + L.setRotationPoint(-8F, 16F, 0F); + L.setTextureSize(64, 32); + L.mirror = true; + setRotation(L, 0F, 0F, 0F); + M = new ModelRenderer(this, 0, 61); + M.addBox(-4F, 0F, 0F, 8, 10, 0); + M.setRotationPoint(0F, 3F, 0F); + M.setTextureSize(64, 32); + M.mirror = true; + setRotation(M, 0F, 0.7853982F, 0F); + N = new ModelRenderer(this, 0, 73); + N.addBox(-4F, 0F, 0F, 8, 10, 0); + N.setRotationPoint(0F, 3F, 0F); + N.setTextureSize(64, 32); + N.mirror = true; + setRotation(N, 0F, -0.7853982F, 0F); + O = new ModelRenderer(this, 0, 93); + O.addBox(-5F, -5F, 0F, 6, 6, 0); + O.setRotationPoint(0F, 6F, 0F); + O.setTextureSize(64, 32); + O.mirror = true; + setRotation(O, 0F, -0.7853982F, 0.7853982F); + P = new ModelRenderer(this, 0, 85); + P.addBox(-5F, -5F, 0F, 6, 6, 0); + P.setRotationPoint(0F, 6F, 0F); + P.setTextureSize(64, 32); + P.mirror = true; + setRotation(P, 0F, 0.7853982F, 0.7853982F); + Q = new ModelRenderer(this, 65, 17); + Q.addBox(-4F, 0F, 0F, 8, 6, 4); + Q.setRotationPoint(0F, 17F, -8F); + Q.setTextureSize(64, 32); + Q.mirror = true; + setRotation(Q, 0F, 0F, 0F); + R = new ModelRenderer(this, 65, 28); + R.addBox(-4F, 0F, 0F, 8, 3, 5); + R.setRotationPoint(0F, 17F, -8F); + R.setTextureSize(64, 32); + R.mirror = true; + setRotation(R, 0.5934119F, 0F, 0F); + } + + public void render(float size) + { + A.render(size); + B.render(size); + C.render(size); + DROT.render(size); + E.render(size); + F.render(size); + G.render(size); + H.render(size); + I.render(size); + J.render(size); + K.render(size); + L.render(size); + M.render(size); + N.render(size); + O.render(size); + P.render(size); + Q.render(size); + R.render(size); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + A.render(f5); + B.render(f5); + C.render(f5); + DROT.render(f5); + E.render(f5); + F.render(f5); + G.render(f5); + H.render(f5); + I.render(f5); + J.render(f5); + K.render(f5); + L.render(f5); + M.render(f5); + N.render(f5); + O.render(f5); + P.render(f5); + Q.render(f5); + R.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } +} \ No newline at end of file diff --git a/src/mekanism/client/RenderObsidianTNT.java b/src/minecraft/mekanism/client/RenderObsidianTNT.java similarity index 100% rename from src/mekanism/client/RenderObsidianTNT.java rename to src/minecraft/mekanism/client/RenderObsidianTNT.java diff --git a/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java b/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java new file mode 100644 index 000000000..8d835aafe --- /dev/null +++ b/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java @@ -0,0 +1,38 @@ +package mekanism.client; + +import mekanism.common.TileEntityTheoreticalElementizer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +public class RenderTheoreticalElementizer extends TileEntitySpecialRenderer +{ + private ModelTheoreticalElementizer model = new ModelTheoreticalElementizer(); + + public void renderTileEntityAt(TileEntity var1, double var2, double var4, double var6, float var8) + { + renderAModelAt((TileEntityTheoreticalElementizer) var1, var2, var4, var6, 1F); + } + + private void renderAModelAt(TileEntityTheoreticalElementizer tileEntity, double x, double y, double z, float f) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f); + bindTextureByName("/resources/mekanism/render/TheoreticalElementizer.png"); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); + GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + model.render(0.0625F); + GL11.glPopMatrix(); + } +} diff --git a/src/mekanism/client/Sound.java b/src/minecraft/mekanism/client/Sound.java similarity index 100% rename from src/mekanism/client/Sound.java rename to src/minecraft/mekanism/client/Sound.java diff --git a/src/mekanism/client/SoundHandler.java b/src/minecraft/mekanism/client/SoundHandler.java similarity index 100% rename from src/mekanism/client/SoundHandler.java rename to src/minecraft/mekanism/client/SoundHandler.java diff --git a/src/mekanism/client/TextureAnimatedFX.java b/src/minecraft/mekanism/client/TextureAnimatedFX.java similarity index 100% rename from src/mekanism/client/TextureAnimatedFX.java rename to src/minecraft/mekanism/client/TextureAnimatedFX.java diff --git a/src/mekanism/client/ThreadClientUpdate.java b/src/minecraft/mekanism/client/ThreadClientUpdate.java similarity index 100% rename from src/mekanism/client/ThreadClientUpdate.java rename to src/minecraft/mekanism/client/ThreadClientUpdate.java diff --git a/src/mekanism/client/ThreadSendData.java b/src/minecraft/mekanism/client/ThreadSendData.java similarity index 100% rename from src/mekanism/client/ThreadSendData.java rename to src/minecraft/mekanism/client/ThreadSendData.java diff --git a/src/mekanism/common/BlockBasic.java b/src/minecraft/mekanism/common/BlockBasic.java similarity index 100% rename from src/mekanism/common/BlockBasic.java rename to src/minecraft/mekanism/common/BlockBasic.java diff --git a/src/mekanism/common/BlockEnergyCube.java b/src/minecraft/mekanism/common/BlockEnergyCube.java similarity index 100% rename from src/mekanism/common/BlockEnergyCube.java rename to src/minecraft/mekanism/common/BlockEnergyCube.java diff --git a/src/mekanism/common/BlockGasTank.java b/src/minecraft/mekanism/common/BlockGasTank.java similarity index 100% rename from src/mekanism/common/BlockGasTank.java rename to src/minecraft/mekanism/common/BlockGasTank.java diff --git a/src/mekanism/common/BlockMachine.java b/src/minecraft/mekanism/common/BlockMachine.java similarity index 94% rename from src/mekanism/common/BlockMachine.java rename to src/minecraft/mekanism/common/BlockMachine.java index f5cde35a6..a8eeb60e1 100644 --- a/src/mekanism/common/BlockMachine.java +++ b/src/minecraft/mekanism/common/BlockMachine.java @@ -3,6 +3,7 @@ package mekanism.common; import java.util.List; import java.util.Random; +import mekanism.client.ClientProxy; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -422,28 +423,49 @@ public class BlockMachine extends BlockContainer { return null; } + + @Override + public boolean renderAsNormalBlock() + { + return false; + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public int getRenderType() + { + return ClientProxy.RENDER_ID; + } public static enum MachineType { - ENRICHMENT_CHAMBER(0, 3, TileEntityEnrichmentChamber.class), - PLATINUM_COMPRESSOR(1, 4, TileEntityPlatinumCompressor.class), - COMBINER(2, 5, TileEntityCombiner.class), - CRUSHER(3, 6, TileEntityCrusher.class), - THEORETICAL_ELEMENTIZER(4, 7, TileEntityTheoreticalElementizer.class), - BASIC_SMELTING_FACTORY(5, 11, TileEntitySmeltingFactory.class), - ADVANCED_SMELTING_FACTORY(6, 11, TileEntityAdvancedSmeltingFactory.class), - ULTIMATE_SMELTING_FACTORY(7, 11, TileEntityUltimateSmeltingFactory.class), - METALLURGIC_INFUSER(8, 12, TileEntityMetallurgicInfuser.class); + ENRICHMENT_CHAMBER(0, 3, TileEntityEnrichmentChamber.class, false), + PLATINUM_COMPRESSOR(1, 4, TileEntityPlatinumCompressor.class, false), + COMBINER(2, 5, TileEntityCombiner.class, false), + CRUSHER(3, 6, TileEntityCrusher.class, false), + THEORETICAL_ELEMENTIZER(4, 7, TileEntityTheoreticalElementizer.class, true), + BASIC_SMELTING_FACTORY(5, 11, TileEntitySmeltingFactory.class, false), + ADVANCED_SMELTING_FACTORY(6, 11, TileEntityAdvancedSmeltingFactory.class, false), + ULTIMATE_SMELTING_FACTORY(7, 11, TileEntityUltimateSmeltingFactory.class, false), + METALLURGIC_INFUSER(8, 12, TileEntityMetallurgicInfuser.class, false); public int meta; public int guiId; public Class tileEntityClass; + public boolean hasModel; - private MachineType(int i, int j, Class tileClass) + private MachineType(int i, int j, Class tileClass, boolean model) { meta = i; guiId = j; tileEntityClass = tileClass; + hasModel = model; } public static MachineType getFromMetadata(int meta) diff --git a/src/mekanism/common/BlockObsidianTNT.java b/src/minecraft/mekanism/common/BlockObsidianTNT.java similarity index 100% rename from src/mekanism/common/BlockObsidianTNT.java rename to src/minecraft/mekanism/common/BlockObsidianTNT.java diff --git a/src/mekanism/common/BlockOre.java b/src/minecraft/mekanism/common/BlockOre.java similarity index 100% rename from src/mekanism/common/BlockOre.java rename to src/minecraft/mekanism/common/BlockOre.java diff --git a/src/mekanism/common/CommandMekanism.java b/src/minecraft/mekanism/common/CommandMekanism.java similarity index 100% rename from src/mekanism/common/CommandMekanism.java rename to src/minecraft/mekanism/common/CommandMekanism.java diff --git a/src/mekanism/common/CommonProxy.java b/src/minecraft/mekanism/common/CommonProxy.java similarity index 100% rename from src/mekanism/common/CommonProxy.java rename to src/minecraft/mekanism/common/CommonProxy.java diff --git a/src/mekanism/common/ContainerAdvancedElectricMachine.java b/src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java similarity index 100% rename from src/mekanism/common/ContainerAdvancedElectricMachine.java rename to src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java diff --git a/src/mekanism/common/ContainerElectricMachine.java b/src/minecraft/mekanism/common/ContainerElectricMachine.java similarity index 100% rename from src/mekanism/common/ContainerElectricMachine.java rename to src/minecraft/mekanism/common/ContainerElectricMachine.java diff --git a/src/mekanism/common/ContainerEnergyCube.java b/src/minecraft/mekanism/common/ContainerEnergyCube.java similarity index 100% rename from src/mekanism/common/ContainerEnergyCube.java rename to src/minecraft/mekanism/common/ContainerEnergyCube.java diff --git a/src/mekanism/common/ContainerGasTank.java b/src/minecraft/mekanism/common/ContainerGasTank.java similarity index 100% rename from src/mekanism/common/ContainerGasTank.java rename to src/minecraft/mekanism/common/ContainerGasTank.java diff --git a/src/mekanism/common/ContainerMetallurgicInfuser.java b/src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java similarity index 100% rename from src/mekanism/common/ContainerMetallurgicInfuser.java rename to src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java diff --git a/src/mekanism/common/ContainerSmeltingFactory.java b/src/minecraft/mekanism/common/ContainerSmeltingFactory.java similarity index 100% rename from src/mekanism/common/ContainerSmeltingFactory.java rename to src/minecraft/mekanism/common/ContainerSmeltingFactory.java diff --git a/src/mekanism/common/CoreGuiHandler.java b/src/minecraft/mekanism/common/CoreGuiHandler.java similarity index 100% rename from src/mekanism/common/CoreGuiHandler.java rename to src/minecraft/mekanism/common/CoreGuiHandler.java diff --git a/src/mekanism/common/CreativeTabMekanism.java b/src/minecraft/mekanism/common/CreativeTabMekanism.java similarity index 100% rename from src/mekanism/common/CreativeTabMekanism.java rename to src/minecraft/mekanism/common/CreativeTabMekanism.java diff --git a/src/mekanism/common/DamageSourceMekanism.java b/src/minecraft/mekanism/common/DamageSourceMekanism.java similarity index 100% rename from src/mekanism/common/DamageSourceMekanism.java rename to src/minecraft/mekanism/common/DamageSourceMekanism.java diff --git a/src/mekanism/common/EntityObsidianTNT.java b/src/minecraft/mekanism/common/EntityObsidianTNT.java similarity index 100% rename from src/mekanism/common/EntityObsidianTNT.java rename to src/minecraft/mekanism/common/EntityObsidianTNT.java diff --git a/src/mekanism/common/EnumColor.java b/src/minecraft/mekanism/common/EnumColor.java similarity index 100% rename from src/mekanism/common/EnumColor.java rename to src/minecraft/mekanism/common/EnumColor.java diff --git a/src/mekanism/common/EnumPacketType.java b/src/minecraft/mekanism/common/EnumPacketType.java similarity index 100% rename from src/mekanism/common/EnumPacketType.java rename to src/minecraft/mekanism/common/EnumPacketType.java diff --git a/src/mekanism/common/EnumWeatherType.java b/src/minecraft/mekanism/common/EnumWeatherType.java similarity index 100% rename from src/mekanism/common/EnumWeatherType.java rename to src/minecraft/mekanism/common/EnumWeatherType.java diff --git a/src/mekanism/common/ItemAtomicDisassembler.java b/src/minecraft/mekanism/common/ItemAtomicDisassembler.java similarity index 100% rename from src/mekanism/common/ItemAtomicDisassembler.java rename to src/minecraft/mekanism/common/ItemAtomicDisassembler.java diff --git a/src/mekanism/common/ItemBlockBasic.java b/src/minecraft/mekanism/common/ItemBlockBasic.java similarity index 100% rename from src/mekanism/common/ItemBlockBasic.java rename to src/minecraft/mekanism/common/ItemBlockBasic.java diff --git a/src/mekanism/common/ItemBlockEnergyCube.java b/src/minecraft/mekanism/common/ItemBlockEnergyCube.java similarity index 100% rename from src/mekanism/common/ItemBlockEnergyCube.java rename to src/minecraft/mekanism/common/ItemBlockEnergyCube.java diff --git a/src/mekanism/common/ItemBlockMachine.java b/src/minecraft/mekanism/common/ItemBlockMachine.java similarity index 100% rename from src/mekanism/common/ItemBlockMachine.java rename to src/minecraft/mekanism/common/ItemBlockMachine.java diff --git a/src/mekanism/common/ItemBlockOre.java b/src/minecraft/mekanism/common/ItemBlockOre.java similarity index 100% rename from src/mekanism/common/ItemBlockOre.java rename to src/minecraft/mekanism/common/ItemBlockOre.java diff --git a/src/mekanism/common/ItemDust.java b/src/minecraft/mekanism/common/ItemDust.java similarity index 100% rename from src/mekanism/common/ItemDust.java rename to src/minecraft/mekanism/common/ItemDust.java diff --git a/src/mekanism/common/ItemElectricBow.java b/src/minecraft/mekanism/common/ItemElectricBow.java similarity index 100% rename from src/mekanism/common/ItemElectricBow.java rename to src/minecraft/mekanism/common/ItemElectricBow.java diff --git a/src/mekanism/common/ItemEnergized.java b/src/minecraft/mekanism/common/ItemEnergized.java similarity index 100% rename from src/mekanism/common/ItemEnergized.java rename to src/minecraft/mekanism/common/ItemEnergized.java diff --git a/src/mekanism/common/ItemIngot.java b/src/minecraft/mekanism/common/ItemIngot.java similarity index 100% rename from src/mekanism/common/ItemIngot.java rename to src/minecraft/mekanism/common/ItemIngot.java diff --git a/src/mekanism/common/ItemLightningRod.java b/src/minecraft/mekanism/common/ItemLightningRod.java similarity index 100% rename from src/mekanism/common/ItemLightningRod.java rename to src/minecraft/mekanism/common/ItemLightningRod.java diff --git a/src/mekanism/common/ItemMekanism.java b/src/minecraft/mekanism/common/ItemMekanism.java similarity index 100% rename from src/mekanism/common/ItemMekanism.java rename to src/minecraft/mekanism/common/ItemMekanism.java diff --git a/src/mekanism/common/ItemStopwatch.java b/src/minecraft/mekanism/common/ItemStopwatch.java similarity index 100% rename from src/mekanism/common/ItemStopwatch.java rename to src/minecraft/mekanism/common/ItemStopwatch.java diff --git a/src/mekanism/common/ItemStorageTank.java b/src/minecraft/mekanism/common/ItemStorageTank.java similarity index 100% rename from src/mekanism/common/ItemStorageTank.java rename to src/minecraft/mekanism/common/ItemStorageTank.java diff --git a/src/mekanism/common/ItemWeatherOrb.java b/src/minecraft/mekanism/common/ItemWeatherOrb.java similarity index 100% rename from src/mekanism/common/ItemWeatherOrb.java rename to src/minecraft/mekanism/common/ItemWeatherOrb.java diff --git a/src/mekanism/common/LiquidSlot.java b/src/minecraft/mekanism/common/LiquidSlot.java similarity index 100% rename from src/mekanism/common/LiquidSlot.java rename to src/minecraft/mekanism/common/LiquidSlot.java diff --git a/src/mekanism/common/MachineryManager.java b/src/minecraft/mekanism/common/MachineryManager.java similarity index 100% rename from src/mekanism/common/MachineryManager.java rename to src/minecraft/mekanism/common/MachineryManager.java diff --git a/src/mekanism/common/Mekanism.java b/src/minecraft/mekanism/common/Mekanism.java similarity index 98% rename from src/mekanism/common/Mekanism.java rename to src/minecraft/mekanism/common/Mekanism.java index 7a362c0df..ac9aed3ae 100644 --- a/src/mekanism/common/Mekanism.java +++ b/src/minecraft/mekanism/common/Mekanism.java @@ -218,7 +218,7 @@ public class Mekanism "ERA", "RDR", "ARS", Character.valueOf('E'), EnergyUpgrade, Character.valueOf('R'), Item.redstone, Character.valueOf('A'), EnrichedAlloy, Character.valueOf('D'), Item.diamond, Character.valueOf('S'), SpeedUpgrade })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(AtomicCore), new Object[] { - "AOA", "PDP", "AOA", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('O'), "dustObsidian", Character.valueOf('P'), new ItemStack(Dust, 1, 2), Character.valueOf('D'), Item.diamond + "AOA", "PDP", "AOA", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('O'), "dustObsidian", Character.valueOf('P'), "dustPlatinum", Character.valueOf('D'), Item.diamond })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(AtomicDisassembler.getUnchargedItem(), new Object[] { "AEA", "ACA", " O ", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('C'), AtomicCore, Character.valueOf('O'), "ingotObsidian" @@ -242,7 +242,7 @@ public class Mekanism "EDE", "TAT", "EDE", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('D'), Item.diamond, Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('A'), MekanismUtils.getEnergyCubeWithTier(EnergyCubeTier.ADVANCED) })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ControlCircuit), new Object[] { - " P ", "PEP", " P ", Character.valueOf('P'), new ItemStack(Ingot, 1, 1), Character.valueOf('E'), EnrichedAlloy + " P ", "PEP", " P ", Character.valueOf('P'), "ingotPlatinum", Character.valueOf('E'), EnrichedAlloy })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(EnrichedIron, 2), new Object[] { "A", "I", "A", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('I'), "dustIron" @@ -275,11 +275,12 @@ public class Mekanism //Furnace Recipes FurnaceRecipes.smelting().addSmelting(oreBlockID, 0, new ItemStack(Ingot, 1, 1), 1.0F); - FurnaceRecipes.smelting().addSmelting(EnrichedIron.shiftedIndex, 0, new ItemStack(EnrichedAlloy), 1.0F); FurnaceRecipes.smelting().addSmelting(Dust.shiftedIndex, 2, new ItemStack(Ingot, 1, 1), 1.0F); FurnaceRecipes.smelting().addSmelting(Dust.shiftedIndex, 0, new ItemStack(Item.ingotIron), 1.0F); FurnaceRecipes.smelting().addSmelting(Dust.shiftedIndex, 1, new ItemStack(Item.ingotGold), 1.0F); FurnaceRecipes.smelting().addSmelting(Dust.shiftedIndex, 5, new ItemStack(Ingot, 1, 4), 1.0F); + GameRegistry.addSmelting(Item.coal.shiftedIndex, new ItemStack(CompressedCarbon), 1.0F); + GameRegistry.addSmelting(EnrichedIron.shiftedIndex, new ItemStack(EnrichedAlloy), 1.0F); //Enrichment Chamber Recipes RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Dust, 1, 4), new ItemStack(Item.diamond)); @@ -288,7 +289,7 @@ public class Mekanism RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreIron), new ItemStack(Dust, 2, 0)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreGold), new ItemStack(Dust, 2, 1)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(EnrichedIron, 2), new ItemStack(Dust, 1, 2)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Item.coal, 4), new ItemStack(CompressedCarbon)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Item.coal, 4), new ItemStack(CompressedCarbon, 8)); //Platinum Compressor Recipes RecipeHandler.addPlatinumCompressorRecipe(new ItemStack(Item.redstone), new ItemStack(Ingot, 1, 2)); @@ -610,7 +611,7 @@ public class Mekanism try { for(ItemStack ore : OreDictionary.getOres("ingotCopper")) { - RecipeHandler.addMetallurgicInfuserRecipe(Infusion.getInfusion(InfusionType.TIN, ore), OreDictionary.getOres("ingotBronze").get(0)); + RecipeHandler.addMetallurgicInfuserRecipe(Infusion.getInfusion(InfusionType.TIN, ore), MekanismUtils.getStackWithSize(OreDictionary.getOres("ingotBronze").get(0), 1)); } } catch(Exception e) {} @@ -652,7 +653,6 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityPlatinumCompressor.class, "PlatinumCompressor"); GameRegistry.registerTileEntity(TileEntityCombiner.class, "Combiner"); GameRegistry.registerTileEntity(TileEntityCrusher.class, "Crusher"); - GameRegistry.registerTileEntity(TileEntityTheoreticalElementizer.class, "TheoreticalElementizer"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); GameRegistry.registerTileEntity(TileEntityMulti.class, "Multi"); GameRegistry.registerTileEntity(TileEntityControlPanel.class, "ControlPanel"); diff --git a/src/mekanism/common/MekanismHooks.java b/src/minecraft/mekanism/common/MekanismHooks.java similarity index 91% rename from src/mekanism/common/MekanismHooks.java rename to src/minecraft/mekanism/common/MekanismHooks.java index 195a605c2..4d4fff1d8 100644 --- a/src/mekanism/common/MekanismHooks.java +++ b/src/minecraft/mekanism/common/MekanismHooks.java @@ -2,6 +2,7 @@ package mekanism.common; import cpw.mods.fml.common.Loader; import ic2.api.Ic2Recipes; +import ic2.api.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.src.*; @@ -48,7 +49,7 @@ public final class MekanismHooks if(Loader.isModLoaded("IC2")) IC2Loaded = true; if(Loader.isModLoaded("Railcraft")) RailcraftLoaded = true; if(Loader.isModLoaded("BasicComponents")) BasicComponentsLoaded = true; - if(Loader.isModLoaded("BuildCraft")) BuildCraftLoaded = true; + if(Loader.isModLoaded("BuildCraft|Energy")) BuildCraftLoaded = true; if(Loader.isModLoaded("Forestry")) ForestryLoaded = true; if(IC2Loaded) @@ -94,14 +95,13 @@ public final class MekanismHooks /** * Gets an object out of the class Ic2Items. * @param name - name of the item - * @param test - whether or not this is a test * @return the object */ public ItemStack getIC2Item(String name) { try { - if(Ic2Items == null) Ic2Items = Class.forName("ic2.common.Ic2Items"); - if(Ic2Items == null) Ic2Items = Class.forName("net.minecraft.src.ic2.common.Ic2Items"); + if(Ic2Items == null) Ic2Items = Class.forName("ic2.core.Ic2Items"); + if(Ic2Items == null) Ic2Items = Class.forName("net.minecraft.src.ic2.core.Ic2Items"); Object ret = Ic2Items.getField(name).get(null); if(ret instanceof ItemStack) @@ -109,7 +109,7 @@ public final class MekanismHooks return (ItemStack)ret; } else { - throw new Exception(); + throw new Exception("not instanceof ItemStack"); } } catch(Exception e) { System.out.println("[Mekanism] Unable to retrieve IC2 item " + name + "."); @@ -129,10 +129,10 @@ public final class MekanismHooks return new ItemStack((Item)ret); } else { - throw new Exception(); + throw new Exception("not instanceof ItemStack"); } } catch(Exception e) { - System.out.println("[Mekanism] Unable to retrieve IC2 item " + name + "."); + System.out.println("[Mekanism] Unable to retrieve BuildCraft item " + name + "."); return null; } } @@ -149,7 +149,7 @@ public final class MekanismHooks return new ItemStack((Item)ret); } else { - throw new Exception(); + throw new Exception("not instanceof ItemStack"); } } catch(Exception e) { System.out.println("[Mekanism] Unable to retrieve Forestry item " + name + "."); diff --git a/src/mekanism/common/MekanismUtils.java b/src/minecraft/mekanism/common/MekanismUtils.java similarity index 100% rename from src/mekanism/common/MekanismUtils.java rename to src/minecraft/mekanism/common/MekanismUtils.java diff --git a/src/mekanism/common/OreHandler.java b/src/minecraft/mekanism/common/OreHandler.java similarity index 100% rename from src/mekanism/common/OreHandler.java rename to src/minecraft/mekanism/common/OreHandler.java diff --git a/src/mekanism/common/PacketHandler.java b/src/minecraft/mekanism/common/PacketHandler.java similarity index 100% rename from src/mekanism/common/PacketHandler.java rename to src/minecraft/mekanism/common/PacketHandler.java diff --git a/src/mekanism/common/RecipeHandler.java b/src/minecraft/mekanism/common/RecipeHandler.java similarity index 100% rename from src/mekanism/common/RecipeHandler.java rename to src/minecraft/mekanism/common/RecipeHandler.java diff --git a/src/mekanism/common/ServerCommandHandler.java b/src/minecraft/mekanism/common/ServerCommandHandler.java similarity index 100% rename from src/mekanism/common/ServerCommandHandler.java rename to src/minecraft/mekanism/common/ServerCommandHandler.java diff --git a/src/mekanism/common/SlotEnergy.java b/src/minecraft/mekanism/common/SlotEnergy.java similarity index 100% rename from src/mekanism/common/SlotEnergy.java rename to src/minecraft/mekanism/common/SlotEnergy.java diff --git a/src/mekanism/common/SlotMachineUpgrade.java b/src/minecraft/mekanism/common/SlotMachineUpgrade.java similarity index 100% rename from src/mekanism/common/SlotMachineUpgrade.java rename to src/minecraft/mekanism/common/SlotMachineUpgrade.java diff --git a/src/mekanism/common/SlotStorageTank.java b/src/minecraft/mekanism/common/SlotStorageTank.java similarity index 100% rename from src/mekanism/common/SlotStorageTank.java rename to src/minecraft/mekanism/common/SlotStorageTank.java diff --git a/src/mekanism/common/ThreadGetData.java b/src/minecraft/mekanism/common/ThreadGetData.java similarity index 100% rename from src/mekanism/common/ThreadGetData.java rename to src/minecraft/mekanism/common/ThreadGetData.java diff --git a/src/mekanism/common/TileEntityAdvancedElectricMachine.java b/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java similarity index 100% rename from src/mekanism/common/TileEntityAdvancedElectricMachine.java rename to src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java diff --git a/src/mekanism/common/TileEntityAdvancedSmeltingFactory.java b/src/minecraft/mekanism/common/TileEntityAdvancedSmeltingFactory.java similarity index 100% rename from src/mekanism/common/TileEntityAdvancedSmeltingFactory.java rename to src/minecraft/mekanism/common/TileEntityAdvancedSmeltingFactory.java diff --git a/src/mekanism/common/TileEntityBasicBlock.java b/src/minecraft/mekanism/common/TileEntityBasicBlock.java similarity index 100% rename from src/mekanism/common/TileEntityBasicBlock.java rename to src/minecraft/mekanism/common/TileEntityBasicBlock.java diff --git a/src/mekanism/common/TileEntityBasicMachine.java b/src/minecraft/mekanism/common/TileEntityBasicMachine.java similarity index 96% rename from src/mekanism/common/TileEntityBasicMachine.java rename to src/minecraft/mekanism/common/TileEntityBasicMachine.java index f5ee577df..ee8fa82d9 100644 --- a/src/mekanism/common/TileEntityBasicMachine.java +++ b/src/minecraft/mekanism/common/TileEntityBasicMachine.java @@ -1,7 +1,6 @@ package mekanism.common; import ic2.api.Direction; -import ic2.api.energy.event.EnergyTileSinkEvent; import ic2.api.energy.tile.IEnergySink; import java.util.EnumSet; @@ -92,11 +91,6 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp registered = true; } - if(demandsEnergy()) - { - MinecraftForge.EVENT_BUS.post(new EnergyTileSinkEvent(this, (int)((MAX_ELECTRICITY-electricityStored)*Mekanism.TO_IC2))); - } - if(!worldObj.isRemote) { for(ForgeDirection direction : ForgeDirection.values()) @@ -193,9 +187,15 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp } @Override - public boolean demandsEnergy() + public int getMaxSafeInput() { - return electricityStored < currentMaxElectricity; + return 2048; + } + + @Override + public int demandsEnergy() + { + return (int)((currentMaxElectricity - electricityStored)*Mekanism.TO_IC2); } @Override diff --git a/src/mekanism/common/TileEntityCombiner.java b/src/minecraft/mekanism/common/TileEntityCombiner.java similarity index 100% rename from src/mekanism/common/TileEntityCombiner.java rename to src/minecraft/mekanism/common/TileEntityCombiner.java diff --git a/src/mekanism/common/TileEntityContainerBlock.java b/src/minecraft/mekanism/common/TileEntityContainerBlock.java similarity index 100% rename from src/mekanism/common/TileEntityContainerBlock.java rename to src/minecraft/mekanism/common/TileEntityContainerBlock.java diff --git a/src/mekanism/common/TileEntityControlPanel.java b/src/minecraft/mekanism/common/TileEntityControlPanel.java similarity index 100% rename from src/mekanism/common/TileEntityControlPanel.java rename to src/minecraft/mekanism/common/TileEntityControlPanel.java diff --git a/src/mekanism/common/TileEntityCrusher.java b/src/minecraft/mekanism/common/TileEntityCrusher.java similarity index 100% rename from src/mekanism/common/TileEntityCrusher.java rename to src/minecraft/mekanism/common/TileEntityCrusher.java diff --git a/src/mekanism/common/TileEntityElectricBlock.java b/src/minecraft/mekanism/common/TileEntityElectricBlock.java similarity index 99% rename from src/mekanism/common/TileEntityElectricBlock.java rename to src/minecraft/mekanism/common/TileEntityElectricBlock.java index 9a780bd5a..996776141 100644 --- a/src/mekanism/common/TileEntityElectricBlock.java +++ b/src/minecraft/mekanism/common/TileEntityElectricBlock.java @@ -96,6 +96,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i nbtTags.setDouble("electricityStored", electricityStored); } + @Override public boolean isAddedToEnergyNet() { return initialized; diff --git a/src/mekanism/common/TileEntityElectricMachine.java b/src/minecraft/mekanism/common/TileEntityElectricMachine.java similarity index 100% rename from src/mekanism/common/TileEntityElectricMachine.java rename to src/minecraft/mekanism/common/TileEntityElectricMachine.java diff --git a/src/mekanism/common/TileEntityEnergyCube.java b/src/minecraft/mekanism/common/TileEntityEnergyCube.java similarity index 98% rename from src/mekanism/common/TileEntityEnergyCube.java rename to src/minecraft/mekanism/common/TileEntityEnergyCube.java index 94618132e..ef5f7309d 100644 --- a/src/mekanism/common/TileEntityEnergyCube.java +++ b/src/minecraft/mekanism/common/TileEntityEnergyCube.java @@ -260,9 +260,9 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn } @Override - public boolean demandsEnergy() + public int demandsEnergy() { - return electricityStored < tier.MAX_ELECTRICITY; + return (int)((tier.MAX_ELECTRICITY - electricityStored)*Mekanism.TO_IC2); } @Override @@ -460,6 +460,12 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn { PacketHandler.sendTileEntityPacketToClients(this, 50, facing, electricityStored, tier.name); } + + @Override + public int getMaxSafeInput() + { + return 2048; + } @Override public void setStored(int energy) diff --git a/src/mekanism/common/TileEntityEnrichmentChamber.java b/src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java similarity index 100% rename from src/mekanism/common/TileEntityEnrichmentChamber.java rename to src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java diff --git a/src/mekanism/common/TileEntityGasTank.java b/src/minecraft/mekanism/common/TileEntityGasTank.java similarity index 100% rename from src/mekanism/common/TileEntityGasTank.java rename to src/minecraft/mekanism/common/TileEntityGasTank.java diff --git a/src/mekanism/common/TileEntityMetallurgicInfuser.java b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java similarity index 97% rename from src/mekanism/common/TileEntityMetallurgicInfuser.java rename to src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java index ee751d72a..50876ee3e 100644 --- a/src/mekanism/common/TileEntityMetallurgicInfuser.java +++ b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java @@ -152,9 +152,9 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem currentMaxElectricity = MAX_ELECTRICITY; } - if(inventory[1] != null) + if(inventory[1] != null && infuseStored+100 <= MAX_INFUSE) { - if(inventory[1].itemID == Mekanism.CompressedCarbon.shiftedIndex && infuseStored+100 <= MAX_INFUSE) + if(inventory[1].isItemEqual(new ItemStack(Mekanism.CompressedCarbon))) { if(type == InfusionType.NONE || type == InfusionType.COAL) { @@ -173,7 +173,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem { for(ItemStack itemStack : OreDictionary.getOres("dustTin")) { - if(inventory[1].isItemEqual(itemStack) && infuseStored+100 <= MAX_INFUSE) + if(inventory[1] != null && inventory[1].isItemEqual(itemStack)) { infuseStored += 100; inventory[1].stackSize--; @@ -486,9 +486,9 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem } @Override - public boolean demandsEnergy() + public int demandsEnergy() { - return electricityStored < currentMaxElectricity; + return (int)((currentMaxElectricity - electricityStored)*Mekanism.TO_IC2); } @Override @@ -515,6 +515,12 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem { return true; } + + @Override + public int getMaxSafeInput() + { + return 2048; + } @Override public int injectEnergy(Direction direction, int i) diff --git a/src/mekanism/common/TileEntityPlatinumCompressor.java b/src/minecraft/mekanism/common/TileEntityPlatinumCompressor.java similarity index 100% rename from src/mekanism/common/TileEntityPlatinumCompressor.java rename to src/minecraft/mekanism/common/TileEntityPlatinumCompressor.java diff --git a/src/mekanism/common/TileEntitySmeltingFactory.java b/src/minecraft/mekanism/common/TileEntitySmeltingFactory.java similarity index 97% rename from src/mekanism/common/TileEntitySmeltingFactory.java rename to src/minecraft/mekanism/common/TileEntitySmeltingFactory.java index 538390a36..f5da368ea 100644 --- a/src/mekanism/common/TileEntitySmeltingFactory.java +++ b/src/minecraft/mekanism/common/TileEntitySmeltingFactory.java @@ -3,7 +3,6 @@ package mekanism.common; import ic2.api.Direction; import ic2.api.ElectricItem; import ic2.api.IElectricItem; -import ic2.api.energy.event.EnergyTileSinkEvent; import ic2.api.energy.tile.IEnergySink; import mekanism.api.IActiveState; import mekanism.api.Tier.SmeltingFactoryTier; @@ -82,11 +81,6 @@ public class TileEntitySmeltingFactory extends TileEntityElectricBlock implement } } - if(demandsEnergy()) - { - MinecraftForge.EVENT_BUS.post(new EnergyTileSinkEvent(this, (int)((currentMaxElectricity-electricityStored)*Mekanism.TO_IC2))); - } - if(inventory[1] != null) { if(electricityStored < currentMaxElectricity) @@ -501,9 +495,9 @@ public class TileEntitySmeltingFactory extends TileEntityElectricBlock implement } @Override - public boolean demandsEnergy() + public int demandsEnergy() { - return electricityStored < currentMaxElectricity; + return (int)((currentMaxElectricity - electricityStored)*Mekanism.TO_IC2); } @Override @@ -524,6 +518,12 @@ public class TileEntitySmeltingFactory extends TileEntityElectricBlock implement { return isActive; } + + @Override + public int getMaxSafeInput() + { + return 2048; + } @Override public int injectEnergy(Direction direction, int i) diff --git a/src/mekanism/common/TileEntityTheoreticalElementizer.java b/src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java similarity index 100% rename from src/mekanism/common/TileEntityTheoreticalElementizer.java rename to src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java diff --git a/src/mekanism/common/TileEntityUltimateSmeltingFactory.java b/src/minecraft/mekanism/common/TileEntityUltimateSmeltingFactory.java similarity index 100% rename from src/mekanism/common/TileEntityUltimateSmeltingFactory.java rename to src/minecraft/mekanism/common/TileEntityUltimateSmeltingFactory.java diff --git a/src/mekanism/common/Version.java b/src/minecraft/mekanism/common/Version.java similarity index 100% rename from src/mekanism/common/Version.java rename to src/minecraft/mekanism/common/Version.java diff --git a/src/mekanism/generators/client/BlockRenderingHandler.java b/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java similarity index 100% rename from src/mekanism/generators/client/BlockRenderingHandler.java rename to src/minecraft/mekanism/generators/client/BlockRenderingHandler.java diff --git a/src/mekanism/generators/client/GeneratorsClientProxy.java b/src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java similarity index 100% rename from src/mekanism/generators/client/GeneratorsClientProxy.java rename to src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java diff --git a/src/mekanism/generators/client/GuiBioGenerator.java b/src/minecraft/mekanism/generators/client/GuiBioGenerator.java similarity index 100% rename from src/mekanism/generators/client/GuiBioGenerator.java rename to src/minecraft/mekanism/generators/client/GuiBioGenerator.java diff --git a/src/mekanism/generators/client/GuiElectrolyticSeparator.java b/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java similarity index 100% rename from src/mekanism/generators/client/GuiElectrolyticSeparator.java rename to src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java diff --git a/src/mekanism/generators/client/GuiHeatGenerator.java b/src/minecraft/mekanism/generators/client/GuiHeatGenerator.java similarity index 100% rename from src/mekanism/generators/client/GuiHeatGenerator.java rename to src/minecraft/mekanism/generators/client/GuiHeatGenerator.java diff --git a/src/mekanism/generators/client/GuiHydrogenGenerator.java b/src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java similarity index 100% rename from src/mekanism/generators/client/GuiHydrogenGenerator.java rename to src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java diff --git a/src/mekanism/generators/client/GuiSolarGenerator.java b/src/minecraft/mekanism/generators/client/GuiSolarGenerator.java similarity index 100% rename from src/mekanism/generators/client/GuiSolarGenerator.java rename to src/minecraft/mekanism/generators/client/GuiSolarGenerator.java diff --git a/src/mekanism/generators/client/ModelAdvancedSolarGenerator.java b/src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java similarity index 100% rename from src/mekanism/generators/client/ModelAdvancedSolarGenerator.java rename to src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java diff --git a/src/mekanism/generators/client/ModelBioGenerator.java b/src/minecraft/mekanism/generators/client/ModelBioGenerator.java similarity index 100% rename from src/mekanism/generators/client/ModelBioGenerator.java rename to src/minecraft/mekanism/generators/client/ModelBioGenerator.java diff --git a/src/mekanism/generators/client/ModelElectrolyticSeparator.java b/src/minecraft/mekanism/generators/client/ModelElectrolyticSeparator.java similarity index 100% rename from src/mekanism/generators/client/ModelElectrolyticSeparator.java rename to src/minecraft/mekanism/generators/client/ModelElectrolyticSeparator.java diff --git a/src/mekanism/generators/client/ModelHeatGenerator.java b/src/minecraft/mekanism/generators/client/ModelHeatGenerator.java similarity index 100% rename from src/mekanism/generators/client/ModelHeatGenerator.java rename to src/minecraft/mekanism/generators/client/ModelHeatGenerator.java diff --git a/src/mekanism/generators/client/ModelHydrogenGenerator.java b/src/minecraft/mekanism/generators/client/ModelHydrogenGenerator.java similarity index 100% rename from src/mekanism/generators/client/ModelHydrogenGenerator.java rename to src/minecraft/mekanism/generators/client/ModelHydrogenGenerator.java diff --git a/src/mekanism/generators/client/RenderAdvancedSolarGenerator.java b/src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java similarity index 100% rename from src/mekanism/generators/client/RenderAdvancedSolarGenerator.java rename to src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java diff --git a/src/mekanism/generators/client/RenderBioGenerator.java b/src/minecraft/mekanism/generators/client/RenderBioGenerator.java similarity index 100% rename from src/mekanism/generators/client/RenderBioGenerator.java rename to src/minecraft/mekanism/generators/client/RenderBioGenerator.java diff --git a/src/mekanism/generators/client/RenderElectrolyticSeparator.java b/src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java similarity index 100% rename from src/mekanism/generators/client/RenderElectrolyticSeparator.java rename to src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java diff --git a/src/mekanism/generators/client/RenderHeatGenerator.java b/src/minecraft/mekanism/generators/client/RenderHeatGenerator.java similarity index 100% rename from src/mekanism/generators/client/RenderHeatGenerator.java rename to src/minecraft/mekanism/generators/client/RenderHeatGenerator.java diff --git a/src/mekanism/generators/client/RenderHydrogenGenerator.java b/src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java similarity index 100% rename from src/mekanism/generators/client/RenderHydrogenGenerator.java rename to src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java diff --git a/src/mekanism/generators/common/BlockGenerator.java b/src/minecraft/mekanism/generators/common/BlockGenerator.java similarity index 100% rename from src/mekanism/generators/common/BlockGenerator.java rename to src/minecraft/mekanism/generators/common/BlockGenerator.java diff --git a/src/mekanism/generators/common/ContainerBioGenerator.java b/src/minecraft/mekanism/generators/common/ContainerBioGenerator.java similarity index 100% rename from src/mekanism/generators/common/ContainerBioGenerator.java rename to src/minecraft/mekanism/generators/common/ContainerBioGenerator.java diff --git a/src/mekanism/generators/common/ContainerElectrolyticSeparator.java b/src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java similarity index 100% rename from src/mekanism/generators/common/ContainerElectrolyticSeparator.java rename to src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java diff --git a/src/mekanism/generators/common/ContainerHeatGenerator.java b/src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java similarity index 100% rename from src/mekanism/generators/common/ContainerHeatGenerator.java rename to src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java diff --git a/src/mekanism/generators/common/ContainerHydrogenGenerator.java b/src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java similarity index 100% rename from src/mekanism/generators/common/ContainerHydrogenGenerator.java rename to src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java diff --git a/src/mekanism/generators/common/ContainerSolarGenerator.java b/src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java similarity index 100% rename from src/mekanism/generators/common/ContainerSolarGenerator.java rename to src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java diff --git a/src/mekanism/generators/common/GeneratorsCommonProxy.java b/src/minecraft/mekanism/generators/common/GeneratorsCommonProxy.java similarity index 100% rename from src/mekanism/generators/common/GeneratorsCommonProxy.java rename to src/minecraft/mekanism/generators/common/GeneratorsCommonProxy.java diff --git a/src/mekanism/generators/common/GeneratorsGuiHandler.java b/src/minecraft/mekanism/generators/common/GeneratorsGuiHandler.java similarity index 100% rename from src/mekanism/generators/common/GeneratorsGuiHandler.java rename to src/minecraft/mekanism/generators/common/GeneratorsGuiHandler.java diff --git a/src/mekanism/generators/common/ItemBlockGenerator.java b/src/minecraft/mekanism/generators/common/ItemBlockGenerator.java similarity index 100% rename from src/mekanism/generators/common/ItemBlockGenerator.java rename to src/minecraft/mekanism/generators/common/ItemBlockGenerator.java diff --git a/src/mekanism/generators/common/MekanismGenerators.java b/src/minecraft/mekanism/generators/common/MekanismGenerators.java similarity index 100% rename from src/mekanism/generators/common/MekanismGenerators.java rename to src/minecraft/mekanism/generators/common/MekanismGenerators.java diff --git a/src/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java similarity index 100% rename from src/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java rename to src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java diff --git a/src/mekanism/generators/common/TileEntityBioGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java similarity index 100% rename from src/mekanism/generators/common/TileEntityBioGenerator.java rename to src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java diff --git a/src/mekanism/generators/common/TileEntityElectrolyticSeparator.java b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java similarity index 98% rename from src/mekanism/generators/common/TileEntityElectrolyticSeparator.java rename to src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java index a4778a497..4642c9aff 100644 --- a/src/mekanism/generators/common/TileEntityElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java @@ -3,7 +3,6 @@ package mekanism.generators.common; import ic2.api.Direction; import ic2.api.ElectricItem; import ic2.api.IElectricItem; -import ic2.api.energy.event.EnergyTileSinkEvent; import ic2.api.energy.tile.IEnergySink; import java.util.EnumSet; @@ -75,11 +74,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { super.onUpdate(); - if(demandsEnergy()) - { - MinecraftForge.EVENT_BUS.post(new EnergyTileSinkEvent(this, (int)((MAX_ELECTRICITY-electricityStored)*Mekanism.TO_IC2))); - } - if(hydrogenStored > MAX_GAS) { hydrogenStored = MAX_GAS; @@ -416,9 +410,15 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public boolean demandsEnergy() + public int demandsEnergy() { - return electricityStored < MAX_ELECTRICITY; + return (int)((MAX_ELECTRICITY - electricityStored)*Mekanism.TO_IC2); + } + + @Override + public int getMaxSafeInput() + { + return 2048; } @Override diff --git a/src/mekanism/generators/common/TileEntityGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java similarity index 95% rename from src/mekanism/generators/common/TileEntityGenerator.java rename to src/minecraft/mekanism/generators/common/TileEntityGenerator.java index 6ec37f572..ef1cc8682 100644 --- a/src/mekanism/generators/common/TileEntityGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java @@ -48,8 +48,6 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem { super(name, maxEnergy); - ElectricityConnections.registerConnector(this, EnumSet.allOf(ForgeDirection.class)); - output = out; isActive = false; } @@ -205,6 +203,19 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem return output; } + @Override + public void setFacing(short orientation) + { + super.setFacing(orientation); + + if(ElectricityConnections.isConnector(this)) + { + ElectricityConnections.unregisterConnector(this); + } + + ElectricityConnections.registerConnector(this, EnumSet.of(ForgeDirection.getOrientation(orientation))); + } + @Override public boolean emitsEnergyTo(TileEntity receiver, Direction direction) { diff --git a/src/mekanism/generators/common/TileEntityHeatGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java similarity index 100% rename from src/mekanism/generators/common/TileEntityHeatGenerator.java rename to src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java diff --git a/src/mekanism/generators/common/TileEntityHydrogenGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java similarity index 100% rename from src/mekanism/generators/common/TileEntityHydrogenGenerator.java rename to src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java diff --git a/src/mekanism/generators/common/TileEntitySolarGenerator.java b/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java similarity index 100% rename from src/mekanism/generators/common/TileEntitySolarGenerator.java rename to src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java diff --git a/src/mekanism/tools/common/ItemMekanismArmor.java b/src/minecraft/mekanism/tools/common/ItemMekanismArmor.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismArmor.java rename to src/minecraft/mekanism/tools/common/ItemMekanismArmor.java diff --git a/src/mekanism/tools/common/ItemMekanismAxe.java b/src/minecraft/mekanism/tools/common/ItemMekanismAxe.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismAxe.java rename to src/minecraft/mekanism/tools/common/ItemMekanismAxe.java diff --git a/src/mekanism/tools/common/ItemMekanismHoe.java b/src/minecraft/mekanism/tools/common/ItemMekanismHoe.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismHoe.java rename to src/minecraft/mekanism/tools/common/ItemMekanismHoe.java diff --git a/src/mekanism/tools/common/ItemMekanismPaxel.java b/src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismPaxel.java rename to src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java diff --git a/src/mekanism/tools/common/ItemMekanismPickaxe.java b/src/minecraft/mekanism/tools/common/ItemMekanismPickaxe.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismPickaxe.java rename to src/minecraft/mekanism/tools/common/ItemMekanismPickaxe.java diff --git a/src/mekanism/tools/common/ItemMekanismSpade.java b/src/minecraft/mekanism/tools/common/ItemMekanismSpade.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismSpade.java rename to src/minecraft/mekanism/tools/common/ItemMekanismSpade.java diff --git a/src/mekanism/tools/common/ItemMekanismSword.java b/src/minecraft/mekanism/tools/common/ItemMekanismSword.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismSword.java rename to src/minecraft/mekanism/tools/common/ItemMekanismSword.java diff --git a/src/mekanism/tools/common/ItemMekanismTool.java b/src/minecraft/mekanism/tools/common/ItemMekanismTool.java similarity index 100% rename from src/mekanism/tools/common/ItemMekanismTool.java rename to src/minecraft/mekanism/tools/common/ItemMekanismTool.java diff --git a/src/mekanism/tools/common/MekanismTools.java b/src/minecraft/mekanism/tools/common/MekanismTools.java similarity index 100% rename from src/mekanism/tools/common/MekanismTools.java rename to src/minecraft/mekanism/tools/common/MekanismTools.java