Skip to content

Commit

Permalink
0.75
Browse files Browse the repository at this point in the history
  • Loading branch information
arpruss committed Jul 18, 2016
1 parent 2f774ac commit f8d9d73
Show file tree
Hide file tree
Showing 22 changed files with 152 additions and 131 deletions.
Binary file modified 110/.gradle/2.7/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file modified 110/.gradle/2.7/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified 110/.gradle/2.7/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified 110/.gradle/2.7/taskArtifacts/outputFileStates.bin
Binary file not shown.
Binary file modified 110/.gradle/2.7/taskArtifacts/taskArtifacts.bin
Binary file not shown.
65 changes: 37 additions & 28 deletions 110/.gradle/gradle.log
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This mapping 'snapshot_20160618' was designed for MC 1.9.4! Use at your own peril.This mapping 'snapshot_20160618' was designed for MC 1.9.4! Use at your own peril.

#################################################
ForgeGradle 2.2-SNAPSHOT-59f33ec
ForgeGradle 2.2-SNAPSHOT-0447b4e
https://github.com/MinecraftForge/ForgeGradle
#################################################
Powered by MCP unknown
Expand All @@ -10,33 +10,42 @@ This mapping 'snapshot_20160618' was designed for MC 1.9.4! Use at your own peri
R4wk, ZeuX, IngisKahn, bspkrs
#################################################
:deobfCompileDummyTask
:getVersionJsonNo route to host: connect
:deobfProvidedDummyTask
:sourceApiJava UP-TO-DATE
:compileApiJava UP-TO-DATE
:processApiResources UP-TO-DATE
:apiClasses UP-TO-DATE
:sourceMainJava
:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
1 warning

:extractUserdev
FAILURE: Build failed with an exception.
:processResources
:classes
:jar
:sourceTestJava UP-TO-DATE
:compileTestJava UP-TO-DATE
:processTestResources UP-TO-DATE
:testClasses UP-TO-DATE
:test UP-TO-DATE
:extractMcpData SKIPPED
:extractMcpMappings
:getVersionJson
:extractUserdev UP-TO-DATE
:genSrgs
:reobfJar
:extractRangemapReplacedMain
C:\Devel\mc\110\build\sources\main\java
:retromapReplacedMain
remapping source...
:sourceJar
:assemble
:check UP-TO-DATE
:build

* What went wrong:
Could not resolve all dependencies for configuration ':forgeGradleUserDevPackage'.
> Could not resolve net.minecraftforge:forge:1.10-12.18.0.1986-1.10.0.
Required by:
mobi.omegacentauri.raspberryjammod:110:0.74
> Could not resolve net.minecraftforge:forge:1.10-12.18.0.1986-1.10.0.
> Could not get resource 'http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.10-12.18.0.1986-1.10.0/forge-1.10-12.18.0.1986-1.10.0.pom'.
> Could not GET 'http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.10-12.18.0.1986-1.10.0/forge-1.10-12.18.0.1986-1.10.0.pom'.
> Network is unreachable: connect
> Could not resolve net.minecraftforge:forge:1.10-12.18.0.1986-1.10.0.
> Could not get resource 'https://repo1.maven.org/maven2/net/minecraftforge/forge/1.10-12.18.0.1986-1.10.0/forge-1.10-12.18.0.1986-1.10.0.pom'.
> Could not GET 'https://repo1.maven.org/maven2/net/minecraftforge/forge/1.10-12.18.0.1986-1.10.0/forge-1.10-12.18.0.1986-1.10.0.pom'.
> repo1.maven.org
> Could not resolve net.minecraftforge:forge:1.10-12.18.0.1986-1.10.0.
> Could not get resource 'https://libraries.minecraft.net/net/minecraftforge/forge/1.10-12.18.0.1986-1.10.0/forge-1.10-12.18.0.1986-1.10.0.pom'.
> Could not GET 'https://libraries.minecraft.net/net/minecraftforge/forge/1.10-12.18.0.1986-1.10.0/forge-1.10-12.18.0.1986-1.10.0.pom'.
> libraries.minecraft.net
BUILD SUCCESSFUL

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output.


BUILD FAILED

Total time: 17.828 secs
Total time: 46.22 secs
2 changes: 1 addition & 1 deletion 110/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
version = "0.74"
version = "0.75"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

Expand Down
2 changes: 1 addition & 1 deletion 19/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
version = "0.74"
version = "0.75"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ public void onWorldLoaded(WorldEvent.Load event) {
registerCommand(new PythonExternalCommand(true));
registerCommand(new AddPythonExternalCommand(true));
}
else {
// else
// {
registerCommand(new LocalPythonExternalCommand(true));
registerCommand(new AddLocalPythonExternalCommand(true));
}
// }

