a0.6 pre-4

Author: calmilamsy

blog.html

@@ -63,14 +63,6 @@ <h1>Minecraft News</h1>
                 </table>
                 <div class="container">
                     <div id="posts">
-                        <div style="width:100%; height:16px;"></div>
-                        <div class="post text">
-                            <h3><a href="https://mcupdate.tumblr.com/post/10199253666/minecraft-beta-18">Minecraft Beta 1.8</a></h3>
-                            <p>+ Added a brand new biome generation code that simplifies life a lot and makes things much more exciting for the future<br>+ Added new mob; Endermen<br>+ Added FOV slider<br>+ Added brightness slider<br>+ Added randomly generated ravines<br>+ Killing a monster makes it drop experience orbs<br>+ The player can level up by gathering experience orbs<br>+ Added randomly generated houses<br>+ Added huge mushrooms<br>+ Using bonemeal on small mushrooms grows the mushroom into a giant mushroom if there’s room<br>+ Rewrote the light rendering to use multitexturing instead of direct colors<br>+ Sky light and block light have different tints, cool colors for sky light, warm for block lights<br>+ Added critical hits that deal +50% damage, plus an extra point to make crits with weak weapons worth it<br>+ If the player hits a mob while falling, they always hit a critical hit<br>+ The game now keeps track of damage sources and types<br>+ Some damage type ignore armor now; drowning, being on fire (but not being IN a fire), falling out of the world<br>+ Ice now only spreads next to existing ice or from coast areas<br>+ Made the explosions prettier<br>+ Made level height depend on a single variable (the level height still is 128, but it’s more moddable now)<br>+ Added sprinting<br>+ Added hunger<br>+ Food is now stackable<br>+ Improved the logo<br>+ Added suspended particles to water<br>+ Added a server list so you can remember multiple servers<br>+ The player regenerates slowly while the food bar is high<br>+ Eating food now takes time<br>+ Skeletons hold their bows better now<br>+ Added melons<br>+ Made melons and pumpkins farmable<br>+ Animals that get hurt will flee randomly for a short while<br>+ Pigs have snouts now<br>+ Made a flashier title screen<br>+ Looking towards the sun during sunset/sunrise changes fog color<br>+ Added fence gates<br>+ Added a player list to multiplayer<br>+ Added Silverfish<br>+ Added Cave Spider<br>+ Added huge underground dungeons (stronghold)<br>+ Added underground mine shafts<br>+ Added melon<br>+ Added sprouts for melons and pumpkins<br>+ Added vines<br>+ Added iron bars<br>* Fixed mushrooms spreading infinitely<br>* Fixed caves generating with too many dead ends<br>- Removed Herobrine</p>
-                            <div class="meta">
-                                <div class="permaLink"><a href="https://mcupdate.tumblr.com/post/10199253666/minecraft-beta-18" title="Permanent link for this post"></a></div>
-                            </div>
-                        </div>
                         <div style="width:100%; height:16px;"></div>
                         <div class="post text">
                             <h3><a href="https://mcupdate.tumblr.com/post/7376697767/minecraft-beta-173">Minecraft Beta 1.7.3</a></h3>

changelog.md

@@ -114,54 +114,61 @@ Never let me QA test.
 Woo!!!11 Automate EVERYTHING!  
 Estimated release date: mid June - early July  
 
+~ Removed b1.8 from the blog.html.
+~ Added support for more "modern" versions of minecraft into the proxy.  
 \+ Automated blank instance creation.   
 \+ Added the ability to cache sounds, LWJGL and MC versions. No more 200mb downloads every time you make an instance!  
-\+ Revamped instance manager.  
+\+ Revamped options window.  
 \+ Automatic "dumb" mod installing. (just copies contents of zip to mc.jar)   
 \* Fixed the instance manager not blocking input to the main window.
 \* Fixed a temp folder issue which could cause garbled instances, slow startup and crashes. (woops!)
 
 ### Upcoming website changes
 Lets start to change how we install mods!  
-Ordered in chronological order of release.
-Accounts should be made reflecting your in game name, or certain features wont work.
-Estimated release date: late June - late July as features roll out.
+Ordered in chronological order of release.  
+Accounts should be made reflecting your in game name, or certain features wont work.  
+Estimated release date: late June - late July as features roll out.  
 
-\#\+ Online mod repository with tons of converted mods.  
-\#\+ Closed beta of the account system with a group of people to try and break the website.
+\#\+ Closed beta of the account system with a group of people to try and break the website.  
 \#\+ A public account system for modpacks and mods and the ability to create and edit modpack and mod pages.  
