0.80

arpruss · Aug 22, 2016 · 353ed2d · 353ed2d
1 parent ecf1f5b
commit 353ed2d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 7 deletions.
diff --git a/110/build.gradle b/110/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.76"
+version = "0.80"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 

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.76"
+version = "0.80"
 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/MCEventHandlerServer.java b/19/src/main/java/mobi/omegacentauri/raspberryjammod/MCEventHandlerServer.java
@@ -1,8 +1,11 @@
 package mobi.omegacentauri.raspberryjammod;
 
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 import net.minecraftforge.event.ServerChatEvent;
+import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
@@ -29,4 +32,15 @@ public void onServerTick(TickEvent.ServerTickEvent event) {
 	protected World[] getWorlds() {
 		return RaspberryJamMod.minecraftServer.worldServers;
 	}
+
+	@SubscribeEvent
+	public void onLivingHurtEvent(LivingHurtEvent event) {
+		if (event.getEntity() instanceof EntityPlayer &&
+				((RaspberryJamMod.noFallDamage && 
+				event.getSource() == DamageSource.fall) ||
+				(RaspberryJamMod.noInWallDamage && 
+				event.getSource() == DamageSource.inWall))) {
+				event.setCanceled(true);
+		}
+	}
 }
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.76";
+	public static final String VERSION = "0.80";
 	public static final String NAME = "Raspberry Jam Mod";
 	private APIServer fullAPIServer = null;
 	private PythonExternalCommand pythonExternalCommand = null;
@@ -80,6 +80,8 @@ public class RaspberryJamMod
 	//private MinecraftServer s;
 	public static MinecraftServer minecraftServer;
 	public static int currentPortNumber;
+	public static boolean noFallDamage = false;
+	public static boolean noInWallDamage = false;
 
 	@Mod.EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
@@ -128,6 +130,8 @@ public static void synchronizeConfig() {
 		pythonInterpreter = configFile.getString("Python Interpreter", Configuration.CATEGORY_GENERAL, "python", "Python interpreter");
 		globalChatMessages = configFile.getBoolean("Messages Go To All", Configuration.CATEGORY_GENERAL, true, "Messages go to all");
 		clientOnlyAPI = configFile.getBoolean("Read-Only Client-Based API", Configuration.CATEGORY_GENERAL, false, "Read-only API");
+		noFallDamage = configFile.getBoolean("Disable Fall Damage", Configuration.CATEGORY_GENERAL, false, "Disable fall damage");
+		noInWallDamage = configFile.getBoolean("Disable Stuck-In-Wall Damage", Configuration.CATEGORY_GENERAL, false, "Disable stuck-in-wall damage");
 		//		clientOnlyPortNumber = configFile.getInt("Port Number for Client-Only API", Configuration.CATEGORY_GENERAL, 0, 0, 65535, "Client-only API port number (normally 0)");
 
 		if (configFile.hasChanged())

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.76"
+version = "0.80"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 

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

diff --git a/mcpipy/interpreter.py b/mcpipy/interpreter.py
@@ -4,7 +4,7 @@
 # Useful for checking which interpreter RaspberryJamMod's /py command is picking up.
 #
 
-from mine *
+from mine import *
 import sys
 import os
 

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.76";
+	public static final String VERSION = "0.80";
 	public static final String NAME = "Raspberry Jam Mod";
 	private APIServer fullAPIServer = null;
 	private PythonExternalCommand pythonExternalCommand = null;