Skip to content

Commit 649c25d

Browse files
committed
Merge 1.20 into 1.20.4
2 parents a4bb17d + c6e01f8 commit 649c25d

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

common/src/main/java/org/embeddedt/modernfix/util/DynamicInt2ObjectMap.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
44
import it.unimi.dsi.fastutil.ints.IntSet;
5+
import it.unimi.dsi.fastutil.ints.IntSets;
56
import it.unimi.dsi.fastutil.objects.ObjectCollection;
7+
import it.unimi.dsi.fastutil.objects.ObjectLists;
68
import it.unimi.dsi.fastutil.objects.ObjectSet;
9+
import it.unimi.dsi.fastutil.objects.ObjectSets;
710

811
import java.util.Map;
912
import java.util.function.Function;
@@ -15,17 +18,17 @@ public DynamicInt2ObjectMap(Function<Integer, V> function) {
1518

1619
@Override
1720
public IntSet keySet() {
18-
throw new UnsupportedOperationException();
21+
return IntSets.EMPTY_SET;
1922
}
2023

2124
@Override
2225
public ObjectCollection<V> values() {
23-
throw new UnsupportedOperationException();
26+
return ObjectLists.emptyList();
2427
}
2528

2629
@Override
2730
public ObjectSet<Map.Entry<Integer, V>> entrySet() {
28-
throw new UnsupportedOperationException();
31+
return ObjectSets.emptySet();
2932
}
3033

3134
@Override

common/src/main/java/org/embeddedt/modernfix/util/DynamicMap.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.jetbrains.annotations.Nullable;
55

66
import java.util.Collection;
7+
import java.util.Collections;
78
import java.util.Map;
89
import java.util.Set;
910
import java.util.function.Function;
@@ -64,18 +65,18 @@ public void clear() {
6465
@NotNull
6566
@Override
6667
public Set<K> keySet() {
67-
throw new UnsupportedOperationException();
68+
return Collections.emptySet();
6869
}
6970

7071
@NotNull
7172
@Override
7273
public Collection<V> values() {
73-
throw new UnsupportedOperationException();
74+
return Collections.emptyList();
7475
}
7576

7677
@NotNull
7778
@Override
7879
public Set<Entry<K, V>> entrySet() {
79-
throw new UnsupportedOperationException();
80+
return Collections.emptySet();
8081
}
8182
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.spongepowered.asm.mixin.injection.At;
77
import org.spongepowered.asm.mixin.injection.Redirect;
88

9-
@Mixin(RecipeManager.class)
9+
@Mixin(value = RecipeManager.class, priority = 2000)
1010
public class RecipeManagerMixin {
1111
@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)
1212
private void silenceException(Logger instance, String s, Object location, Object exc) {

0 commit comments

Comments
 (0)