Skip to content

Commit

Permalink
working on making python3 be on equal footing with 27
Browse files Browse the repository at this point in the history
  • Loading branch information
arpruss committed Aug 3, 2016
1 parent 8b75961 commit ca228cc
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 26 deletions.
26 changes: 18 additions & 8 deletions RaspberryJamMod.iss
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,28 @@ PrivilegesRequired=lowest
Name: "english"; MessagesFile: "compiler:Default.isl"

[Files]
Source: "python2-scripts\mcpipy\*"; DestDir: "{userappdata}\.minecraft\mcpipy\"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall
Source: "python2-scripts\mcpipy\*"; DestDir: "{userappdata}\.minecraft\mcpipy\"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall; Components: Scripts\Scripts27
Source: "python3-scripts\mcpipy\*"; DestDir: "{userappdata}\.minecraft\mcpipy\"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall; Components: Scripts\Scripts3
Source: "build\libs\RaspberryJamMod.jar"; DestDir: "{userappdata}\.minecraft\mods\1.8\"
Source: "build\libs\RaspberryJamMod.jar"; DestDir: "{userappdata}\.minecraft\mods\1.8.8\"
Source: "build\libs\RaspberryJamMod.jar"; DestDir: "{userappdata}\.minecraft\mods\1.8.9\"
Source: "19\build\libs\RaspberryJamMod.jar"; DestDir: "{userappdata}\.minecraft\mods\1.9\"
Source: "194\build\libs\RaspberryJamMod.jar"; DestDir: "{userappdata}\.minecraft\mods\1.9.4\"
Source: "110\build\libs\RaspberryJamMod.jar"; DestDir: "{userappdata}\.minecraft\mods\1.10\"
Source: "110\build\libs\RaspberryJamMod.jar"; DestDir: "{userappdata}\.minecraft\mods\1.10.2\"
Source: "py27\*"; DestDir: "{userappdata}\.minecraft\python27"; Flags: createallsubdirs recursesubdirs; Components: Python27
Source: "config27\*"; DestDir: "{userappdata}\.minecraft\config"; Flags: createallsubdirs recursesubdirs; Components: Python\Python27
Source: "config3\*"; DestDir: "{userappdata}\.minecraft\config"; Flags: createallsubdirs recursesubdirs; Components: Python\Python3
Source: "py27\*"; DestDir: "{userappdata}\.minecraft\python27"; Flags: createallsubdirs recursesubdirs; Components: Python\Python27
Source: "py3\*"; DestDir: "{userappdata}\.minecraft\python3"; Flags: createallsubdirs recursesubdirs; Components: Python\Python3

[Components]
Name: "Mod"; Description: "Raspberry Jam Mod"; Types: full compact custom
Name: "Python27"; Description: "Python 2.7 interpreter"; Types: custom compact full
Name: "Scripts27"; Description: "Sample scripts and Minecraft Python library"; Types: compact custom full
Name: "Python"; Description: "Python interpreter"; Types: custom compact full
Name: "Python\Python27"; Description: "Python 2.7 interpreter"; Types: custom compact full; Flags: exclusive
Name: "Python\Python3"; Description: "Python 3 interpreter"; Flags: exclusive
Name: "Scripts"; Description: "Sample scripts and Minecraft Python library"; Types: compact custom full
Name: "Scripts\Scripts27"; Description: "Scripts for Python 2.7"; Types: compact custom full; Flags: exclusive
Name: "Scripts\Scripts3"; Description: "Scripts for Python 3"; Flags: exclusive

[InstallDelete]
Type: files; Name: "{userappdata}\.minecraft\mods\RaspberryJamMod*.jar"; Components: Mod
Expand All @@ -61,10 +69,12 @@ WelcomeLabel2=MAKE SURE YOU HAVE FORGE FOR MINECRAFT 1.8/1.8.8/1.8.9/1.9/1.9.4/1
ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components? (Note that the scripts in the mcpipy folder of your Minecraft folder should NOT get deleted, however, in case you made changes.)
[Icons]
Name: "{userdesktop}\IDLE for Minecraft Python"; Filename: "{userappdata}\.minecraft\python27\pythonw.exe"; WorkingDir: "{userappdata}\.minecraft\mcpipy"; IconFilename: "idlemcpipy"; Parameters: "..\Python27\Lib\idlelib\idle.py"; Components: Python27; Tasks: Desktop
Name: "{group}\IDLE for Minecraft Python"; Filename: "{userappdata}\.minecraft\python27\pythonw.exe"; WorkingDir: "{userappdata}\.minecraft\mcpipy"; IconFilename: "idlemcpipy"; Parameters: "..\Python27\Lib\idlelib\idle.py"; Components: Python27; Tasks: Start
Name: "{userdesktop}\IDLE for Minecraft Python 2.7"; Filename: "{userappdata}\.minecraft\python27\pythonw.exe"; WorkingDir: "{userappdata}\.minecraft\mcpipy"; IconFilename: "idlemcpipy"; Parameters: "..\Python27\Lib\idlelib\idle.py"; Components: Python\Python27; Tasks: Desktop
Name: "{userdesktop}\IDLE for Minecraft Python 3"; Filename: "{userappdata}\.minecraft\python27\pythonw.exe"; WorkingDir: "{userappdata}\.minecraft\mcpipy"; IconFilename: "idlemcpipy"; Parameters: "..\Python3\Lib\idlelib\idle.py"; Components: Python\Python3; Tasks: Desktop
Name: "{group}\IDLE for Minecraft Python 2.7"; Filename: "{userappdata}\.minecraft\python27\pythonw.exe"; WorkingDir: "{userappdata}\.minecraft\mcpipy"; IconFilename: "idlemcpipy"; Parameters: "..\Python27\Lib\idlelib\idle.py"; Components: Python\Python27; Tasks: Start
Name: "{group}\IDLE for Minecraft Python 3"; Filename: "{userappdata}\.minecraft\python27\pythonw.exe"; WorkingDir: "{userappdata}\.minecraft\mcpipy"; IconFilename: "idlemcpipy"; Parameters: "..\Python3\Lib\idlelib\idle.py"; Components: Python\Python3; Tasks: Start
Name: "{group}\Uninstall RaspberryJamMod files"; Filename: "{uninstallexe}"; Tasks: Start
[Tasks]
Name: "Desktop"; Description: "Desktop shortcut"; Components: Python27
Name: "Start"; Description: "Start Menu shortcut"; Components: Python27
Name: "Desktop"; Description: "Desktop shortcut"; Components: Python\Python27 Python\Python3
Name: "Start"; Description: "Start Menu shortcut"; Components: Python\Python27 Python\Python3
8 changes: 8 additions & 0 deletions config27/raspberryjammod.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Configuration file

