Starbound 1.0 Support

.gitignore

@@ -7,4 +7,5 @@ starcheat/__pycache__/
 *.org_archive
 *.json
 *.metadata
-*.player
+*.player
+*.pyc

README.md

@@ -41,15 +41,6 @@ Here is how to build starcheat from source. Make sure everything in the dependen
 - [PyQt5](http://www.riverbankcomputing.com/software/pyqt/download5)
 - [Qt 5](http://qt-project.org/downloads) (included in PyQt5 binaries on Windows)
 - [Pillow](https://pypi.python.org/pypi/Pillow/)
-- [py-starbound](https://github.com/blixt/py-starbound)
-
-**NOTE:** py-starbound is included as a [git submodule](http://git-scm.com/docs/git-submodule) and needs to be cloned with the following commands:
-
-- ```cd <starcheat top folder>```
-- ```git submodule sync```
-- ```git submodule update --init```
-
-Applications such as [Sourcetree](http://www.sourcetreeapp.com/) should offer to clone it automatically.
 
 ### Windows
 Lines starting with ```>``` can be run in PowerShell or cmd.exe.

appveyor.yml

@@ -17,15 +17,14 @@ init:
 
 install:
   - REG ADD HKCU\Software\Python\PythonCore\3.4\InstallPath /f /ve /t REG_SZ /d %PYTHON%
-  - git submodule update --init --recursive
   - ps: Start-FileDownload $env:PyQT -FileName $env:temp/pyqt5_install.exe
   - ps: "& $env:temp/pyqt5_install.exe /S"
   - ps: "Wait-Process -Name pyqt5_install -Timeout 600"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - "python -c \"import PyQt5\""
   - "pip --version"
-  - "pip install cx_freeze"
+  - "pip install cx_freeze==4.3.4"
   - "pip install Pillow"
 
 build_script:

build.py

@@ -1,24 +1,31 @@
 #!/usr/bin/env python3
 
-import os, platform, shutil
-from optparse import OptionParser
+import os
+import platform
+import shutil
+from argparse import ArgumentParser
+
 
 def main():
     desc = "builds starbound using pyqt5 and python3"
     if platform.system() == "Windows":
         desc += " (with cx_freeze if --with-exe is passed)"
-    parser = OptionParser(description=desc)
-    parser.add_option("-p", "--prefix", "-b", "--build", "--build-dir", dest="prefix", default="build",
-                      help="build and install starboud to this prefix (default to build)")
-    parser.add_option("-v", "--verbose", dest="verbose", action="store_true", help="print status messages to stdout")
+    parser = ArgumentParser(description=desc)
+    parser.add_argument("-p", "--prefix", "-b", "--build", "--build-dir", dest="prefix", default="build",
+                        help="build and install starboud to this prefix (default to build)")
+    parser.add_argument("-v", "--verbose", dest="verbose", action="store_true", default=True,
+                        help="print status messages to stdout")
+    parser.add_argument("-q", "--quiet", dest="verbose", action="store_false", default=True,
+                        help="don't print status messages to stdout")
+
     if platform.system() == "Windows":
-        parser.add_option("-e", "--exe", "--with-exe", "--enable-exe", action="store_true", dest="exe",
-                          help="generates .exe (windows only)")
-        parser.add_option("-d", "--dist", "--dist-dir", dest="dist", default="dist",
-                          help="generates .exe to this dir (default to dist)")
-    (options, args) = parser.parse_args()
+        parser.add_argument("-e", "--exe", "--with-exe", "--enable-exe", action="store_true", dest="exe",
+                            help="generates .exe (windows only)")
+        parser.add_argument("-d", "--dist", "--dist-dir", dest="dist", default="dist",
+                            help="generates .exe to this dir (default to dist)")
+    options = parser.parse_args()
 
-    src_dir = os.path.dirname(os.path.realpath(__file__));
+    src_dir = os.path.dirname(os.path.realpath(__file__))
     templates = os.listdir(os.path.join(src_dir, "starcheat", "templates"))
     prefix = os.path.expanduser(options.prefix)
     if platform.system() == "Windows":
@@ -29,23 +36,18 @@ def main():
         dist = os.path.expanduser(options.dist)
 
     if options.verbose:
-        print("Starting building starcheat to " + prefix + " ...")
+        print("Starting building Starcheat to " + prefix + " ...")
 
     if os.path.exists(prefix):
         if options.verbose:
             print("Removing existing build directory")
         shutil.rmtree(prefix)
 
     if options.verbose:
-        print("Copying starcheat python scripts")
+        print("Copying Starcheat python scripts")
     shutil.copytree(os.path.join(src_dir, "starcheat"), prefix,
                     ignore=shutil.ignore_patterns("templates", "starbound", "images", "*.qrc"))
 
-    if options.verbose:
-        print("Copying py-starbound module")
-    shutil.copytree(os.path.join(src_dir, "starcheat", "starbound", "starbound"),
-                    os.path.join(prefix, "starbound"))
-
     if options.verbose:
         print("Generating python Qt templates...")
     for t in templates:
@@ -74,7 +76,7 @@ def main():
 
     if platform.system() == "Windows" and options.exe:
         if options.verbose:
-            print("Starting generating starcheat standalone Windows build to " + dist + " ...")
+            print("Starting generating Starcheat standalone Windows build to " + dist + " ...")
 
         if os.path.exists(dist):
             if options.verbose:
@@ -85,7 +87,7 @@ def main():
             print("Launching cx_freeze...")
         icon_path = os.path.join(src_dir, "starcheat", "images", "starcheat.ico")
         os.system("python " + cx_freeze_Path + " \"" + os.path.join(prefix, "starcheat.py") + "\" --target-dir=\"" +
-                  dist + "\" --base-name=Win32GUI --icon=\"" + icon_path +"\"")
+                  dist + "\" --base-name=Win32GUI --icon=\"" + icon_path + "\"")
         shutil.copy(os.path.join(pyqt5_dir, "libEGL.dll"), dist)
 
         if options.verbose:

mac/starcheat.rb

@@ -1,4 +1,4 @@
-print %q(The starcheat formula has been moved to it`s own tap with support for brew
+print %q(The Starcheat formula has been moved to it`s own tap with support for brew
 update and a fixed .app creation. To install type:
   brew remove starcheat
   brew tap chrmoritz/starcheat

mac/travis.rb

@@ -7,7 +7,7 @@ def system(cmd, *args)
   raise "error" unless Kernel.system cmd, *args
 end
 
-# Build starcheat
+# Build Starcheat
 system 'python3', 'build.py', '-v'
 # Run some tests
 FileUtils.cd 'build'
@@ -19,7 +19,7 @@ def system(cmd, *args)
   system 'python3', 'setup.py', 'py2app'
   system '/usr/local/opt/qt5/bin/macdeployqt', 'dist/starcheat.app', '-verbose=2'
   # Test OS X .app + tar
-  FileUtils.mv 'dist/starcheat.app', 'StarCheat.app'
-  system 'StarCheat.app/Contents/MacOS/starcheat', '-v'
-  system 'tar', 'czf', "starcheat-#{ENV['TRAVIS_TAG']}-osx.tar.gz", 'StarCheat.app'
+  FileUtils.mv 'dist/starcheat.app', 'Starcheat.app'
+  system 'Starcheat.app/Contents/MacOS/starcheat', '-v'
+  system 'tar', 'czf', "starcheat-#{ENV['TRAVIS_TAG']}-osx.tar.gz", 'Starcheat.app'
 end

starcheat/assets/blueprints.py

@@ -7,17 +7,16 @@ def __init__(self, assets):
         self.starbound_folder = assets.starbound_folder
 
     def is_blueprint(self, key):
-        if key.endswith(".recipe"):
-            return True
-        else:
-            return False
+        return key.endswith(".recipe")
 
     def index_data(self, asset):
         key = asset[0]
         path = asset[1]
+        offset = asset[2]
+        length = asset[3]
         name = os.path.basename(asset[0]).split(".")[0]
         asset_type = "blueprint"
-        asset_data = self.assets.read(key, path)
+        asset_data = self.assets.read(key, path, False, offset, length)
 
         if asset_data is None:
             return
@@ -27,7 +26,7 @@ def index_data(self, asset):
         except (KeyError, IndexError):
             category = "other"
 
-        return (key, path, asset_type, category, name, "")
+        return (key, path, offset, length, asset_type, category, name, "")
 
     def get_all_blueprints(self):
         """Return a list of every indexed blueprints."""