fix minor compile errors

neoforged · Apr 26, 2024 · ab0f736 · ab0f736
1 parent cd9c275
commit ab0f736
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/patches/net/minecraft/world/entity/player/Player.java.patch b/patches/net/minecraft/world/entity/player/Player.java.patch
@@ -322,7 +322,7 @@
              return BedBlock.findStandUpPosition(EntityType.PLAYER, p_36131_, p_36132_, blockstate.getValue(BedBlock.FACING), p_36133_);
          } else if (!p_36134_) {
 -            return Optional.empty();
-+            return blockstate.getRespawnPosition(EntityType.PLAYER, p_36131_, p_36132_, p_36133_, null);
++            return blockstate.getRespawnPosition(EntityType.PLAYER, p_36131_, p_36132_, p_36133_);
          } else {
              boolean flag = block.isPossibleToRespawnInThis(blockstate);
              BlockState blockstate1 = p_36131_.getBlockState(p_36132_.above());

diff --git a/src/main/java/net/neoforged/neoforge/common/extensions/IBlockStateExtension.java b/src/main/java/net/neoforged/neoforge/common/extensions/IBlockStateExtension.java
@@ -175,11 +175,10 @@ default boolean isBed(BlockGetter level, BlockPos pos, LivingEntity sleeper) {
      * @param level       The current level
      * @param pos         Block position in level
      * @param orientation The angle the entity had when setting the respawn point
-     * @param entity      The entity respawning, often null
      * @return The spawn position or the empty optional if respawning here is not possible
      */
-    default Optional<Vec3> getRespawnPosition(EntityType<?> type, LevelReader level, BlockPos pos, float orientation, @Nullable LivingEntity entity) {
-        return self().getBlock().getRespawnPosition(self(), type, level, pos, orientation, entity);
+    default Optional<Vec3> getRespawnPosition(EntityType<?> type, LevelReader level, BlockPos pos, float orientation) {
+        return self().getBlock().getRespawnPosition(self(), type, level, pos, orientation);
     }
 
     /**

diff --git a/tests/src/main/java/net/neoforged/neoforge/debug/block/BlockTests.java b/tests/src/main/java/net/neoforged/neoforge/debug/block/BlockTests.java
@@ -16,7 +16,6 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -37,7 +36,6 @@
 import net.neoforged.testframework.gametest.EmptyTemplate;
 import net.neoforged.testframework.gametest.ExtendedGameTestHelper;
 import net.neoforged.testframework.registration.RegistrationHelper;
-import org.jetbrains.annotations.Nullable;
 
 @ForEachTest(groups = BlockTests.GROUP)
 public class BlockTests {
@@ -83,7 +81,7 @@ protected ItemInteractionResult useItemOn(ItemStack p_316304_, BlockState state,
             }
 
             @Override
-            public Optional<Vec3> getRespawnPosition(BlockState state, EntityType<?> type, LevelReader levelReader, BlockPos pos, float orientation, @Nullable LivingEntity entity) {
+            public Optional<Vec3> getRespawnPosition(BlockState state, EntityType<?> type, LevelReader levelReader, BlockPos pos, float orientation) {
                 // have the player respawn a block north to the location of the anchor
                 return Optional.of(pos.getCenter().add(0, 1, 1));
             }

diff --git a/tests/src/main/java/net/neoforged/neoforge/debug/fluid/FluidEventTests.java b/tests/src/main/java/net/neoforged/neoforge/debug/fluid/FluidEventTests.java
@@ -11,8 +11,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
-import net.neoforged.bus.api.Event;
-import net.neoforged.neoforge.event.level.BlockEvent;
+import net.neoforged.neoforge.event.level.block.CreateFluidSourceEvent;
 import net.neoforged.testframework.DynamicTest;
 import net.neoforged.testframework.annotation.ForEachTest;
 import net.neoforged.testframework.annotation.TestHolder;
@@ -23,15 +22,15 @@ public class FluidEventTests {
     @GameTest
     @TestHolder(description = "Tests if the CreateFluidSourceEvent is fired and allows modifying the result")
     static void createFluidSourceEvent(final DynamicTest test) {
-        test.eventListeners().forge().addListener((final BlockEvent.CreateFluidSourceEvent event) -> {
+        test.eventListeners().forge().addListener((final CreateFluidSourceEvent event) -> {
             final BlockState state = event.getState();
             final FluidState fluidState = state.getFluidState();
             if (fluidState.getType().isSame(Fluids.WATER)) {
-                event.setResult(Event.Result.DENY);
+                event.setCanConvert(false);
                 // Place andesite on top of the sources
                 event.getLevel().setBlock(event.getPos().above(), Blocks.ANDESITE.defaultBlockState(), 3);
             } else if (fluidState.getType().isSame(Fluids.LAVA)) {
-                event.setResult(Event.Result.ALLOW);
+                event.setCanConvert(true);
             }
         });