-\#\+ A public modpack and mod uploading system!
-\#\+ A report button to flag a mod/modpack to me and any web admins.
-\#\+ A custom cape system for people to upload a cape of thier choice.
-\#\+ A public API to allow the use of custom clients for certain actions.
+\#\+ A public modpack and mod uploading system!  
+\#\+ A report button to flag a mod/modpack to me and any web admins.  
+\#\+ Online mod repository with tons of old converted mods.  
+\#\+ A custom cape system for people to upload a cape of thier choice.  
+\#\+ A public API to allow the use of custom clients for certain actions.  
 
 ### Upcoming a0.6
 Its about time I stopped doing prereleases.  
-Estimated release date: mid July
+Estimated release date: mid July  
 
 \+ Automatic launcher updates?  
 \+ Automatic "semi-smart" mod installing. Most likely only gonna support optional classes and folders though.  
 
 ### Upcoming website changes
 Power to the user!  
-Estimated release date: gradual roll-out over late July to potentially late August
+Estimated release date: gradual roll-out over late July to potentially late August  
 
 \#\+ Slightly prettier font page that explains the launcher better.  
 \#\+ Proper API documentation.  
 \#\+ A filled out wiki.  
 \#\+ Unification of website design.  
 \#\+ The ability to use uploaded pymcl launcher themes on the website?
 
+### PyMCS
+What could this be?  
+This could be very interesting for hosts.  
+Keep your eyes on pymcl.net once the new website changes are done.  
+
 ### Upcoming b1.0
 Lets make things look pretty!  
-Estimated release date: late August to December  
+Estimated release date: when it's ready.  
 
 \+ A fully fleshed out mod installer which can spot conflicting mods and suggest solutions, lets the user pick optional config options and have a pretty mod image display on the modlist in a given modpack.  
 \+ A rudimentary modlist system. More documentation on this closer to release.  
+\+ Custom compile script to reduce likelyhood of incorrect python versions being used.
 ~ UI overhaul. Some of the UI isnt fit for purpose anymore.  
 ~ Yet another global refactor. I have learned a lot about how pyqt5 works and some of my old code is terrible.  
 ~ Better theming system.  
-\+ Custom compile script to reduce likelyhood of incorrect python versions being used.
 
 
 ### Upcoming b1.1+

compile_win.bat

@@ -8,6 +8,8 @@ echo Is "%pythonver%" the correct python 3.6+ directory?
 echo Close the window if incorrect.
 PAUSE
 
+virtualenv venv
+
 echo Activating venv. && venv\scripts\activate && echo Adding dependencies. && pip install pyqt5 requests appdirs pypresence mitmproxy && echo Using pyinstaller. && pyinstaller -y -F -i "favicon.ico" --add-data "background.png";"." --add-data "logo.png";"." --add-data "favicon.ico";"." --add-data "blogbackground.png";"." --add-data "blog.html";"." --add-data "refresh.png";"." --add-data "venv\Lib\site-packages\mitmproxy\addons\onboardingapp";"mitmproxy\addons\onboardingapp" --add-data "EasyMineLauncher.jar";"." pymcl.py
 echo Complete!
 PAUSE

config.py

@@ -7,8 +7,6 @@
 ICON = ""
 LOGO = ""
 BACKGROUND = ""
-UPDATE_URL = "https://github.com/ModificationStation/PyMCL/raw/master/version.json"
-MODPACK_DB = "https://github.com/ModificationStation/PyMCL/raw/master/modpacks.json"
 BLOG_BACKGROUND = "blogbackground.png"
 BLOG = ""
 
