From 1c92f132ee92058a36d2691850ab3590e2d16e49 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 13 May 2019 16:48:16 +0100 Subject: [PATCH] Hotfix for #696 and fix travis Squashed commit of the following: commit 741b2dd2548d89220251f1434737d9b1b5b058a8 Author: Chloe Dawn Date: Mon May 13 16:40:38 2019 +0100 Hotfix for #696 commit b88b9d59509c31d1bba44f52d8fb6f12c782a0fd Author: modmuss50 Date: Mon May 13 16:12:49 2019 +0100 Disable email on build commit f45e26dd0156e8389347919b159576fd354372f6 Author: modmuss50 Date: Mon May 13 16:09:21 2019 +0100 fix travis? --- .travis.yml | 5 ++++- gradle.properties | 2 ++ mappings/net/minecraft/block/entity/Hopper.mapping | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 gradle.properties diff --git a/.travis.yml b/.travis.yml index 7323208667..b144433a57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,7 @@ jdk: script: - chmod +x gradlew - - ./gradlew build mapNamedJar --stacktrace \ No newline at end of file + - ./gradlew build mapNamedJar --stacktrace + +notifications: + email: false \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..5cacfe8973 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G diff --git a/mappings/net/minecraft/block/entity/Hopper.mapping b/mappings/net/minecraft/block/entity/Hopper.mapping index b0d28cb454..d1fa71a309 100644 --- a/mappings/net/minecraft/block/entity/Hopper.mapping +++ b/mappings/net/minecraft/block/entity/Hopper.mapping @@ -5,5 +5,5 @@ CLASS bub net/minecraft/block/entity/Hopper METHOD A getHopperY ()D METHOD B getHopperZ ()D METHOD O_ getInputAreaShape ()Lcsr; - METHOD w getWorld ()Lbhi; + METHOD w getHopperWorld ()Lbhi; METHOD z getHopperX ()D