Beta 5

SmylerMC · May 28, 2020 · 7e78657 · 7e78657
1 parent 8b1e797
commit 7e78657
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -10,6 +10,6 @@ forge_version = 1.12.2-14.23.5.2847
 mcp_mappings = stable_39
 
 # Mod stuff
-mod_version = 1.0.0-beta5-dev
+mod_version = 1.0.0-beta5
 mod_group = fr.thesmyler.terramap
 mod_id = terramap
diff --git a/src/main/java/fr/thesmyler/terramap/config/TerramapConfiguration.java b/src/main/java/fr/thesmyler/terramap/config/TerramapConfiguration.java
@@ -25,7 +25,7 @@ public class TerramapConfiguration{
 	@Config.Name("tpll_command")
 	@Config.LangKey("terramap.config.tpllcmd")
 	@Config.Comment("The base tpll command to use")
-	public static String tpllcmd = "/tpll {latitude} {longitude}"; //TODO Save per server
+	public static String tpllcmd = "/tpll {latitude} {longitude}";
 
 	@Config.Name("force_client_tp_cmd")
 	@Config.LangKey("terramap.config.forcetpllcmd")

diff --git a/src/main/java/fr/thesmyler/terramap/maps/tiles/RasterWebTile.java b/src/main/java/fr/thesmyler/terramap/maps/tiles/RasterWebTile.java
@@ -9,7 +9,7 @@
 
 import fr.thesmyler.terramap.TerramapMod;
 import fr.thesmyler.terramap.caching.Cachable;
-import fr.thesmyler.terramap.maps.utils.ImageUtils;
+import fr.thesmyler.terramap.maps.utils.TerramapImageUtils;
 import fr.thesmyler.terramap.maps.utils.WebMercatorUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.DynamicTexture;
@@ -87,7 +87,7 @@ public void cached(File f) {
 
 	private void loadImageFomFile(File f) throws IOException {
 		if(!f.exists() || !f.isFile()) {
-			this.image = ImageUtils.imageFromColor(this.size, this.size, this.defaultPixel);
+			this.image = TerramapImageUtils.imageFromColor(this.size, this.size, this.defaultPixel);
 		} else {
 			this.image = ImageIO.read(f);
 		}
@@ -101,7 +101,7 @@ private void loadImageFomFile(File f) throws IOException {
 	 * @throws IOException 
 	 */
 	public int[] getPixel(int x, int y) throws IOException {
-		return ImageUtils.decodeRGBA2Array(this.getImage().getRGB(x, y));
+		return TerramapImageUtils.decodeRGBA2Array(this.getImage().getRGB(x, y));
 	}
 
 
@@ -178,7 +178,7 @@ public InvalidTileCoordinatesException(RasterWebTile t) {
 	public static void registerErrorTexture() {
 		TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
 		int color[] = {175, 175, 175};
-		RasterWebTile.errorTileTexture = textureManager.getDynamicTextureLocation(TerramapMod.MODID + ":error_tile_texture", new DynamicTexture(ImageUtils.imageFromColor(256,  256, color)));
+		RasterWebTile.errorTileTexture = textureManager.getDynamicTextureLocation(TerramapMod.MODID + ":error_tile_texture", new DynamicTexture(TerramapImageUtils.imageFromColor(256,  256, color)));
 
 	}
 

diff --git a/...myler/terramap/maps/utils/ImageUtils.java → ...rramap/maps/utils/TerramapImageUtils.java b/...myler/terramap/maps/utils/ImageUtils.java → ...rramap/maps/utils/TerramapImageUtils.java
@@ -8,8 +8,7 @@
  * @author SmylerMC
  *
  */
-//FIXME It conflicts with java  built ins
-public class ImageUtils {
+public class TerramapImageUtils {
 
 	/**
 	 * Converts an integer representing a pixel value to an array