diff --git a/src/main/java/de/ellpeck/naturesaura/Helper.java b/src/main/java/de/ellpeck/naturesaura/Helper.java index 9314f4bc..f9e6631f 100644 --- a/src/main/java/de/ellpeck/naturesaura/Helper.java +++ b/src/main/java/de/ellpeck/naturesaura/Helper.java @@ -46,6 +46,7 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; import org.apache.commons.lang3.tuple.ImmutableTriple; import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.SlotResult; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -310,7 +311,7 @@ public final class Helper { public static ItemStack getEquippedItem(Predicate predicate, Player player) { if (Compat.hasCompat("curios")) { - var stack = CuriosApi.getCuriosHelper().findEquippedCurio(predicate, player).map(ImmutableTriple::getRight); + var stack = CuriosApi.getCuriosHelper().findFirstCurio(player, predicate).map(SlotResult::stack); if (stack.isPresent()) return stack.get(); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java index 2738a369..62083846 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java @@ -19,6 +19,7 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.eventbus.api.Event; public class BlockAncientSapling extends BushBlock implements BonemealableBlock, IModItem, ICustomBlockState, ICustomItemModel { @@ -30,11 +31,13 @@ public class BlockAncientSapling extends BushBlock implements BonemealableBlock, } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockAncientSapling.SHAPE; } @Override + @SuppressWarnings("deprecation") public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { if (!level.isClientSide) { super.randomTick(state, level, pos, random); @@ -55,7 +58,7 @@ public class BlockAncientSapling extends BushBlock implements BonemealableBlock, } @Override - public boolean isValidBonemealTarget(BlockGetter p_50897_, BlockPos p_50898_, BlockState p_50899_, boolean p_50900_) { + public boolean isValidBonemealTarget(BlockGetter level, BlockPos pos, BlockState state, boolean b) { return true; } @@ -68,7 +71,7 @@ public class BlockAncientSapling extends BushBlock implements BonemealableBlock, public void performBonemeal(ServerLevel level, RandomSource rand, BlockPos pos, BlockState state) { if (state.getValue(SaplingBlock.STAGE) == 0) { level.setBlock(pos, state.cycle(SaplingBlock.STAGE), 4); - } else if (ForgeEventFactory.saplingGrowTree(level, rand, pos)) { + } else if (!ForgeEventFactory.blockGrowFeature(level, rand, pos, null).getResult().equals(Event.Result.DENY)) { ModFeatures.Configured.ANCIENT_TREE.value().place(level, level.getChunkSource().getGenerator(), rand, pos); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java index 4f591cec..6e0a66b1 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java @@ -30,6 +30,7 @@ public class BlockAnimalContainer extends BlockContainerImpl implements IVisuali } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockAnimalContainer.SHAPE; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java index feb32819..740415ed 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java @@ -52,12 +52,14 @@ public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockS } @Override + @SuppressWarnings("deprecation") public void entityInside(BlockState state, Level levelIn, BlockPos pos, Entity entityIn) { if (this == ModBlocks.AURA_CACTUS) entityIn.hurt(DamageSource.CACTUS, 1); } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { var vec3d = state.getOffset(levelIn, pos); return BlockAuraBloom.SHAPE.move(vec3d.x, vec3d.y, vec3d.z); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java index ef22a8ad..47a89c14 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java @@ -14,11 +14,13 @@ public class BlockAuraDetector extends BlockContainerImpl { } @Override + @SuppressWarnings("deprecation") public boolean hasAnalogOutputSignal(BlockState state) { return true; } @Override + @SuppressWarnings("deprecation") public int getAnalogOutputSignal(BlockState blockState, Level levelIn, BlockPos pos) { var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityAuraDetector detector) diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java index 878924eb..dc8d804b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java @@ -41,6 +41,7 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockAuraTimer.SHAPE; } @@ -51,16 +52,19 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult p_225533_6_) { return Helper.putStackOnTile(player, handIn, pos, 0, true); } @Override + @SuppressWarnings("deprecation") public boolean isSignalSource(BlockState state) { return true; } @Override + @SuppressWarnings("deprecation") public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction side) { return state.getValue(BlockStateProperties.POWERED) ? 15 : 0; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java index ab3cc853..bfb440a1 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java @@ -31,6 +31,7 @@ public class BlockBlastFurnaceBooster extends BlockContainerImpl implements ICus } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockBlastFurnaceBooster.SHAPE; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java index beaf2e17..2151c957 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java @@ -77,6 +77,7 @@ public class BlockChunkLoader extends BlockContainerImpl implements IVisualizabl } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockChunkLoader.SHAPE; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java index 7dfe23d9..bcc7201c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java @@ -65,11 +65,13 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { } @Override + @SuppressWarnings("deprecation") public FluidState getFluidState(BlockState state) { return this.hasWaterlogging() && state.getValue(BlockStateProperties.WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state); } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor levelIn, BlockPos currentPos, BlockPos facingPos) { if (this.hasWaterlogging() && stateIn.getValue(BlockStateProperties.WATERLOGGED)) levelIn.scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickDelay(levelIn)); @@ -110,6 +112,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { } @Override + @SuppressWarnings("deprecation") public List getDrops(BlockState state, LootContext.Builder builder) { var drops = super.getDrops(state, builder); @@ -126,11 +129,11 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { } @Override - public void playerWillDestroy(Level p_49852_, BlockPos p_49853_, BlockState p_49854_, Player p_49855_) { - var tile = p_49852_.getBlockEntity(p_49853_); + public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) { + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntityImpl impl) impl.dropInventory(); - super.playerWillDestroy(p_49852_, p_49853_, p_49854_, p_49855_); + super.playerWillDestroy(level, pos, state, player); } @Override @@ -141,6 +144,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { } @Override + @SuppressWarnings("deprecation") public void neighborChanged(BlockState state, Level levelIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { this.updateRedstoneState(levelIn, pos); } @@ -157,6 +161,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { } @Override + @SuppressWarnings("deprecation") public void tick(BlockState state, ServerLevel levelIn, BlockPos pos, RandomSource random) { if (!levelIn.isClientSide) { var tile = levelIn.getBlockEntity(pos); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java index 088c6ecd..8b320185 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java @@ -17,6 +17,7 @@ public class BlockDecayedLeaves extends BlockImpl implements ICustomBlockState { } @Override + @SuppressWarnings("deprecation") public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { if (!level.isClientSide) { level.setBlockAndUpdate(pos, Blocks.AIR.defaultBlockState()); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java index 7afec706..3a800cf5 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java @@ -7,7 +7,10 @@ import de.ellpeck.naturesaura.items.ModItems; import de.ellpeck.naturesaura.packet.PacketClient; import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; -import de.ellpeck.naturesaura.reg.*; +import de.ellpeck.naturesaura.reg.ICustomBlockState; +import de.ellpeck.naturesaura.reg.ICustomItemModel; +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.ModRegistry; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceKey; @@ -62,6 +65,7 @@ public class BlockDimensionRail extends BaseRailBlock implements IModItem, ICust } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { var stack = player.getItemInHand(hand); if (stack.getItem() == ModItems.RANGE_VISUALIZER) { @@ -133,6 +137,7 @@ public class BlockDimensionRail extends BaseRailBlock implements IModItem, ICust } @Override + @SuppressWarnings({"deprecation", "RedundantSuppression"}) public Property getShapeProperty() { return BlockDimensionRail.SHAPE; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java index 9f6d361e..f046866b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java @@ -41,10 +41,11 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS super(Properties.of(Material.GRASS).noCollission().strength(0.5F).sound(SoundType.GRASS)); MinecraftForge.EVENT_BUS.register(this); ModRegistry.ALL_ITEMS.add(this); - ModRegistry.ALL_ITEMS.add(new ModTileType(BlockEntityEndFlower::new, this)); + ModRegistry.ALL_ITEMS.add(new ModTileType<>(BlockEntityEndFlower::new, this)); } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { var vec3d = state.getOffset(levelIn, pos); return BlockEndFlower.SHAPE.move(vec3d.x, vec3d.y, vec3d.z); @@ -104,6 +105,7 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS } @Override + @SuppressWarnings("deprecation") public List getDrops(BlockState state, LootContext.Builder builder) { var tile = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY); if (tile instanceof BlockEntityEndFlower f && f.isDrainMode) diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java index feafa6ee..9c93d0d8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java @@ -87,6 +87,7 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (!levelIn.isClientSide) { var tile = levelIn.getBlockEntity(pos); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java index b73a439b..3d3b695e 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java @@ -26,7 +26,8 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc } @Override - public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult p_225533_6_) { + @SuppressWarnings("deprecation") + public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult result) { var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityFieldCreator) { if (!levelIn.isClientSide) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java index 5cbd4a7c..e83a4555 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java @@ -27,7 +27,7 @@ public class BlockFurnaceHeater extends BlockContainerImpl implements ICustomBlo public static final DirectionProperty FACING = BlockStateProperties.FACING; - private static final VoxelShape[] SHAPES = new VoxelShape[]{ + private static final VoxelShape[] SHAPES = { Block.box(2, 12, 2, 14, 16, 14), // Down Block.box(2, 0, 2, 14, 4, 14), // Up Block.box(2, 2, 12, 14, 14, 16), // North @@ -79,6 +79,7 @@ public class BlockFurnaceHeater extends BlockContainerImpl implements ICustomBlo } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockFurnaceHeater.SHAPES[state.getValue(BlockFurnaceHeater.FACING).get3DDataValue()]; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java index 332708ff..e1cfab23 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java @@ -31,7 +31,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, public static final EnumProperty EAST = BlockStateProperties.EAST_REDSTONE; public static final EnumProperty SOUTH = BlockStateProperties.SOUTH_REDSTONE; public static final EnumProperty WEST = BlockStateProperties.WEST_REDSTONE; - protected static final VoxelShape[] SHAPES = new VoxelShape[]{Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D)}; + protected static final VoxelShape[] SHAPES = {Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D)}; public BlockGoldPowder() { super("gold_powder", Properties.copy(Blocks.REDSTONE_WIRE)); @@ -71,6 +71,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockGoldPowder.SHAPES[BlockGoldPowder.getShapeIndex(state)]; } @@ -83,6 +84,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor levelIn, BlockPos currentPos, BlockPos facingPos) { if (facing == Direction.DOWN) { return stateIn; @@ -116,6 +118,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } @Override + @SuppressWarnings("deprecation") public boolean canSurvive(BlockState state, LevelReader levelIn, BlockPos pos) { var blockpos = pos.below(); var blockstate = levelIn.getBlockState(blockpos); @@ -123,11 +126,13 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } @Override + @SuppressWarnings("deprecation") public VoxelShape getCollisionShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return Shapes.empty(); } @Override + @SuppressWarnings("deprecation") public void onPlace(BlockState state, Level levelIn, BlockPos pos, BlockState oldState, boolean isMoving) { if (oldState.getBlock() != state.getBlock() && !levelIn.isClientSide) { for (var direction : Direction.Plane.VERTICAL) { @@ -149,6 +154,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } @Override + @SuppressWarnings("deprecation") public void onRemove(BlockState state, Level levelIn, BlockPos pos, BlockState newState, boolean isMoving) { if (!isMoving && state.getBlock() != newState.getBlock()) { super.onRemove(state, levelIn, pos, newState, isMoving); @@ -173,6 +179,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } @Override + @SuppressWarnings("deprecation") public void neighborChanged(BlockState state, Level levelIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { if (!levelIn.isClientSide) { if (!state.canSurvive(levelIn, pos)) { @@ -183,6 +190,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } @Override + @SuppressWarnings("deprecation") public void updateIndirectNeighbourShapes(BlockState state, LevelAccessor levelIn, BlockPos pos, int flags, int recursionLeft) { var pool = new BlockPos.MutableBlockPos(); for (var direction : Direction.Plane.HORIZONTAL) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java index 5c5170f6..50541a23 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java @@ -60,6 +60,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return switch (state.getValue(BlockGratedChute.FACING)) { case DOWN -> BlockGratedChute.DOWN_SHAPE; @@ -72,6 +73,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock } @Override + @SuppressWarnings("deprecation") public VoxelShape getInteractionShape(BlockState state, BlockGetter levelIn, BlockPos pos) { return switch (state.getValue(BlockGratedChute.FACING)) { case DOWN -> BlockGratedChute.DOWN_RAYTRACE_SHAPE; @@ -84,6 +86,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (!player.isCrouching()) return InteractionResult.FAIL; @@ -112,11 +115,13 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock } @Override - public boolean hasAnalogOutputSignal(BlockState p_60457_) { + @SuppressWarnings("deprecation") + public boolean hasAnalogOutputSignal(BlockState state) { return true; } @Override + @SuppressWarnings("deprecation") public int getAnalogOutputSignal(BlockState blockState, Level levelIn, BlockPos pos) { var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityGratedChute) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java index 49e3e3ff..46832f4b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java @@ -19,6 +19,7 @@ public class BlockItemDistributor extends BlockContainerImpl implements ICustomB } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (!player.isCrouching()) return InteractionResult.FAIL; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java index 15824523..98092cd2 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java @@ -36,11 +36,13 @@ public class BlockLight extends BlockImpl implements ICustomBlockState, INoItemB } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockLight.SHAPE; } @Override + @SuppressWarnings("deprecation") public boolean canBeReplaced(BlockState state, BlockPlaceContext useContext) { return true; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java index 8d322b23..4b948bc4 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java @@ -36,11 +36,13 @@ public class BlockNatureAltar extends BlockContainerImpl implements ITESRProvide } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockNatureAltar.SHAPE; } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { return Helper.putStackOnTile(player, handIn, pos, 0, true); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java index da62c761..fd1b8acf 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java @@ -19,6 +19,7 @@ public class BlockNetherGrass extends BlockImpl implements ICustomBlockState, Bo } @Override + @SuppressWarnings("deprecation") public void randomTick(BlockState state, ServerLevel levelIn, BlockPos pos, RandomSource random) { var up = pos.above(); var upState = levelIn.getBlockState(up); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java index f211ca4c..ba56439e 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java @@ -36,11 +36,13 @@ public class BlockOfferingTable extends BlockContainerImpl implements ITESRProvi } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { return Helper.putStackOnTile(player, handIn, pos, 0, true); } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockOfferingTable.SHAPE; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java index 7126b856..dcd37820 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java @@ -26,6 +26,7 @@ public class BlockPowderPlacer extends BlockContainerImpl implements ICustomBloc } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockPowderPlacer.SHAPE; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java index b290566b..e27091de 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java @@ -79,6 +79,7 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockSpawnLamp.SHAPE; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java index fac7845d..201b225e 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java @@ -65,6 +65,7 @@ public class BlockSpring extends BlockContainerImpl implements ICustomBlockState } @Override + @SuppressWarnings({"deprecation", "RedundantSuppression"}) public Optional getPickupSound() { return Fluids.WATER.getPickupSound(); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java index 7254432b..26df78c2 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java @@ -14,6 +14,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; @@ -48,6 +49,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider< } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { return BlockWoodStand.SHAPE; } @@ -58,8 +60,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider< var pos = event.getPos(); if (!level.isClientSide() && level instanceof Level) { if (Multiblocks.TREE_RITUAL.isComplete((Level) level, pos)) { - var sapling = level.getBlockState(pos); - var saplingStack = sapling.getBlock().getCloneItemStack(level, pos, sapling); + var saplingStack = new ItemStack(level.getBlockState(pos).getBlock()); if (!saplingStack.isEmpty()) { for (var recipe : ((Level) level).getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, null)) { if (recipe.saplingType.test(saplingStack)) { @@ -100,6 +101,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider< } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { return Helper.putStackOnTile(player, handIn, pos, 0, true); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java index d2288316..9288364d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.blocks; import net.minecraft.world.level.block.Block; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModBlocks { public static Block ANCIENT_LOG; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java index 71a6d89e..290eebf8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java @@ -9,6 +9,7 @@ import de.ellpeck.naturesaura.data.BlockTagProvider; import de.ellpeck.naturesaura.recipes.ModRecipes; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SaplingBlock; import net.minecraft.world.level.material.Material; @@ -41,7 +42,7 @@ public final class Multiblocks { return true; // try-catch to prevent blocks that need to have been placed crashing here try { - var stack = state.getBlock().getCloneItemStack(level, pos, state); + var stack = new ItemStack(state.getBlock()); return !stack.isEmpty() && level.getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, null).stream().anyMatch(r -> r.saplingType.test(stack)); } catch (Exception e) { return false; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java index d8406bcc..9e05c878 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java @@ -78,7 +78,7 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable for (var z = -2; z <= 2; z += 4) { var offset = this.worldPosition.offset(x, 1, z); var state = this.level.getBlockState(offset); - this.catalysts[index] = state.getBlock().getCloneItemStack(this.level, offset, state); + this.catalysts[index] = new ItemStack(state.getBlock()); index++; } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java index 500bb70e..d407ca90 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java @@ -50,7 +50,7 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock for (var y = -range; y <= range; y++) for (var z = -range; z <= range; z++) { var pos = this.worldPosition.offset(x, y, z); - if (!this.framesContain(frames, pos, this.level.getBlockState(pos))) + if (!this.framesContain(frames, this.level.getBlockState(pos))) continue; var up = pos.above(); @@ -82,8 +82,8 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock } } - private boolean framesContain(List frames, BlockPos pos, BlockState state) { - var stack = state.getBlock().getCloneItemStack(this.level, pos, state); + private boolean framesContain(List frames, BlockState state) { + var stack = new ItemStack(state.getBlock()); if (stack.isEmpty()) return false; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java index 1dae07df..83382a7f 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java @@ -11,8 +11,8 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.IEnergyStorage; @@ -52,7 +52,7 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable var tile = this.level.getBlockEntity(this.worldPosition.relative(facing)); if (tile == null) continue; - var storage = tile.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite()).orElse(null); + var storage = tile.getCapability(ForgeCapabilities.ENERGY, facing.getOpposite()).orElse(null); if (storage == null) continue; var canStore = storage.receiveEnergy(Integer.MAX_VALUE, true); @@ -91,7 +91,7 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable @Nullable @Override public LazyOptional getCapability(Capability capability, @Nullable Direction facing) { - if (capability == CapabilityEnergy.ENERGY) + if (capability == ForgeCapabilities.ENERGY) return this.storageOptional.cast(); else return super.getCapability(capability, facing); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java index 6d6e8bc4..c8a8020a 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java @@ -136,7 +136,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock private boolean isLava(BlockPos offset, boolean source) { var state = this.level.getFluidState(offset); - return (!source || state.isSource()) && state.getType().is(FluidTags.LAVA); + return (!source || state.isSource()) && state.is(FluidTags.LAVA); } private class InfiniteTank implements IFluidTank, IFluidHandler { @@ -158,7 +158,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock @Override public boolean isFluidValid(FluidStack stack) { - return stack.getFluid().is(FluidTags.WATER); + return stack.getFluid().defaultFluidState().is(FluidTags.WATER); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModBlockEntities.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModBlockEntities.java index ad92e6fb..5f33d03e 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModBlockEntities.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModBlockEntities.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.blocks.tiles; import net.minecraft.world.level.block.entity.BlockEntityType; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModBlockEntities { public static BlockEntityType ANCIENT_LEAVES; diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/AuraChunk.java b/src/main/java/de/ellpeck/naturesaura/chunk/AuraChunk.java index 6896306a..1730c58d 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/AuraChunk.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/AuraChunk.java @@ -197,6 +197,7 @@ public class AuraChunk implements IAuraChunk { return ret; } + @SuppressWarnings("unchecked") public Pair[] getLowestAndHighestSpots(BlockPos pos, int radius) { var ret = this.limitSpotCache.get(pos, radius); if (ret == null) { diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java index 20f4f6b4..5ce9ef2d 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java @@ -29,6 +29,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.util.FakePlayerFactory; +import net.minecraftforge.registries.ForgeRegistries; import java.util.HashSet; import java.util.List; @@ -113,11 +114,10 @@ public class OreSpawnEffect implements IDrainSpotEffect { var ore = WeightedRandom.getRandomItem(level.random, ores, totalWeight).orElse(null); if (ore == null) continue; - var tag = TagKey.create(Registry.BLOCK_REGISTRY, ore.tag); + var tag = TagKey.create(ForgeRegistries.Keys.BLOCKS, ore.tag); if (tag == null) continue; - for (var holder : Registry.BLOCK.getTagOrEmpty(tag)) { - var toPlace = holder.value(); + for (var toPlace : ForgeRegistries.BLOCKS.tags().getTag(tag)) { if (toPlace == null || toPlace == Blocks.AIR) continue; diff --git a/src/main/java/de/ellpeck/naturesaura/enchant/ModEnchantments.java b/src/main/java/de/ellpeck/naturesaura/enchant/ModEnchantments.java index 616b5716..a0981856 100644 --- a/src/main/java/de/ellpeck/naturesaura/enchant/ModEnchantments.java +++ b/src/main/java/de/ellpeck/naturesaura/enchant/ModEnchantments.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.enchant; import net.minecraft.world.item.enchantment.Enchantment; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModEnchantments { public static Enchantment AURA_MENDING; diff --git a/src/main/java/de/ellpeck/naturesaura/entities/ModEntities.java b/src/main/java/de/ellpeck/naturesaura/entities/ModEntities.java index 131d979c..42da54b2 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/ModEntities.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/ModEntities.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.entities; import net.minecraft.world.entity.EntityType; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModEntities { public static EntityType MOVER_CART; diff --git a/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java b/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java index 8c6962d2..3de76fe4 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -25,13 +26,13 @@ public class RenderEffectInhibitor extends EntityRenderer private final Map items = new HashMap<>(); - public RenderEffectInhibitor(EntityRendererProvider.Context p_174008_) { - super(p_174008_); + public RenderEffectInhibitor(EntityRendererProvider.Context ctx) { + super(ctx); } @Override public ResourceLocation getTextureLocation(EntityEffectInhibitor entity) { - return TextureAtlas.LOCATION_BLOCKS; + return InventoryMenu.BLOCK_ATLAS; } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/entities/render/RenderStub.java b/src/main/java/de/ellpeck/naturesaura/entities/render/RenderStub.java index 62175f71..f45d7e32 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/render/RenderStub.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/render/RenderStub.java @@ -6,11 +6,12 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; +import net.minecraft.world.inventory.InventoryMenu; public class RenderStub extends EntityRenderer { - public RenderStub(EntityRendererProvider.Context p_174008_) { - super(p_174008_); + public RenderStub(EntityRendererProvider.Context ctx) { + super(ctx); } @Override @@ -19,7 +20,7 @@ public class RenderStub extends EntityRenderer { } @Override - public ResourceLocation getTextureLocation(T p_114482_) { - return TextureAtlas.LOCATION_BLOCKS; + public ResourceLocation getTextureLocation(T t) { + return InventoryMenu.BLOCK_ATLAS; } } diff --git a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java index 49f826e8..c56a3eb0 100644 --- a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java +++ b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java @@ -58,7 +58,7 @@ public class LevelGenAuraBloom extends Feature { private boolean tryPlace(WorldGenLevel level, BlockPos pos) { var state = this.block.defaultBlockState(); - if (this.block.canSurvive(state, level, pos)) { + if (state.canSurvive(level, pos)) { level.setBlock(pos, state, 3); var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntityAuraBloom bloom) diff --git a/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java b/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java index 0ca511d2..82b85bee 100644 --- a/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java +++ b/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration; import net.minecraft.world.level.levelgen.placement.PlacedFeature; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModFeatures { public static Feature ANCIENT_TREE; diff --git a/src/main/java/de/ellpeck/naturesaura/gui/ModContainers.java b/src/main/java/de/ellpeck/naturesaura/gui/ModContainers.java index 0589d26c..7950b093 100644 --- a/src/main/java/de/ellpeck/naturesaura/gui/ModContainers.java +++ b/src/main/java/de/ellpeck/naturesaura/gui/ModContainers.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.gui; import net.minecraft.world.inventory.MenuType; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModContainers { public static MenuType ENDER_CRATE; diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java index 35bace58..4377d5bf 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java @@ -53,7 +53,7 @@ public class ItemAuraCache extends ItemImpl implements ITrinketItem { if (recharge != null) { if (recharge.rechargeFromContainer(container, itemSlot, i, player.getInventory().selected == i)) break; - } else if (EnchantmentHelper.getItemEnchantmentLevel(ModEnchantments.AURA_MENDING, stack) > 0) { + } else if (stack.getEnchantmentLevel(ModEnchantments.AURA_MENDING) > 0) { var mainSize = player.getInventory().items.size(); var isArmor = i >= mainSize && i < mainSize + player.getInventory().armor.size(); if ((isArmor || player.getInventory().selected == i) && Helper.rechargeAuraItem(stack, container, 1000)) diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index 5d246ddc..0b0d1468 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.items; import net.minecraft.world.item.Item; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModItems { public static Item INFUSED_IRON_PICKAXE; diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java index 2a28e1ba..40f5913d 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java @@ -88,6 +88,7 @@ public class ItemArmor extends ArmorItem implements IModItem { if (equipped && !nbt.getBoolean(key)) { // we just equipped it nbt.putBoolean(key, true); + // TODO use new forge attribute for step height player.maxUpStep = 1.1F; if (!speed.hasModifier(ItemArmor.SKY_MOVEMENT_MODIFIER)) speed.addPermanentModifier(ItemArmor.SKY_MOVEMENT_MODIFIER); diff --git a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java index beb9c0f7..76710a7a 100644 --- a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java +++ b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java @@ -264,14 +264,12 @@ public class PacketParticles { level.random.nextGaussian() * 0.01F, 0xd3e4ff, 1.5F, 150, 0F, false, true); }), - PICKUP_STOPPER((message, level) -> { - NaturesAuraAPI.instance().spawnMagicParticle( - message.posX, message.posY + 0.4F, message.posZ, - level.random.nextGaussian() * 0.005F, - level.random.nextFloat() * 0.005F, - level.random.nextGaussian() * 0.005F, - 0xcc3116, 1.5F, 40, 0F, false, true); - }), + PICKUP_STOPPER((message, level) -> NaturesAuraAPI.instance().spawnMagicParticle( + message.posX, message.posY + 0.4F, message.posZ, + level.random.nextGaussian() * 0.005F, + level.random.nextFloat() * 0.005F, + level.random.nextGaussian() * 0.005F, + 0xcc3116, 1.5F, 40, 0F, false, true)), SPAWN_LAMP((message, level) -> { for (var i = level.random.nextInt(5) + 5; i >= 0; i--) NaturesAuraAPI.instance().spawnMagicParticle( diff --git a/src/main/java/de/ellpeck/naturesaura/potion/ModPotions.java b/src/main/java/de/ellpeck/naturesaura/potion/ModPotions.java index c6842d68..74e0d53c 100644 --- a/src/main/java/de/ellpeck/naturesaura/potion/ModPotions.java +++ b/src/main/java/de/ellpeck/naturesaura/potion/ModPotions.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.potion; import net.minecraft.world.effect.MobEffect; -@SuppressWarnings("FieldNamingConvention") +@SuppressWarnings("NonConstantFieldWithUpperCaseName") public final class ModPotions { public static MobEffect BREATHLESS; diff --git a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java index 264693dd..0c328146 100644 --- a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java @@ -64,7 +64,7 @@ public class ClientProxy implements IProxy { this.addColorProvidingBlock(color); if (item instanceof IColorProvidingItem color) this.addColorProvidingItem(color); - if (item instanceof ITESRProvider provider) + if (item instanceof ITESRProvider provider) provider.registerTESR(); } @@ -75,6 +75,7 @@ public class ClientProxy implements IProxy { } @Override + @SuppressWarnings("removal") public void postInit(FMLCommonSetupEvent event) { // TODO this uses a vanilla model so we can't just add the json entry to it ItemBlockRenderTypes.setRenderLayer(ModBlocks.GOLD_POWDER, RenderType.cutoutMipped()); @@ -107,6 +108,7 @@ public class ClientProxy implements IProxy { var colors = Minecraft.getInstance().getItemColors(); var color = item.getItemColor(); + // TODO use event if (item instanceof Item) { colors.register(color, (Item) item); } else if (item instanceof Block) { diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java index 901b0c8d..773aaff7 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java @@ -11,6 +11,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.registries.ForgeRegistries; import java.util.List; @@ -119,7 +120,7 @@ public final class ModRecipes { @Override public String toString() { - return Registry.RECIPE_TYPE.getKey(this).toString(); + return ForgeRegistries.RECIPE_TYPES.getKey(this).toString(); } } } diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModArmorMaterial.java b/src/main/java/de/ellpeck/naturesaura/reg/ModArmorMaterial.java index d85b1b11..7266f918 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/ModArmorMaterial.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/ModArmorMaterial.java @@ -18,7 +18,7 @@ public enum ModArmorMaterial implements ArmorMaterial { INFUSED(NaturesAura.MOD_ID + ":infused_iron", 19, new int[]{2, 5, 6, 2}, 16, SoundEvents.ARMOR_EQUIP_GENERIC, 0, () -> Ingredient.of(ModItems.INFUSED_IRON)), SKY(NaturesAura.MOD_ID + ":sky", 33, new int[]{3, 6, 8, 3}, 12, SoundEvents.ARMOR_EQUIP_GENERIC, 2, () -> Ingredient.of(ModItems.SKY_INGOT)); - private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11}; + private static final int[] MAX_DAMAGE_ARRAY = {13, 15, 16, 11}; private final String name; private final int maxDamageFactor; private final int[] damageReductionAmountArray; diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModItemTier.java b/src/main/java/de/ellpeck/naturesaura/reg/ModItemTier.java index 6ce58f7e..fb6c8e85 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/ModItemTier.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/ModItemTier.java @@ -43,6 +43,7 @@ public enum ModItemTier implements Tier { } @Override + @SuppressWarnings({"deprecation", "RedundantSuppression"}) public int getLevel() { return this.harvestLevel; } diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java index 7eafb2d5..ee4e038a 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java @@ -22,7 +22,6 @@ import de.ellpeck.naturesaura.potion.ModPotions; import de.ellpeck.naturesaura.potion.PotionBreathless; import de.ellpeck.naturesaura.recipes.EnabledCondition; import de.ellpeck.naturesaura.recipes.ModRecipes; -import net.minecraft.data.worldgen.Structures; import net.minecraft.data.worldgen.features.FeatureUtils; import net.minecraft.data.worldgen.placement.PlacementUtils; import net.minecraft.resources.ResourceLocation; @@ -217,7 +216,7 @@ public final class ModRegistry { ModRegistry.ALL_ITEMS.add(new ModTileType<>(BlockEntityAuraBloom::new, "aura_bloom", ModRegistry.ALL_ITEMS.stream().filter(i -> i instanceof BlockAuraBloom).toArray(IModItem[]::new))); for (var item : ModRegistry.ALL_ITEMS) { - if (item instanceof ModTileType type) + if (item instanceof ModTileType type) h.register(new ResourceLocation(NaturesAura.MOD_ID, type.getBaseName()), type.type); } Helper.populateObjectHolders(ModBlockEntities.class, event.getForgeRegistry());