Skip to content

Commit 7cdd276

Browse files
fix: RegistryUtil broken on integrated server
1 parent 9d2b18e commit 7cdd276

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

src/main/java/cam72cam/mod/entity/DamageType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private DamageType(ResourceKey<net.minecraft.world.damagesource.DamageType> key)
6969
public DamageSource getDamageSource(Level level) {
7070
//TODO RegistryUtil is broken
7171
Holder<net.minecraft.world.damagesource.DamageType> type =
72-
level.registryAccess().lookupOrThrow(Registries.DAMAGE_TYPE).getOrThrow(internal);
72+
RegistryUtil.getRegistry().lookupOrThrow(Registries.DAMAGE_TYPE).getOrThrow(internal);
7373
return new DamageSource(type, null, null, null);
7474
}
7575

src/main/java/cam72cam/mod/util/RegistryUtil.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cam72cam.mod.util;
22

3+
import cam72cam.mod.ModCore;
34
import cam72cam.mod.item.Fuzzy;
45
import cam72cam.mod.item.ItemStack;
56
import net.minecraft.client.Minecraft;
@@ -34,7 +35,16 @@ public static List<ItemStack> resolveTagsRecipePhase(@Nonnull Fuzzy fuzzy) {
3435
public static RegistryAccess getRegistry() {
3536
try {
3637
if (FMLLoader.getDist().isClient()) {
37-
return Minecraft.getInstance().getConnection().registryAccess();
38+
if (Thread.currentThread().getThreadGroup().getName().contains("main")) {
39+
//Logical client
40+
return Minecraft.getInstance().getConnection().registryAccess();
41+
} else if (Thread.currentThread().getThreadGroup().getName().contains("SERVER")) {
42+
//Integrated server
43+
return ServerLifecycleHooks.getCurrentServer().registryAccess();
44+
} else {
45+
ModCore.warn("What the hell Minecraft?");
46+
return ServerLifecycleHooks.getCurrentServer().registryAccess();
47+
}
3848
} else {
3949
return ServerLifecycleHooks.getCurrentServer().registryAccess();
4050
}

0 commit comments

Comments
 (0)