@@ -31,7 +29,259 @@
 }
 """
 
-VER = "v0.6 Alpha Pre 3.2"
+SUPPORTED_VERSIONS = {
+    "1.5.2": {
+        "url": "465378c9dc2f779ae1d6e8046ebc46fb53a57968"
+    },
+    "1.5.1": {
+        "url": "047136381a552f34b1963c43304a1ad4dc0d2d8e"
+    },
+    "1.5": {
+        "url": "a3da981fc9b875a51975d8f8100cc0c201c2ce54"
+    },
+    "1.4.7": {
+        "url": "53ed4b9d5c358ecfff2d8b846b4427b888287028"
+    },
+    "1.4.5": {
+        "url": "7a8a963ababfec49406e1541d3a87198e50604e5"
+    },
+    "1.4.6": {
+        "url": "116758f41b32e8d1a71a4ad6236579acd724bca7"
+    },
+    "1.4.4": {
+        "url": "b9b2a9e9adf1bc834647febc93a4222b4fd6e403"
+    },
+    "1.4.3": {
+        "url": "f7274b201219b5729055bf85683eb6ef4f8024b4"
+    },
+    "1.4.2": {
+        "url": "42d6744cfbbd2958f9e6688dd6e78d86d658d0d4"
+    },
+    "1.4.1": {
+        "url": "67604a9c206697032165fc067b6255e333e06275"
+    },
+    "1.4": {
+        "url": "2007097b53d3eb43b2c1f3f78caab4a4ef690c7a"
+    },
+    "1.3.2": {
+        "url": "c2efd57c7001ddf505ca534e54abf3d006e48309"
+    },
+    "1.3.1": {
+        "url": "33167e71e85ab8e6ddbe168bc67f6ec19d708d62"
+    },
+    "1.3": {
+        "url": "4dfb8098b39c122f2aad13768d3f0d04db910f12"
+    },
+    "1.2.5": {
+        "url": "4a2fac7504182a97dcbcd7560c6392d7c8139928"
+    },
+    "1.2.4": {
+        "url": "ad6d1fe7455857269d4185cb8f24e62cc0241aaf"
+    },
+    "1.2.3": {
+        "url": "5134e433afeba375c00bbdcd8aead1d3222813ee"
+    },
+    "1.2.2": {
+        "url": "1dadfc4de6898751f547f24f72c7271218e4e28f"
+    },
+    "1.2.1": {
+        "url": "c7662ac43dd04bfd677694a06972a2aaaf426505"
+    },
+    "1.1": {
+        "url": "f690d4136b0026d452163538495b9b0e8513d718"
+    },
+    "1.0": {
+        "url": "b679fea27f2284836202e9365e13a82552092e5d"
+    },
+    "b1.8.1": {
+        "url": "6b562463ccc2c7ff12ff350a2b04a67b3adcd37b"
+    },
+    "b1.8": {
+        "url": "3139e9c29b2c74f59ea04de760ac2af5bc21b410"
+    },
+    "b1.7.3": {
+        "url": "43db9b498cb67058d2e12d394e6507722e71bb45"
+    },
+    "b1.7.2": {
+        "url": "7dc50cc5e2ff204a7283f0c7d38cd0370b49875b"
+    },
+    "b1.7": {
+        "url": "ad7960853437bcab86bd72c4a1b95f6fe19f4258"
+    },
+    "b1.6.6": {
+        "url": "f95fe05711d09553ca2a9089f981741c13d6b8c4"
+    },
+    "b1.6.5": {
+        "url": "90ed9854b43c4d031ed07381ea3ae3071a8bba6f"
+    },
+    "b1.6.4": {
+        "url": "b5d3bdb8a7b12d163651f4787ac6ca14689aab9e"
+    },
+    "b1.6.3": {
+        "url": "924e36dbb7c64abb30a95fe35f5affb5176f6cbc"
+    },
+    "b1.6.2": {
+        "url": "e8aa50949b077b672be2e651ea3f7b1bbd9020e1"
+    },
+    "b1.6.1": {
+        "url": "63a66d6d145696296bdaaeaba0a42f738b87a362"
+    },
+    "b1.6": {
+        "url": "ecc0288d218fd7479027a17c150cbf283fa950a1"
+    },
+    "b1.5_01": {
+        "url": "e2a692e5e8160c84b29c834ecbf398618db9749c"
+    },
+    "b1.5": {
+        "url": "f5ce1699cd728213c21054fa2f1490d162b002b4"
+    },
+    "b1.4_01": {
+        "url": "6f157f26955c35006c1afa8b0479e0ce785fb864"
+    },
+    "b1.4": {
+        "url": "f6dbca5223ea2a7e89806e93d0b18162b2d58c20"
+    },
+    "b1.3_01": {
+        "url": "add3809d2c075e985d4b583632dac3d9c3872945"
+    },
+    "b1.3b": {
+        "url": "e19cfb3a2043f185c44237ef05eac80e8ad2d8e7"
+    },
+    "b1.2_02": {
+        "url": "093f371e1a05d89664cfb8068d607953687d5d94"
+    },
+    "b1.2_01": {
+        "url": "f71a5b58c9bd0e458878d78a34c9fb35e97d5222"
+    },
+    "b1.2": {
+        "url": "ba05d7a97926c61c03cf956f7ae92f3bede9474e"
+    },
+    "b1.1_02": {
+        "url": "e1c682219df45ebda589a557aadadd6ed093c86c"
+    },
+    "b1.1_01": {
+        "url": "6d778940f48389a2741f03c9f17f3c57476fb208"
+    },
+    "b1.0.2": {
+        "url": "76d35cb452e739bd4780e835d17faf0785d755f9"
+    },
+    "b1.0_01": {
+        "url": "4caf69885b64132e42d3ce49996dbdb1691d7111"
+    },
+    "b1.0": {
+        "url": "93faf3398ebf8008d59852dc3c2b22b909ca8a49"
+    },
+    "a1.2.6": {
+        "url": "a68c817afd6c05c253ba5462287c2c19bbb57935"
+    },
+    "a1.2.5": {
+        "url": "f48c7b6442ad8d01099ecee1c7c7332f1b1a80da"
+    },
+    "a1.2.4_01": {
+        "url": "7be6298b05d1b0832ab45467a87a425640bc6bf0"
+    },
+    "a1.2.3_04": {
+        "url": "7f60cb9d0d40af20001d15287b78aa26a217a910"
+    },
+    "a1.2.3_02": {
+        "url": "dc61158e1df763f87483abb6ab540dc1c42e63c4"
+    },
+    "a1.2.3_01": {
+        "url": "1d46e65022f3a7cf4b8ad30ee5a8d52b3b2b9486"
+    },
+    "a1.2.3": {
+        "url": "f4be258122cb62208b350cd2068685ad859bb447"
+    },
+    "a1.2.2b": {
+        "url": "1c28c8431392641045b59e98a81877d7c94ff0ca"
+    },
+    "a1.2.2a": {
+        "url": "7d9d85eaca9627d3a40e6d122182f2d22d39dbf9"
+    },
+    "a1.2.1_01": {
+        "url": "e4226f9ba622634e3101681bc641eec7ee9e72fd"
+    },
+    "a1.2.1": {
+        "url": "e4226f9ba622634e3101681bc641eec7ee9e72fd"
+    },
+    "a1.2.0_02": {
+        "url": "b99da0a683e6dc1ade4df1bf159e021ad07d4fca"
+    },
+    "a1.2.0_01": {
+        "url": "332bfe7bf26f6a5cc93ee85e6759ce33784409d0"
+    },
+    "a1.2.0": {
+        "url": "8632ea716fd083c2975f16d612306fd80bee46db"
+    },
+    "a1.1.2_01": {
+        "url": "daa4b9f192d2c260837d3b98c39432324da28e86"
+    },
+    "a1.1.2": {
+        "url": "f9b4b66f9c18bf4800d80f1c8865a837f92c6105"
+    },
+    "a1.1.0": {
+        "url": "d58d1db929994ff383bdbe6fed31887e04b965c3"
+    },
+    "a1.0.17_04": {
+        "url": "61cb4c717981f34bf90e8502d2eb8cf2aa6db0cd"
+    },
+    "a1.0.17_02": {
+        "url": "39f20ee472a40322e034643a8d1668836f5052bd"
+    },
+    "a1.0.16": {
+        "url": "98ce80c7630ccb3bb38687ff98bfd18935d49a57"
+    },
+    "a1.0.15": {
+        "url": "03edaff812bedd4157a90877e779d7b7ecf78e97"
+    },
+    "a1.0.14": {
+        "url": "9b4b90d8def2a680b7c9eca40dd03e2266c8977a"
+    },
+    "a1.0.11": {
+        "url": "d7ceb02909d0e1031a99ff4d8053d3f4abfbb2da"
+    },
+    "a1.0.5_01": {
+        "url": "73f569bf5556580979606049204835ae1a54f04d"
+    },
+    "a1.0.4": {
+        "url": "e5838277b3bb193e58408713f1fc6e005c5f3c0c"
+    },
+    "inf-20100618": {
+        "url": "89eab2c1a353707cc00f074dffba9cb7a4f5e304"
+    },
+    "c0.30_01c": {
+        "url": "54622801f5ef1bcc1549a842c5b04cb5d5583005"
+    },
+    "c0.0.13a": {
+        "url": "936d575b1ab1a04a341ad43d76e441e88d2cd987"
+    },
+    "c0.0.13a_03": {
+        "url": "7ba9e63aec8a15a99ecd47900c848cdce8a51a03"
+    },
+    "c0.0.11a": {
+        "url": "3a799f179b6dcac5f3a46846d687ebbd95856984"
+    },
+    "rd-161348": {
+        "url": "6323bd14ed7f83852e17ebc8ec418e55c97ddfe4"
+    },
+    "rd-160052": {
+        "url": "b100be8097195b6c9112046dc6a80d326c8df839"
+    },
+    "rd-20090515": {
+        "url": "6323bd14ed7f83852e17ebc8ec418e55c97ddfe4"
+    },
+    "rd-132328": {
+        "url": "12dace5a458617d3f90337a7ebde86c0593a6899"
+    },
+    "rd-132211": {
+        "url": "393e8d4b4d708587e2accd7c5221db65365e1075"
+    }
+}
+
+VER = "v0.6 Alpha Pre 4"
+
+PRINT_INFO = True
+PRINT_WARN = True
 
 # Sets minecraft install dir. DO NOT TOUCH UNLESS YOU KNOW WHAT YOU ARE DOING.
 # Touching this can cause unintended file deletion/overwrites/etc.