top

arpruss · Jun 25, 2016 · dd2581d · dd2581d
1 parent 29d9e6c
commit dd2581d
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 21 deletions.
diff --git a/110/.gradle/2.7/taskArtifacts/cache.properties.lock b/110/.gradle/2.7/taskArtifacts/cache.properties.lock
diff --git a/110/.gradle/2.7/taskArtifacts/fileHashes.bin b/110/.gradle/2.7/taskArtifacts/fileHashes.bin
diff --git a/110/.gradle/2.7/taskArtifacts/fileSnapshots.bin b/110/.gradle/2.7/taskArtifacts/fileSnapshots.bin
diff --git a/110/.gradle/2.7/taskArtifacts/outputFileStates.bin b/110/.gradle/2.7/taskArtifacts/outputFileStates.bin
diff --git a/110/.gradle/2.7/taskArtifacts/taskArtifacts.bin b/110/.gradle/2.7/taskArtifacts/taskArtifacts.bin
diff --git a/110/.gradle/gradle.log b/110/.gradle/gradle.log
@@ -11,31 +11,31 @@ This mapping 'snapshot_20160618' was designed for MC 1.9.4! Use at your own peri
 #################################################
 :deobfCompileDummyTask
 :deobfProvidedDummyTask
-:sourceApiJava
+:sourceApiJava UP-TO-DATE
 :compileApiJava UP-TO-DATE
 :processApiResources UP-TO-DATE
 :apiClasses UP-TO-DATE
-:sourceMainJava
+:sourceMainJava UP-TO-DATE
 :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
 
-:processResources
+:processResources UP-TO-DATE
 :classes
 :jar
-:sourceTestJava
+:sourceTestJava UP-TO-DATE
 :compileTestJava UP-TO-DATE
 :processTestResources UP-TO-DATE
 :testClasses UP-TO-DATE
 :test UP-TO-DATE
 :extractMcpData SKIPPED
-:extractMcpMappings SKIPPED
+:extractMcpMappings
 :getVersionJson
 :extractUserdev UP-TO-DATE
-:genSrgs SKIPPED
+:genSrgs
 :reobfJar
 :extractRangemapReplacedMain
 C:\Devel\mc\110\build\sources\main\java
@@ -48,4 +48,4 @@ remapping source...
 
 BUILD SUCCESSFUL
 
