diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeGameTestHelper.java b/src/main/java/net/minecraftforge/common/extensions/IForgeGameTestHelper.java index 0763246954..442856abbd 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeGameTestHelper.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeGameTestHelper.java @@ -19,6 +19,7 @@ import com.mojang.authlib.GameProfile; import io.netty.channel.embedded.EmbeddedChannel; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.gametest.framework.GameTestAssertException; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.network.Connection; @@ -82,7 +83,11 @@ public interface IForgeGameTestHelper { throw new GameTestAssertException("%s -- Expected %s to be %s, but was %s".formatted(message.get(), name, Arrays.toString(expected), Arrays.toString(actual))); } - default Registry registryLookup(ResourceKey> registryKey) { + default Registry registry(ResourceKey> registryKey) { + return this.self().getLevel().registryAccess().registryOrThrow(registryKey); + } + + default HolderLookup.RegistryLookup registryLookup(ResourceKey> registryKey) { return this.self().getLevel().registryAccess().lookupOrThrow(registryKey); } @@ -99,6 +104,7 @@ public interface IForgeGameTestHelper { } }; var connection = new Connection(PacketFlow.SERVERBOUND); + @SuppressWarnings("unused") // Constructor has side effects var channel = new EmbeddedChannel(connection); var server = level.getServer(); diff --git a/src/test/java/net/minecraftforge/debug/gameplay/item/PreventItemDamageTest.java b/src/test/java/net/minecraftforge/debug/gameplay/item/PreventItemDamageTest.java index 3f3932e59b..c0d27b0a93 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/item/PreventItemDamageTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/item/PreventItemDamageTest.java @@ -85,7 +85,7 @@ public class PreventItemDamageTest extends BaseTestMod { player.lookAt(EntityAnchorArgument.Anchor.EYES, enemy.position()); // hit the player - var attack = helper.registryLookup(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.MOB_ATTACK); + var attack = helper.registry(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.MOB_ATTACK); var damage = new DamageSource(attack, enemy) { @Override public boolean scalesWithDifficulty() { diff --git a/src/test/java/net/minecraftforge/debug/gameplay/item/ShieldDisablingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/item/ShieldDisablingTest.java index de568dccc0..5645bf6e4c 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/item/ShieldDisablingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/item/ShieldDisablingTest.java @@ -70,7 +70,7 @@ public final class ShieldDisablingTest extends BaseTestMod { player.lookAt(EntityAnchorArgument.Anchor.EYES, enemy.position()); // hit the player - var attack = helper.registryLookup(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.MOB_ATTACK); + var attack = helper.registry(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.MOB_ATTACK); var damage = new DamageSource(attack, enemy) { @Override public boolean scalesWithDifficulty() {