Fix changelog including tag prefix in version numbers

Author: Jonathing

src/main/java/net/minecraftforge/gitver/internal/GitChangelog.java

@@ -45,12 +45,11 @@ static String generateChangelogFromTo(Git git, String repositoryUrl, boolean pla
         var changeLogName = Util.replace(git.getRepository().getFullBranch(), s -> s.replace("refs/heads/", "")); //Generate a changelog name from the current branch.
 
         var tagMap = GitUtils.getCommitToTagMap(git, tagPrefix); //Grab a map between commits and tag names.
-        var log = GitUtils.getCommitLogFromTo(git, tagMap, start, end, tagPrefix, filter); //Get all commits between the start and the end.
-        var logList = new ArrayList<RevCommit>(); //And generate a list from it.
-        log.forEach(logList::add);
+        var log = Util.toList(GitUtils.getCommitLogFromTo(git, tagMap, start, end, tagPrefix, filter)); //Get all commits between the start and the end.
+        tagMap = Util.removePrefix(tagMap, tagPrefix); // Reassign with a new map that removes the prefix
 
-        var versionMap = GitUtils.buildVersionMap(logList, tagMap); //And generate a version map from this. Mapping each commit to a unique version.
-        var primaryVersionMap = GitUtils.getPrimaryVersionMap(logList, tagMap); //Then determine which commits belong to which identifiable-version mappings.
+        var versionMap = GitUtils.buildVersionMap(log, tagMap); //And generate a version map from this. Mapping each commit to a unique version.
+        var primaryVersionMap = GitUtils.getPrimaryVersionMap(log, tagMap); //Then determine which commits belong to which identifiable-version mappings.
 
         //Determine the length of each identifiable-versions max-length commit specific version.
         //(How wide does the area in-front of the commit message need to be to fit all versions in the current identifiable-version?)
@@ -68,7 +67,7 @@ static String generateChangelogFromTo(Git git, String repositoryUrl, boolean pla
 
         //Loop over all commits and append their message as a changelog.
         //(They are already in order from newest to oldest, so that works out for us.)
-        for (RevCommit commit : logList) {
+        for (RevCommit commit : log) {
             var commitHash = commit.toObjectId().name(); //Get the commit hash, so we can look it up in maps.
 
             var requiresVersionHeader = false; //Indicates later on if we need to inject a new version header.

src/main/java/net/minecraftforge/gitver/internal/Util.java

@@ -9,6 +9,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -30,7 +32,7 @@ static <R, E extends Throwable> R sneak(Throwable t) throws E {
     }
 
     static String[] rsplit(String input, String del, int limit) {
-        var list = new ArrayList<String>();
+        var list = new ArrayList<String>(limit > 0 ? limit : input.split(del).length);
         int count = 0;
         int index;
 
@@ -57,6 +59,22 @@ static <T> ArrayList<T> copyList(Collection<T> t, Consumer<? super ArrayList<T>>
         return list;
     }
 
+    static <T> ArrayList<T> toList(Iterable<T> t) {
+        var list = new ArrayList<T>();
+        for (var i : t) list.add(i);
+        return list;
+    }
+
+    @SuppressWarnings("unchecked")
+    static <K, V> HashMap<K, V> removePrefix(Map<K, V> map, String prefix) {
+        var ret = new HashMap<K, V>(map.size());
+        map.forEach((k, v) -> ret.put(
+            k instanceof String s && s.startsWith(prefix) ? (K) s.substring(prefix.length()) : k,
+            v instanceof String s && s.startsWith(prefix) ? (V) s.substring(prefix.length()) : v
+        ));
+        return ret;
+    }
+
     /**
      * Counts the number of elements in an iterable beginning from {@code -1}.
      *