-Total time: 37.078 secs
+Total time: 58.23 secs
diff --git a/110/build.gradle b/110/build.gradle
@@ -20,12 +20,12 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.71"
+version = "0.73"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 
 minecraft {
-    version = "1.10-12.18.0.1984-1.10.0"
+    version = "1986"
     runDir = "run"
 
     // the mappings can be changed at any time, and must be in the following format.

diff --git a/19/build.gradle b/19/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.71"
+version = "0.73"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 

diff --git a/19/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java b/19/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java
@@ -55,7 +55,7 @@
 public class RaspberryJamMod
 {
 	public static final String MODID = "raspberryjammod";
-	public static final String VERSION = "0.71";
+	public static final String VERSION = "0.73";
 	public static final String NAME = "Raspberry Jam Mod";
 	private APIServer fullAPIServer = null;
 	private PythonExternalCommand pythonExternalCommand = null;

diff --git a/19/src/main/java/mobi/omegacentauri/raspberryjammod/SetBlockState.java b/19/src/main/java/mobi/omegacentauri/raspberryjammod/SetBlockState.java
@@ -1,6 +1,9 @@
 package mobi.omegacentauri.raspberryjammod;
 
+import java.util.Collection;
+
 import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.Packet;

diff --git a/194/.gradle/2.7/taskArtifacts/cache.properties.lock b/194/.gradle/2.7/taskArtifacts/cache.properties.lock
diff --git a/194/.gradle/2.7/taskArtifacts/fileHashes.bin b/194/.gradle/2.7/taskArtifacts/fileHashes.bin
diff --git a/194/.gradle/2.7/taskArtifacts/fileSnapshots.bin b/194/.gradle/2.7/taskArtifacts/fileSnapshots.bin
diff --git a/194/.gradle/2.7/taskArtifacts/outputFileStates.bin b/194/.gradle/2.7/taskArtifacts/outputFileStates.bin
diff --git a/194/.gradle/2.7/taskArtifacts/taskArtifacts.bin b/194/.gradle/2.7/taskArtifacts/taskArtifacts.bin
diff --git a/194/.gradle/gradle.log b/194/.gradle/gradle.log
@@ -13,15 +13,15 @@
 :compileApiJava UP-TO-DATE
 :processApiResources UP-TO-DATE
 :apiClasses UP-TO-DATE
-:sourceMainJava
+:sourceMainJava UP-TO-DATE
 :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
 
-:processResources
+:processResources UP-TO-DATE
 :classes
 :jar
 :sourceTestJava UP-TO-DATE
@@ -30,10 +30,10 @@ Note: Recompile with -Xlint:unchecked for details.
 :testClasses UP-TO-DATE
 :test UP-TO-DATE
 :extractMcpData SKIPPED
-:extractMcpMappings SKIPPED
+:extractMcpMappings
 :getVersionJson
 :extractUserdev UP-TO-DATE
-:genSrgs SKIPPED
+:genSrgs
 :reobfJar
 :extractRangemapReplacedMain
 C:\Devel\mc\194\build\sources\main\java
@@ -46,4 +46,4 @@ remapping source...
 
 BUILD SUCCESSFUL
 
-Total time: 32.911 secs
+Total time: 58.6 secs
diff --git a/194/build.gradle b/194/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.71"
+version = "0.73"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 

diff --git a/RaspberryJamMod.iss b/RaspberryJamMod.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "RaspberryJamMod"
-#define MyAppVersion "0.71"
+#define MyAppVersion "0.73"
 #define MyAppPublisher "Omega Centauri Software"
 #define MyAppURL "http://github.com/arpruss/raspberryjammod"
 

diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "0.71"
+version = "0.73"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 

diff --git a/python2-scripts.zip b/python2-scripts.zip
diff --git a/python2-scripts/mcpipy/top.py b/python2-scripts/mcpipy/top.py
@@ -0,0 +1,6 @@
+from mc import *
+
+mc = Minecraft()
+
+playerPos = mc.player.getTilePos()
+mc.player.setPos(playerPos.x, mc.getHeight(playerPos.x, playerPos.z)+1, playerPos.z)
diff --git a/python3-scripts.zip b/python3-scripts.zip
diff --git a/python3-scripts/mcpipy/top.py b/python3-scripts/mcpipy/top.py
@@ -0,0 +1,6 @@
+from mc import *
+
+mc = Minecraft()
+
+playerPos = mc.player.getTilePos()
+mc.player.setPos(playerPos.x, mc.getHeight(playerPos.x, playerPos.z)+1, playerPos.z)
diff --git a/setver.sh b/setver.sh
@@ -1,2 +1,2 @@
 sed -i 's/public static final String VERSION [^;]*/public static final String VERSION = "'$1'"/' src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java 19/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java
-sed -i 's/^version = "[^"]*"/version = "'$1'"/' build.gradle 19/build.gradle 194/build.gradle
+sed -i 's/^version = "[^"]*"/version = "'$1'"/' build.gradle 19/build.gradle 194/build.gradle 110/build.gradle
diff --git a/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java b/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java
@@ -54,7 +54,7 @@
 public class RaspberryJamMod
 {
 	public static final String MODID = "raspberryjammod";
-	public static final String VERSION = "0.71";
+	public static final String VERSION = "0.73";
 	public static final String NAME = "Raspberry Jam Mod";
 	private APIServer fullAPIServer = null;
 	private PythonExternalCommand pythonExternalCommand = null;