FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-24 08:38:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Throw the exception when a duplicate registry entry is found. (#3991)

Browse source 
* Actually throw the exception when a duplicate registry entry is found.

* Improve mixin
This commit is contained in:
modmuss 2024-08-04 13:53:18 +01:00 committed by GitHub
parent 176f90366d
commit 66911b8fa5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java
View file

@ -25,6 +25,7 @@ import java.util.Set;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.mojang.serialization.Lifecycle;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
@ -379,4 +380,10 @@ public abstract class SimpleRegistryMixin<T> implements MutableRegistry<T>, Rema
fabric_prevEntries = null;
}
}
// Actually throw the exception when a duplicate is found.
@ModifyExpressionValue(method = "add", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;throwOrPause(Ljava/lang/Throwable;)Ljava/lang/Throwable;"))
private <E extends Throwable> E throwOnDuplicate(E t) throws E {
throw t;
}
}