if (!RaspberryJamMod.clientOnlyAPI)
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
public class RaspberryJamMod
{
public static final String MODID = "raspberryjammod";
public static final String VERSION = "0.74";
public static final String VERSION = "0.75";
public static final String NAME = "Raspberry Jam Mod";
private APIServer fullAPIServer = null;
private PythonExternalCommand pythonExternalCommand = null;
Expand Down
Binary file modified 194/.gradle/2.7/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file modified 194/.gradle/2.7/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified 194/.gradle/2.7/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified 194/.gradle/2.7/taskArtifacts/outputFileStates.bin
Binary file not shown.
Binary file modified 194/.gradle/2.7/taskArtifacts/taskArtifacts.bin
Binary file not shown.
61 changes: 36 additions & 25 deletions 194/.gradle/gradle.log
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#################################################
ForgeGradle 2.2-SNAPSHOT-59f33ec
ForgeGradle 2.2-SNAPSHOT-0447b4e
https://github.com/MinecraftForge/ForgeGradle
#################################################
Powered by MCP unknown
Expand All @@ -8,31 +8,42 @@
R4wk, ZeuX, IngisKahn, bspkrs
#################################################
:deobfCompileDummyTask
:getVersionJson
:extractUserdev
:downloadClient SKIPPED
:downloadServer SKIPPED
:splitServerJar SKIPPED
:mergeJars SKIPPED
:applyBinaryPatches SKIPPED
:deobfProvidedDummyTask
:extractDependencyATs SKIPPED
:extractMcpData SKIPPED
:extractMcpMappings SKIPPED
:genSrgs SKIPPED
:deobfMcMCP
Applying SpecialSource...
:deobfMcMCP FAILED

FAILURE: Build failed with an exception.
:sourceApiJava UP-TO-DATE
:compileApiJava UP-TO-DATE
:processApiResources UP-TO-DATE
:apiClasses UP-TO-DATE
:sourceMainJava
:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
1 warning

* What went wrong:
Execution failed for task ':deobfMcMCP'.
> joptsimple/OptionException : Unsupported major.minor version 51.0

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output.
:processResources
:classes
:jar
:sourceTestJava UP-TO-DATE
:compileTestJava UP-TO-DATE
:processTestResources UP-TO-DATE
:testClasses UP-TO-DATE
:test UP-TO-DATE
:extractMcpData SKIPPED
:extractMcpMappings
:getVersionJson
:extractUserdev UP-TO-DATE
:genSrgs
:reobfJar
:extractRangemapReplacedMain
C:\Devel\mc\194\build\sources\main\java
:retromapReplacedMain
remapping source...
:sourceJar
:assemble
:check UP-TO-DATE
:build

BUILD FAILED
BUILD SUCCESSFUL

Total time: 42.844 secs
Total time: 46.643 secs
2 changes: 1 addition & 1 deletion 194/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
version = "0.74"
version = "0.75"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

Expand Down
140 changes: 70 additions & 70 deletions RaspberryJamMod.iss
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
; Script generated by the Inno Script Studio Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "RaspberryJamMod"
#define MyAppVersion "0.74"
#define MyAppPublisher "Omega Centauri Software"
#define MyAppURL "http://github.com/arpruss/raspberryjammod"

[Setup]
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{2AA2DFED-997D-4E6A-8FF3-4812440DB509}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={userpf}\{#MyAppName}
DisableDirPage=yes
DefaultGroupName={#MyAppName}
OutputDir=build\
OutputBaseFilename=RaspberryJamMod-Installer
Compression=lzma
SolidCompression=yes
LicenseFile=py27\LICENSE.txt
PrivilegesRequired=lowest

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"

[Files]
Source: "python2-scripts\mcpipy\*"; DestDir: "{userappdata}\.minecraft\mcpipy\"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall
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

[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

[InstallDelete]
Type: files; Name: "{userappdata}\.minecraft\mods\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.8\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.8.8\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.8.9\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.9\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.9.4\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.10\RaspberryJamMod*.jar"; Components: Mod

[Messages]
WelcomeLabel2=MAKE SURE YOU HAVE FORGE FOR MINECRAFT 1.8/1.8.8/1.8.9/1.9/1.9.4/1.10 ALREADY INSTALLED. Otherwise, this won't work.
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: "{group}\Uninstall RaspberryJamMod files"; Filename: "{uninstallexe}"; Tasks: Start
[Tasks]
Name: "Desktop"; Description: "Desktop shortcut"; Components: Python27
Name: "Start"; Description: "Start Menu shortcut"; Components: Python27
; Script generated by the Inno Script Studio Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "RaspberryJamMod"
#define MyAppVersion "0.75"
#define MyAppPublisher "Omega Centauri Software"
#define MyAppURL "http://github.com/arpruss/raspberryjammod"

[Setup]
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{2AA2DFED-997D-4E6A-8FF3-4812440DB509}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={userpf}\{#MyAppName}
DisableDirPage=yes
DefaultGroupName={#MyAppName}
OutputDir=build\
OutputBaseFilename=RaspberryJamMod-Installer
Compression=lzma
SolidCompression=yes
LicenseFile=py27\LICENSE.txt
PrivilegesRequired=lowest

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"

[Files]
Source: "python2-scripts\mcpipy\*"; DestDir: "{userappdata}\.minecraft\mcpipy\"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall
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

[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

[InstallDelete]
Type: files; Name: "{userappdata}\.minecraft\mods\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.8\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.8.8\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.8.9\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.9\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.9.4\RaspberryJamMod*.jar"; Components: Mod
Type: files; Name: "{userappdata}\.minecraft\mods\1.10\RaspberryJamMod*.jar"; Components: Mod

[Messages]
WelcomeLabel2=MAKE SURE YOU HAVE FORGE FOR MINECRAFT 1.8/1.8.8/1.8.9/1.9/1.9.4/1.10 ALREADY INSTALLED. Otherwise, this won't work.
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: "{group}\Uninstall RaspberryJamMod files"; Filename: "{uninstallexe}"; Tasks: Start
[Tasks]
Name: "Desktop"; Description: "Desktop shortcut"; Components: Python27
Name: "Start"; Description: "Start Menu shortcut"; Components: Python27
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "0.74"
version = "0.75"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

Expand Down
Binary file modified python2-scripts.zip
Binary file not shown.
Binary file modified python3-scripts.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
public class RaspberryJamMod
{
public static final String MODID = "raspberryjammod";
public static final String VERSION = "0.74";
public static final String VERSION = "0.75";
public static final String NAME = "Raspberry Jam Mod";
private APIServer fullAPIServer = null;
private PythonExternalCommand pythonExternalCommand = null;
Expand Down

0 comments on commit f8d9d73

Please sign in to comment.