Fix read of duplicate patchnames, update copyright year.

Author: MTrop

README.md

@@ -1,5 +1,5 @@
 # Doom Struct
-Copyright (c) 2015 - 2024 Matt Tropiano  
+Copyright (c) 2015 - 2025 Matt Tropiano  
 
 [Latest Release](https://github.com/MTrop/DoomStruct/releases/latest)
 

docs/CHANGELOG.md

@@ -1,8 +1,16 @@
-Doom Struct (C) 2015-2024
+Doom Struct (C) 2015-2025
 =========================
 by Matt Tropiano et al. (see AUTHORS.txt)
 
 
+Changed in 2.18.0
+-----------------
+
+- `Fixed` PatchNames.readBytes(...) is now tolerant of PNAMES lumps that may contain duplicate patch names (since it can corrupt a TextureSet).
+- `Added` PatchNames.add(int, boolean) for allowing duplicate patch names.
+- `Changed` Slightly more efficient texture exporting in TextureSet.
+
+
 Changed in 2.17.0
 -----------------
 

src/main/java/net/mtrop/doom/texture/PatchNames.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015-2023 Matt Tropiano
+ * Copyright (c) 2015-2025 Matt Tropiano
  * This program and the accompanying materials are made available under the 
  * terms of the GNU Lesser Public License v2.1 which accompanies this 
  * distribution, and is available at
@@ -60,9 +60,23 @@ public void clear()
 	 * @see NameUtils#isValidEntryName(String) 
 	 */
 	public int add(String name)
+	{
+		return add(name, false);
+	}
+	
+	/**
+	 * Adds a patch entry.
+	 * @param name the entry name.
+	 * @param allowDuplicates if true, allow a duplicate entry.
+	 * @return the index of the added entry, or an existing index if it was already in the list and <code>allowDuplicates</code> is <code>false</code>.
+	 * @throws IllegalArgumentException if the provided name is not a valid entry name.
+	 * @see NameUtils#isValidEntryName(String)
+	 * @since 2.18.0
+	 */
+	public int add(String name, boolean allowDuplicates)
 	{
 		NameUtils.checkValidEntryName(name);
-		if (nameList.contains(name))
+		if (!allowDuplicates && nameList.contains(name))
 			return nameList.getIndexOf(name);
 
 		int out = nameList.size();
@@ -120,7 +134,7 @@ public void readBytes(InputStream in) throws IOException
 		SerialReader sr = new SerialReader(SerialReader.LITTLE_ENDIAN);
 		int n = sr.readInt(in);
 		while (n-- > 0)
-			add(NameUtils.toValidEntryName(NameUtils.nullTrim(new String(sr.readBytes(in, 8), "ASCII"))));
+			add(NameUtils.toValidEntryName(NameUtils.nullTrim(new String(sr.readBytes(in, 8), "ASCII"))), true);
 	}
 
 	@Override

src/main/java/net/mtrop/doom/texture/TextureSet.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015-2024 Matt Tropiano
+ * Copyright (c) 2015-2025 Matt Tropiano
  * This program and the accompanying materials are made available under the 
  * terms of the GNU Lesser Public License v2.1 which accompanies this 
  * distribution, and is available at
@@ -69,9 +69,10 @@ public TextureSet(PatchNames pnames, final CommonTextureList<?> ... textureLists
 				for (int j = 0; j < t.getPatchCount(); j++)
 				{
 					CommonPatch p = t.getPatch(j);
-					String patchName = pnames.get(p.getNameIndex());
+					int patchIndex = p.getNameIndex();
+					String patchName = pnames.get(patchIndex);
 					if (patchName == null)
-						throw new TextureException("Index "+j+" in PNAMES does not exist!");
+						throw new TextureException("Index "+patchIndex+" in PNAMES does not exist!");
 					Patch newpatch = newtex.createPatch(patchName);
 					newpatch.setOriginX(p.getOriginX());
 					newpatch.setOriginY(p.getOriginY());
@@ -294,10 +295,7 @@ public <P extends CommonPatch, T extends CommonTexture<P>> void export(PatchName
 
 				index = pnames.indexOf(pname);
 				if (index == -1)
-				{
-					pnames.add(pname);
-					index = pnames.indexOf(pname);
-				}	
+					index = pnames.add(pname);
 
 				P ndtp = ndt.createPatch();
 				ndtp.setOriginX(patch.getOriginX());