general {
# Python interpreter [default: python]
S:"Python Interpreter"=../python27/python
}


8 changes: 8 additions & 0 deletions config3/raspberryjammod.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Configuration file

general {
# Python interpreter [default: python]
S:"Python Interpreter"=../python3/python
}


12 changes: 8 additions & 4 deletions python2-scripts/mcpipy/import.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

from mc import *
from sys import argv
from sys import argv,version
import mcpi.nbt as nbt
import json

Expand Down Expand Up @@ -111,9 +111,13 @@ def offset(x,y,z):
if len(argv) >= 2:
path = argv[1]
else:
import Tkinter
from tkFileDialog import askopenfilename
master = Tkinter.Tk()
if int(version[0]) < 3:
from tkFileDialog import askopenfilename
from Tkinter import *
else:
from tkinter.filedialog import askopenfilename
from tkinter import *
master = Tk()
master.attributes("-topmost", True)
path = askopenfilename(filetypes=['schematic {*.schematic}'],title="Open")
master.destroy()
Expand Down
8 changes: 6 additions & 2 deletions python2-scripts/mcpipy/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -839,8 +839,12 @@ def go(filename, args=[]):
if settings.isPE:
go("models/RaspberryPi.txt")
else:
from tkFileDialog import askopenfilename
from Tkinter import *
if int(sys.version[0]) < 3:
from tkFileDialog import askopenfilename
from Tkinter import *
else:
from tkinter.filedialog import askopenfilename
from tkinter import *
master = Tk()
master.wm_title("render")
master.attributes("-topmost", True)
Expand Down
24 changes: 16 additions & 8 deletions python2-scripts/mcpipy/vehicle.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,32 @@
from mcpi.minecraft import *
from mcpi.block import *
from math import *
from sys import maxsize
import sys
from copy import copy
from ast import literal_eval
import re

def getSavePath(directory, extension):
import Tkinter
from tkFileDialog import asksaveasfilename
master = Tkinter.Tk()
if int(sys.version[0]) < 3:
from tkFileDialog import asksaveasfilename
from Tkinter import *
else:
from tkinter.filedialog import asksaveasfilename
from tkinter import *
master = Tk()
master.attributes("-topmost", True)
path = asksaveasfilename(initialdir=directory,filetypes=['vehicle {*.'+extension+'}'],defaultextension="."+extension,title="Save")
master.destroy()
return path

def getLoadPath(directory, extension):
import Tkinter
from tkFileDialog import askopenfilename
master = Tkinter.Tk()
if int(sys.version[0]) < 3:
from tkFileDialog import askopenfilename
from Tkinter import *
else:
from tkinter.filedialog import askopenfilename
from tkinter import *
master = Tk()
master.attributes("-topmost", True)
path = askopenfilename(initialdir=directory,filetypes=['vehicle {*.'+extension+'}'],title="Open")
master.destroy()
Expand Down Expand Up @@ -76,7 +84,7 @@ class Vehicle():
def __init__(self,mc,nondestructive=False):
self.mc = mc
self.nondestructive = nondestructive
self.highWater = -maxsize-1
self.highWater = -sys.maxsize-1
self.baseVehicle = {}
if hasattr(Minecraft, 'getBlockWithNBT'):
self.getBlockWithData = self.mc.getBlockWithNBT
Expand Down
11 changes: 7 additions & 4 deletions python3-scripts/mcpipy/render.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

#www.stuffaboutcode.com
#www.stuffaboutcode.com
#Raspberry Pi, Minecraft - Create 3D Model from Obj file
# Version 2 - draws complete faces rather than wireframes and uses materials
"""
Expand Down Expand Up @@ -839,8 +838,12 @@ def go(filename, args=[]):
if settings.isPE:
go("models/RaspberryPi.txt")
else:
from tkFileDialog import askopenfilename
from Tkinter import *
if int(sys.version[0]) < 3:
from tkFileDialog import askopenfilename
from Tkinter import *
else:
from tkinter.filedialog import askopenfilename
from tkinter import *
master = Tk()
master.wm_title("render")
master.attributes("-topmost", True)
Expand Down

0 comments on commit ca228cc

Please sign in to comment.