R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.2 into 1.19.4

Browse Source
This commit is contained in:
embeddedt 2023-08-02 15:45:56 -04:00
commit ba9ba01dfe
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/util/CanonizingStringMap.java
View File

@ -29,6 +29,8 @@ public class CanonizingStringMap<T> extends HashMap<String, T> {
@Override @Override
public void putAll(Map<? extends String, ? extends T> m) { public void putAll(Map<? extends String, ? extends T> m) {
if(m.isEmpty())
return;
HashMap<String, T> tmp = new HashMap<>(); HashMap<String, T> tmp = new HashMap<>();
m.forEach((k, v) -> tmp.put(intern(k), v)); m.forEach((k, v) -> tmp.put(intern(k), v));
super.putAll(tmp); super.putAll(tmp);

6
settings.gradle
View File

@ -9,7 +9,9 @@ pluginManagement {
include("test_agent") include("test_agent")
include("common") include("common")
include("fabric")
include("forge") getProperty("enabled_platforms").tokenize(',').each { it ->
include(it.trim())
}
rootProject.name = 'modernfix' rootProject.name = 'modernfix'