Merge branch 'GirafiStudios-master'

samvbeckmann · Dec 9, 2016 · 7918717 · 7918717
2 parents 52eadbb + 482d239
commit 7918717
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-# Clock HUD
+# Clock HUD [![](http://cf.way2muchnoise.eu/full_226364_downloads.svg)](https://minecraft.curseforge.com/projects/clock-hud)
+
 ### What is it?
 Clock HUD is a modification for the game Minecraft that that adds a simple clock to your heads up display.
 ### Use

diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,7 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
+        maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version=1.3.2
-minecraft_version=1.10.2
-forge_version=12.18.0.2010
-mappings_version=snapshot_20160518
+mod_version=1.3.3
+minecraft_version=1.11
+forge_version=13.19.0.2153
+mappings_version=snapshot_20161119
diff --git a/src/main/java/com/qkninja/clockhud/ClockHUD.java b/src/main/java/com/qkninja/clockhud/ClockHUD.java
@@ -14,7 +14,7 @@
  * A simple clock GUI to make telling the time easier.
  * @author QKninja
  */
-@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.MOD_VERSION, acceptedMinecraftVersions="[1.9,1.11)", guiFactory = Reference.GUI_FACTORY_CLASS)
+@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.MOD_VERSION, acceptedMinecraftVersions="[1.11,1.12)", guiFactory = Reference.GUI_FACTORY_CLASS)
 public class ClockHUD
 {
     @Mod.Instance(Reference.MOD_ID)

diff --git a/src/main/java/com/qkninja/clockhud/client/gui/GuiClock.java b/src/main/java/com/qkninja/clockhud/client/gui/GuiClock.java
@@ -114,7 +114,7 @@ private boolean isDay(int currentTime)
      */
     private int getCurrentTime()
     {
-        World world = Minecraft.getMinecraft().theWorld;
+        World world = Minecraft.getMinecraft().world;
         long time = world.getWorldInfo().getWorldTime();
         return  (int) time % Reference.DAY_TICKS;
     }

diff --git a/src/main/java/com/qkninja/clockhud/client/gui/GuiDayCount.java b/src/main/java/com/qkninja/clockhud/client/gui/GuiDayCount.java
@@ -83,7 +83,7 @@ public void onRenderExperienceBar(RenderGameOverlayEvent.Post event)
      */
     private boolean isNewDay()
     {
-        return Minecraft.getMinecraft().theWorld.getWorldTime() % Reference.DAY_TICKS == Reference.NEW_DAY_TICK;
+        return Minecraft.getMinecraft().world.getWorldTime() % Reference.DAY_TICKS == Reference.NEW_DAY_TICK;
     }
 
     /**
@@ -93,7 +93,7 @@ private boolean isNewDay()
      */
     private String formDayString()
     {
-        return I18n.format(Names.Text.DAYCOUNT, Minecraft.getMinecraft().theWorld.getTotalWorldTime() / Reference.DAY_TICKS);
+        return I18n.format(Names.Text.DAYCOUNT, Minecraft.getMinecraft().world.getTotalWorldTime() / Reference.DAY_TICKS);
     }
 
     /**