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

Merge remote-tracking branch 'origin/main' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-05-14 19:25:48 -04:00
commit 9ca4961841
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/org/embeddedt/modernfix/duck/IClientNetHandler.java
View File

@ -1,7 +0,0 @@
package org.embeddedt.modernfix.duck;
import net.minecraft.network.FriendlyByteBuf;
public interface IClientNetHandler {
FriendlyByteBuf getCopiedCustomBuffer();
}

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

@ -77,11 +77,15 @@ public class CanonizingStringMap<T> implements Map<String, T> {
public void putAll(@NotNull Map<? extends String, ? extends T> map) { public void putAll(@NotNull Map<? extends String, ? extends T> map) {
if(map.size() == 0) if(map.size() == 0)
return; return;
// grow early if we know there are enough non-overlapping keys
if((map.size() - backingMap.size()) > GROWTH_THRESHOLD && !(backingMap instanceof Object2ObjectOpenHashMap)) {
backingMap = new Object2ObjectOpenHashMap<>(backingMap);
}
map.forEach((String key, T val) -> { map.forEach((String key, T val) -> {
key = KEY_INTERNER.intern(key); key = KEY_INTERNER.intern(key);
backingMap.put(key, val); backingMap.put(key, val);
}); });
// if it's too big to be an array, grow it // if it's still an array, and now too big, grow it
if(backingMap.size() > GROWTH_THRESHOLD && !(backingMap instanceof Object2ObjectOpenHashMap)) { if(backingMap.size() > GROWTH_THRESHOLD && !(backingMap instanceof Object2ObjectOpenHashMap)) {
backingMap = new Object2ObjectOpenHashMap<>(backingMap); backingMap = new Object2ObjectOpenHashMap<>(backingMap);
} }