5.1.60: Change Registry Map to EnumMap #36

Verclene · Feb 24, 2016 · 706d4af · 706d4af
1 parent 528946b
commit 706d4af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/littleMaidMobX/LMM_EnumSound.java b/src/main/java/littleMaidMobX/LMM_EnumSound.java
@@ -77,5 +77,6 @@ public static LMM_EnumSound getEnumSound(int pindex) {
 		}
 		return Null;
 	}
+
 
 }
diff --git a/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java b/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java
@@ -47,8 +47,8 @@
 public class LMM_LittleMaidMobNX {
 
 	public static final String DOMAIN = "lmmx";
-	public static final String VERSION = "5.1.59";
-	public static final String VERSION_FORSITE = "NX5 Build 59";
+	public static final String VERSION = "5.1.60";
+	public static final String VERSION_FORSITE = "NX5 Build 60";
 	public static final String ACCEPTED_MCVERSION = "[1.8,1.8.9]";
 	public static final int VERSION_CODE = 14;
 

diff --git a/src/main/java/net/blacklab/lmmnx/client/LMMNX_SoundRegistry.java b/src/main/java/net/blacklab/lmmnx/client/LMMNX_SoundRegistry.java
@@ -3,6 +3,7 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -21,7 +22,7 @@ public class LMMNX_SoundRegistry {
 	public static final String DEFAULT_TEXTURE_REGISTRATION_KEY = "!#DEFAULT#!";
 
 	// Sound→((テクスチャ名+色)+パス)の順．
-	private Map<LMM_EnumSound, HashMap<Pair<String, Integer>, String>> registerMap;
+	private EnumMap<LMM_EnumSound, HashMap<Pair<String, Integer>, String>> registerMap;
 	// 実際の参照パス
 	private Map<String, List<String>> pathMap;
 
@@ -31,7 +32,7 @@ public class LMMNX_SoundRegistry {
 	private static LMMNX_SoundRegistry instR = new LMMNX_SoundRegistry();
 
 	private LMMNX_SoundRegistry() {
-		registerMap = new HashMap<LMM_EnumSound, HashMap<Pair<String,Integer>,String>>();
+		registerMap = new EnumMap<LMM_EnumSound, HashMap<Pair<String,Integer>,String>>(LMM_EnumSound.class);
 		pathMap = new HashMap<String, List<String>>();
 	}