Skip to content

Commit 7f719bc

Browse files
committed
Maintain order on mod support API
1 parent cbfbfb4 commit 7f719bc

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

DynmapCore/src/main/java/org/dynmap/modsupport/ModSupportImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.io.File;
44
import java.io.IOException;
5-
import java.util.HashMap;
5+
import java.util.LinkedHashMap;
66

77
import org.dynmap.Log;
88
import org.dynmap.modsupport.impl.ModModelDefinitionImpl;
@@ -12,7 +12,7 @@
1212
* Implementation of ModSupportAPI
1313
*/
1414
public class ModSupportImpl extends ModSupportAPI {
15-
private HashMap<String, ModTextureDefinitionImpl> txtDefsByModID = new HashMap<String, ModTextureDefinitionImpl>();
15+
private LinkedHashMap<String, ModTextureDefinitionImpl> txtDefsByModID = new LinkedHashMap<String, ModTextureDefinitionImpl>();
1616

1717
/**
1818
* Initialize mod support API

DynmapCore/src/main/java/org/dynmap/modsupport/impl/ModModelDefinitionImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.io.FileWriter;
55
import java.io.IOException;
66
import java.util.ArrayList;
7-
import java.util.HashMap;
7+
import java.util.LinkedHashMap;
88
import java.util.Locale;
99

1010
import org.dynmap.hdmap.HDBlockModels;
@@ -29,7 +29,7 @@ public class ModModelDefinitionImpl implements ModModelDefinition {
2929
private boolean published = false;
3030
private ArrayList<BlockModelImpl> blkModel = new ArrayList<BlockModelImpl>();
3131
private ArrayList<PatchDefinition> blkPatch = new ArrayList<PatchDefinition>();
32-
private HashMap<String, PatchDefinition> blkPatchMap = new HashMap<String, PatchDefinition>();
32+
private LinkedHashMap<String, PatchDefinition> blkPatchMap = new LinkedHashMap<String, PatchDefinition>();
3333
private PatchDefinitionFactory pdf;
3434

3535
public ModModelDefinitionImpl(ModTextureDefinitionImpl txtDef) {

DynmapCore/src/main/java/org/dynmap/modsupport/impl/ModTextureDefinitionImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.io.FileWriter;
55
import java.io.IOException;
66
import java.util.ArrayList;
7-
import java.util.HashMap;
7+
import java.util.LinkedHashMap;
88

99
import org.dynmap.modsupport.BigChestTextureFile;
1010
import org.dynmap.modsupport.BiomeTextureFile;
@@ -27,7 +27,7 @@ public class ModTextureDefinitionImpl implements ModTextureDefinition {
2727
private final String modver;
2828
private ModModelDefinitionImpl modDef = null;
2929
private String texturePath;
30-
private HashMap<String, TextureFileImpl> txtFileByID = new HashMap<String, TextureFileImpl>();
30+
private LinkedHashMap<String, TextureFileImpl> txtFileByID = new LinkedHashMap<String, TextureFileImpl>();
3131
private ArrayList<BlockTextureRecordImpl> blkTextureRec = new ArrayList<BlockTextureRecordImpl>();
3232
private ArrayList<CopyBlockTextureRecordImpl> blkCopyTextureRec = new ArrayList<CopyBlockTextureRecordImpl>();
3333
private boolean published = false;
@@ -272,7 +272,8 @@ public void writeToFile(File destdir) throws IOException {
272272
String s = "modname:" + this.modid;
273273
fw.write(s + "\n\n");
274274
// Loop through textures
275-
for (TextureFileImpl tfi : txtFileByID.values()) {
275+
for (String tid : txtFileByID.keySet()) {
276+
TextureFileImpl tfi = txtFileByID.get(tid);
276277
String line = tfi.getLine();
277278
if (line != null) {
278279
fw.write(line + "\n");

0 commit comments

Comments
 (0)