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

Merge 1.20.4 into 1.20.5

Browse Source
This commit is contained in:
embeddedt 2024-01-12 15:49:17 -05:00
commit c2a2fd876b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/org/embeddedt/modernfix/util/DynamicInt2ObjectMap.java
View File

@ -2,8 +2,11 @@ package org.embeddedt.modernfix.util;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSet;
import it.unimi.dsi.fastutil.ints.IntSets;
import it.unimi.dsi.fastutil.objects.ObjectCollection; import it.unimi.dsi.fastutil.objects.ObjectCollection;
import it.unimi.dsi.fastutil.objects.ObjectLists;
import it.unimi.dsi.fastutil.objects.ObjectSet; import it.unimi.dsi.fastutil.objects.ObjectSet;
import it.unimi.dsi.fastutil.objects.ObjectSets;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
@ -15,17 +18,17 @@ public class DynamicInt2ObjectMap<V> extends DynamicMap<Integer, V> implements I
@Override @Override
public IntSet keySet() { public IntSet keySet() {
throw new UnsupportedOperationException(); return IntSets.EMPTY_SET;
} }
@Override @Override
public ObjectCollection<V> values() { public ObjectCollection<V> values() {
throw new UnsupportedOperationException(); return ObjectLists.emptyList();
} }
@Override @Override
public ObjectSet<Map.Entry<Integer, V>> entrySet() { public ObjectSet<Map.Entry<Integer, V>> entrySet() {
throw new UnsupportedOperationException(); return ObjectSets.emptySet();
} }
@Override @Override

7
common/src/main/java/org/embeddedt/modernfix/util/DynamicMap.java
View File

@ -4,6 +4,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
@ -64,18 +65,18 @@ public class DynamicMap<K, V> implements Map<K, V> {
@NotNull @NotNull
@Override @Override
public Set<K> keySet() { public Set<K> keySet() {
throw new UnsupportedOperationException(); return Collections.emptySet();
} }
@NotNull @NotNull
@Override @Override
public Collection<V> values() { public Collection<V> values() {
throw new UnsupportedOperationException(); return Collections.emptyList();
} }
@NotNull @NotNull
@Override @Override
public Set<Entry<K, V>> entrySet() { public Set<Entry<K, V>> entrySet() {
throw new UnsupportedOperationException(); return Collections.emptySet();
} }
} }

2
neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java
View File

@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(RecipeManager.class) @Mixin(value = RecipeManager.class, priority = 2000)
public class RecipeManagerMixin { public class RecipeManagerMixin {
@Redirect(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false), require = 0) @Redirect(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false), require = 0)
private void silenceException(Logger instance, String s, Object location, Object exc) { private void silenceException(Logger instance, String s, Object location, Object exc) {