1.7.10 update

README.md

@@ -1,36 +1,31 @@
-mapwriter
-=========
+# Mapwriter
 
 MapWriter: A minimap mod for Minecraft
 
+### Instructions for development:
+1. Run "gradlew setupDecompWorkspace" in the mapwriter folder.
 
-Instructions for development:
-
-1) Run "gradlew setupDecompWorkspace" in the mapwriter folder.
-
-2) Run "gradlew eclipse" if using the eclipse IDE. If it does not work you may
+2. Run "gradlew eclipse" if using the eclipse IDE. If it does not work you may
    need to copy the eclipse folder from a Forge src release into the mapwriter
    folder and retry the command.
 
-3) Open eclipse and set the workspace directory to mapwriter/eclipse.
+3. Open eclipse and set the workspace directory to mapwriter/eclipse.
 
-4) You should now be able to modify the code and test by using the "Client" Run
+4. You should now be able to modify the code and test by using the "Client" Run
    Configuration.
 
-Reobfuscation and Packaging:
-
-1) Edit the version numbers in mapwriter.forge.MwForge and build.gradle.
+### Reobfuscation and Packaging:
+1. Edit the version numbers in mapwriter.forge.MwForge and build.gradle.
    The version numbers in mcmod.info should automatically be set to the same
    versions as set in the build.gradle file.
 
-2) Run "gradlew reobf".
-
-3) The reobfuscated jar should be output to the mapwriter/build/libs folder.
+2. Run "gradlew build".
 
-Acknowledgements:
+3. The reobfuscated jar should be output to the mapwriter/build/libs folder.
 
+### Acknowledgements:
 * Chrixian for the code to get death markers working.
 * ProfMobius for the overlay API.
 * taelnia for extrautils compatibility patch.
 * LoneStar144 for minimap border and arrow textures.
-* jk-5 for updating the mod to be compatible with Minecraft 1.7.
+* jk-5 for updating the mod to be compatible with Minecraft 1.7.2 and 1.7.10

build.gradle

@@ -11,22 +11,22 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
 }
 
 apply plugin: 'forge'
 
-version = '2.1.1'
+version = '2.2.0'
 group = 'mapwriter'
 archivesBaseName = 'MapWriter'
 
 minecraft {
-	version = '1.7.2-10.12.0.1034'
-    assetDir = "eclipse/assets"
+    version = '1.7.10-10.13.0.1206'
+    runDir = "runtime"
 }
-processResources
-{
+
+processResources {
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'

src/main/java/mapwriter/forge/MwForge.java

@@ -5,10 +5,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import mapwriter.Mw;
 import net.minecraft.client.Minecraft;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.common.MinecraftForge;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -21,7 +19,12 @@
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent;
 
-@Mod(modid="MapWriter", name="MapWriter", version="2.1.1")
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.common.MinecraftForge;
+
+import mapwriter.Mw;
+
+@Mod(modid="MapWriter", name="MapWriter", version="2.2.0")
 public class MwForge {
 
 	@Instance("MapWriter")

src/main/java/mapwriter/map/mapmode/MapMode.java

@@ -98,7 +98,7 @@ public void setScreenRes(int dw, int dh, int sw, int sh, double scaling) {
 
 	public void setScreenRes() {
 		Minecraft mc = Minecraft.getMinecraft();
-		ScaledResolution sRes = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
+		ScaledResolution sRes = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
 		this.setScreenRes(mc.displayWidth, mc.displayHeight, sRes.getScaledWidth(), sRes.getScaledHeight(), sRes.getScaleFactor());
 	}
 

src/main/resources/assets/mapwriter/lang/nl_NL.lang

@@ -0,0 +1,8 @@
+key.mw_open_gui=Open kaart scherm
+key.mw_new_marker=Nieuw punt
+key.mw_next_map_mode=Volgende kaart stand
+key.mw_next_marker_group=Nieuwe punt groep
+key.mw_teleport=Teleporteer naar punt
+key.mw_zoom_in=Zoom kaart in
+key.mw_zoom_out=Zoom kaart uit
+key.mw_underground_mode=Ondergrondse kaart stand