Added a smaller "Red X" texture for the future.

AntiqueAtlasTeam · Feb 20, 2014 · bd4cfb9 · bd4cfb9
1 parent 7db6e91
commit bd4cfb9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/...s/antiqueatlas/textures/gui/map/red_x.png → ...queatlas/textures/gui/map/red_x_large.png b/...s/antiqueatlas/textures/gui/map/red_x.png → ...queatlas/textures/gui/map/red_x_large.png
diff --git a/src/assets/antiqueatlas/textures/gui/map/red_x_small.png b/src/assets/antiqueatlas/textures/gui/map/red_x_small.png
diff --git a/src/hunternif/mc/atlas/ClientProxy.java b/src/hunternif/mc/atlas/ClientProxy.java
@@ -109,7 +109,7 @@ public boolean setDefaultMarker() {
 		boolean changed = false;
 		MarkerAPI api = AtlasAPI.getMarkerAPI();
 		changed |= api.setTextureIfNone("google", Textures.MAP_GOOGLE_MARKER);
-		changed |= api.setTextureIfNone("red_x", Textures.MAP_RED_X);
+		changed |= api.setTextureIfNone("red_x_large", Textures.MAP_RED_X_LARGE);
 		return changed;
 	}
 }
diff --git a/src/hunternif/mc/atlas/client/Textures.java b/src/hunternif/mc/atlas/client/Textures.java
@@ -20,7 +20,8 @@ public class Textures {
 
 	public static final ResourceLocation MAP_PLAYER = new ResourceLocation(GUI_MAP + "player.png");
 	public static final ResourceLocation MAP_GOOGLE_MARKER = new ResourceLocation(GUI_MAP + "google_marker.png");
-	public static final ResourceLocation MAP_RED_X = new ResourceLocation(GUI_MAP + "red_x.png");
+	public static final ResourceLocation MAP_RED_X_LARGE = new ResourceLocation(GUI_MAP + "red_x_large.png");
+	public static final ResourceLocation MAP_RED_X_SMALL = new ResourceLocation(GUI_MAP + "red_x_small.png");
 
 	public static final ResourceLocation MAP_TEST = new ResourceLocation(GUI_MAP + "test.png");
 	public static final ResourceLocation MAP_MOUNTAINS = new ResourceLocation(GUI_MAP + "mountains.png");

diff --git a/src/hunternif/mc/atlas/client/gui/GuiMarkerFinalizer.java b/src/hunternif/mc/atlas/client/gui/GuiMarkerFinalizer.java
@@ -15,7 +15,7 @@
  * @author Hunternif
  */
 public class GuiMarkerFinalizer extends GuiComponent {
-	public static final String defaultMarker = "red_x";
+	public static final String defaultMarker = "red_x_large";
 
 	private World world;
 	private int atlasID, dimension, x, z;

diff --git a/src/hunternif/mc/atlas/marker/MarkerTextureMap.java b/src/hunternif/mc/atlas/marker/MarkerTextureMap.java
@@ -22,7 +22,7 @@ public static MarkerTextureMap instance() {
 	}
 
 	private final Map<String, ResourceLocation> map = new HashMap<String, ResourceLocation>();
-	private final ResourceLocation defaultTexture = Textures.MAP_RED_X;
+	private final ResourceLocation defaultTexture = Textures.MAP_RED_X_LARGE;
 
 	public void setTexture(String markerType, ResourceLocation texture) {
 		map.put(markerType, texture);