From a9d1082ed278286f1d22a51aaf74028850ca72b3 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 6 Nov 2021 16:45:43 +0300 Subject: [PATCH] Update to BCLib 0.5.0 and new Fabric API --- gradle.properties | 4 +- src/main/java/ru/betterend/BetterEnd.java | 1 - src/main/java/ru/betterend/DataFixer.java | 33 ----- .../betterend/blocks/AmaranitaStemBlock.java | 2 +- .../java/ru/betterend/blocks/AmberBlock.java | 2 +- .../blocks/AncientEmeraldIceBlock.java | 1 + .../betterend/blocks/AuroraCrystalBlock.java | 1 + .../blocks/BlueVineLanternBlock.java | 2 + .../ru/betterend/blocks/BrimstoneBlock.java | 3 +- .../blocks/BulbVineLanternBlock.java | 3 +- .../ru/betterend/blocks/CavePumpkinBlock.java | 1 + .../ru/betterend/blocks/ChandelierBlock.java | 1 + .../blocks/DragonTreeSaplingBlock.java | 1 + .../ru/betterend/blocks/EmeraldIceBlock.java | 2 + .../betterend/blocks/EndLotusFlowerBlock.java | 1 + .../betterend/blocks/EndLotusLeafBlock.java | 4 + .../betterend/blocks/EndLotusStemBlock.java | 5 + .../ru/betterend/blocks/EndStoneSmelter.java | 5 + .../betterend/blocks/EndstoneDustBlock.java | 9 +- .../betterend/blocks/FilaluxWingsBlock.java | 1 + .../ru/betterend/blocks/FlowerPotBlock.java | 4 + .../blocks/GlowingPillarLuminophorBlock.java | 4 +- .../blocks/HelixTreeLeavesBlock.java | 21 +-- .../blocks/HelixTreeSaplingBlock.java | 1 + .../betterend/blocks/HydraluxPetalBlock.java | 17 ++- .../betterend/blocks/JellyshroomCapBlock.java | 1 + .../blocks/LacugroveSaplingBlock.java | 1 + .../blocks/LucerniaSaplingBlock.java | 1 + .../blocks/MossyGlowshroomSaplingBlock.java | 1 + .../ru/betterend/blocks/MossyObsidian.java | 2 + .../ru/betterend/blocks/MurkweedBlock.java | 2 + .../ru/betterend/blocks/NeedlegrassBlock.java | 2 + .../blocks/PythadendronSaplingBlock.java | 1 + .../betterend/blocks/RespawnObeliskBlock.java | 4 + .../betterend/blocks/SilkMothHiveBlock.java | 4 + .../betterend/blocks/SilkMothNestBlock.java | 6 + .../betterend/blocks/TenaneaSaplingBlock.java | 1 + .../blocks/UmbrellaTreeClusterBlock.java | 9 +- .../blocks/UmbrellaTreeClusterEmptyBlock.java | 9 +- .../blocks/UmbrellaTreeMembraneBlock.java | 1 + .../blocks/UmbrellaTreeSaplingBlock.java | 1 + .../blocks/VentBubbleColumnBlock.java | 6 + .../ru/betterend/blocks/basis/FurBlock.java | 8 +- .../blocks/basis/StoneLanternBlock.java | 1 + .../complexmaterials/ColoredMaterial.java | 3 +- .../complexmaterials/MetalMaterial.java | 10 +- .../complexmaterials/StoneMaterial.java | 2 +- .../java/ru/betterend/effects/EndPotions.java | 2 +- .../integration/rei/REIAnvilDisplay.java | 9 +- .../betterend/integration/rei/REIPlugin.java | 9 +- .../ru/betterend/interfaces/IBiomeArray.java | 8 -- .../betterend/interfaces/MultiModelItem.java | 1 - .../item/material/EndArmorMaterial.java | 5 +- .../item/material/EndToolMaterial.java | 3 +- .../mixin/common/ChorusFlowerBlockMixin.java | 1 + .../common/ChunkBiomeContainerMixin.java | 132 ------------------ .../mixin/common/ComposterBlockAccessor.java | 14 -- .../mixin/common/LivingEntityMixin.java | 4 +- .../betterend/mixin/common/PlayerMixin.java | 4 +- .../mixin/common/PotionBrewingAccessor.java | 15 -- .../particle/InfusionParticleType.java | 1 + .../recipe/builders/AlloyingRecipe.java | 4 +- .../recipe/builders/InfusionRecipe.java | 5 +- .../registry/EndBlockEntityRenders.java | 8 +- .../java/ru/betterend/registry/EndBlocks.java | 17 +-- .../registry/EndEntitiesRenders.java | 6 +- .../java/ru/betterend/registry/EndTags.java | 2 +- .../java/ru/betterend/util/BlockFixer.java | 7 +- .../world/biome/cave/EndCaveBiome.java | 1 - .../world/features/BlueVineFeature.java | 1 + .../terrain/caves/EndCaveFeature.java | 6 +- .../resources/betterend.mixins.common.json | 3 - 72 files changed, 167 insertions(+), 306 deletions(-) delete mode 100644 src/main/java/ru/betterend/DataFixer.java delete mode 100644 src/main/java/ru/betterend/interfaces/IBiomeArray.java delete mode 100644 src/main/java/ru/betterend/mixin/common/ChunkBiomeContainerMixin.java delete mode 100644 src/main/java/ru/betterend/mixin/common/ComposterBlockAccessor.java delete mode 100644 src/main/java/ru/betterend/mixin/common/PotionBrewingAccessor.java diff --git a/gradle.properties b/gradle.properties index 9278e111..aa9327a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.17.1 yarn_mappings=6 loader_version=0.12.4 # Mod Properties -mod_version=0.12.2 +mod_version=0.13.0 maven_group=ru.betterend archives_base_name=better-end @@ -15,6 +15,6 @@ archives_base_name=better-end patchouli_version = 55-FABRIC-SNAPSHOT fabric_version = 0.41.3+1.17 -bclib_version = 0.4.4 +bclib_version = 0.5.0 rei_version = 6.0.264-alpha canvas_version = 1.0.+ diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index f4556a18..21658f4a 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -60,7 +60,6 @@ public class BetterEnd implements ModInitializer { LootTableUtil.init(); FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register); Integrations.init(); - DataFixer.register(); Configs.saveConfigs(); if (GeneratorOptions.useNewGenerator()) { diff --git a/src/main/java/ru/betterend/DataFixer.java b/src/main/java/ru/betterend/DataFixer.java deleted file mode 100644 index 8fd47757..00000000 --- a/src/main/java/ru/betterend/DataFixer.java +++ /dev/null @@ -1,33 +0,0 @@ -package ru.betterend; - -import ru.bclib.api.datafixer.DataFixerAPI; -import ru.bclib.api.datafixer.Patch; - -public class DataFixer { - public static void register() { - DataFixerAPI.registerPatch(() -> { - return new BetterEndPatch(); - }); - } - - private static final class BetterEndPatch extends Patch { - protected BetterEndPatch() { - super(BetterEnd.MOD_ID, "0.11.0"); - } - - /*public PatchFunction getLevelDatPatcher() { - return (root, profile) -> { - CompoundTag dimensions = root.getCompound("Data").getCompound("WorldGenSettings").getCompound("dimensions"); - if (dimensions.contains("minecraft:the_end")) { - CompoundTag biomeSource = dimensions.getCompound("minecraft:the_end").getCompound("generator").getCompound("biome_source"); - if (!biomeSource.getString("type").equals("betterend:better_end_biome_source")) { - BetterEnd.LOGGER.info("Applying biome source patch"); - biomeSource.putString("type", "betterend:better_end_biome_source"); - return true; - } - } - return false; - }; - }*/ - } -} diff --git a/src/main/java/ru/betterend/blocks/AmaranitaStemBlock.java b/src/main/java/ru/betterend/blocks/AmaranitaStemBlock.java index 47885625..f50684ba 100644 --- a/src/main/java/ru/betterend/blocks/AmaranitaStemBlock.java +++ b/src/main/java/ru/betterend/blocks/AmaranitaStemBlock.java @@ -7,6 +7,6 @@ import ru.bclib.blocks.BaseRotatedPillarBlock; public class AmaranitaStemBlock extends BaseRotatedPillarBlock { public AmaranitaStemBlock() { - super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).materialColor(MaterialColor.COLOR_LIGHT_GREEN)); + super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).mapColor(MaterialColor.COLOR_LIGHT_GREEN)); } } diff --git a/src/main/java/ru/betterend/blocks/AmberBlock.java b/src/main/java/ru/betterend/blocks/AmberBlock.java index feedaea8..05773bdf 100644 --- a/src/main/java/ru/betterend/blocks/AmberBlock.java +++ b/src/main/java/ru/betterend/blocks/AmberBlock.java @@ -7,6 +7,6 @@ import ru.bclib.blocks.BaseBlock; public class AmberBlock extends BaseBlock { public AmberBlock() { - super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).materialColor(MaterialColor.COLOR_YELLOW)); + super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MaterialColor.COLOR_YELLOW)); } } diff --git a/src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java b/src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java index ae6d112f..836970d3 100644 --- a/src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java +++ b/src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java @@ -29,6 +29,7 @@ public class AncientEmeraldIceBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) { Direction dir = BlocksHelper.randomDirection(random); diff --git a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java index 5cbebe1d..f36efa2f 100644 --- a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java +++ b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java @@ -93,6 +93,7 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements RenderLaye } @Override + @SuppressWarnings("deprecation") public List getDrops(BlockState state, LootContext.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && tool.isCorrectToolForDrops(state)) { diff --git a/src/main/java/ru/betterend/blocks/BlueVineLanternBlock.java b/src/main/java/ru/betterend/blocks/BlueVineLanternBlock.java index 3d96ceee..0c70177e 100644 --- a/src/main/java/ru/betterend/blocks/BlueVineLanternBlock.java +++ b/src/main/java/ru/betterend/blocks/BlueVineLanternBlock.java @@ -29,11 +29,13 @@ public class BlueVineLanternBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { return !state.getValue(NATURAL) || world.getBlockState(pos.below()).getBlock() == EndBlocks.BLUE_VINE; } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) { if (!canSurvive(state, world, pos)) { return Blocks.AIR.defaultBlockState(); diff --git a/src/main/java/ru/betterend/blocks/BrimstoneBlock.java b/src/main/java/ru/betterend/blocks/BrimstoneBlock.java index 33b4d4a8..c1f0ae83 100644 --- a/src/main/java/ru/betterend/blocks/BrimstoneBlock.java +++ b/src/main/java/ru/betterend/blocks/BrimstoneBlock.java @@ -28,7 +28,7 @@ public class BrimstoneBlock extends BaseBlock { public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE; public BrimstoneBlock() { - super(FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(MaterialColor.COLOR_BROWN).randomTicks()); + super(FabricBlockSettings.copyOf(Blocks.END_STONE).mapColor(MaterialColor.COLOR_BROWN).randomTicks()); registerDefaultState(stateDefinition.any().setValue(ACTIVATED, false)); } @@ -64,6 +64,7 @@ public class BrimstoneBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) { boolean deactivate = true; for (Direction dir : BlocksHelper.DIRECTIONS) { diff --git a/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java index 77364036..3e4dc6e8 100644 --- a/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java +++ b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java @@ -36,7 +36,7 @@ public class BulbVineLanternBlock extends EndLanternBlock implements RenderLayer .hardness(1) .resistance(1) .breakByTool(FabricToolTags.PICKAXES) - .materialColor(MaterialColor.COLOR_LIGHT_GRAY) + .mapColor(MaterialColor.COLOR_LIGHT_GRAY) .luminance(15) .requiresCorrectToolForDrops() .sound(SoundType.LANTERN)); @@ -47,6 +47,7 @@ public class BulbVineLanternBlock extends EndLanternBlock implements RenderLayer } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return state.getValue(IS_FLOOR) ? SHAPE_FLOOR : SHAPE_CEIL; } diff --git a/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java b/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java index 591ac597..9a52391c 100644 --- a/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java +++ b/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java @@ -43,6 +43,7 @@ public class CavePumpkinBlock extends BaseBlockNotFull implements RenderLayerPro } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { return state.getValue(SMALL) ? SHAPE_SMALL : SHAPE_BIG; } diff --git a/src/main/java/ru/betterend/blocks/ChandelierBlock.java b/src/main/java/ru/betterend/blocks/ChandelierBlock.java index 969f110d..a4fe4a9c 100644 --- a/src/main/java/ru/betterend/blocks/ChandelierBlock.java +++ b/src/main/java/ru/betterend/blocks/ChandelierBlock.java @@ -45,6 +45,7 @@ public class ChandelierBlock extends BaseAttachedBlock implements RenderLayerPro } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return BOUNDING_SHAPES.get(state.getValue(FACING)); } diff --git a/src/main/java/ru/betterend/blocks/DragonTreeSaplingBlock.java b/src/main/java/ru/betterend/blocks/DragonTreeSaplingBlock.java index c511fc1d..025701f0 100644 --- a/src/main/java/ru/betterend/blocks/DragonTreeSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/DragonTreeSaplingBlock.java @@ -15,6 +15,7 @@ public class DragonTreeSaplingBlock extends PottableFeatureSapling { } @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.DRAGON_TREE.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java b/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java index 5569fdb8..fadbd4bc 100644 --- a/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java +++ b/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java @@ -57,6 +57,7 @@ public class EmeraldIceBlock extends HalfTransparentBlock implements RenderLayer } @Override + @SuppressWarnings("deprecation") public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) { if (world.getBrightness(LightLayer.BLOCK, pos) > 11 - state.getLightBlock(world, pos)) { this.melt(state, world, pos); @@ -75,6 +76,7 @@ public class EmeraldIceBlock extends HalfTransparentBlock implements RenderLayer } @Override + @SuppressWarnings("deprecation") public List getDrops(BlockState state, LootContext.Builder builder) { ItemStack tool = builder.getOptionalParameter(LootContextParams.TOOL); if (tool != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) != 0) { diff --git a/src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java b/src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java index dbeefd29..d9c9d828 100644 --- a/src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java +++ b/src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java @@ -44,6 +44,7 @@ public class EndLotusFlowerBlock extends EndPlantBlock { } @Override + @SuppressWarnings("deprecation") public VoxelShape getCollisionShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return SHAPE_COLLISION; } diff --git a/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java b/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java index 3c6f7405..e15c1ab4 100644 --- a/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java +++ b/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java @@ -38,6 +38,7 @@ public class EndLotusLeafBlock extends BaseBlockNotFull implements RenderLayerPr } @Override + @SuppressWarnings("deprecation") public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { BlockState down = world.getBlockState(pos.below()); return !down.getFluidState().isEmpty() && down.getFluidState().getType() instanceof WaterFluid; @@ -49,16 +50,19 @@ public class EndLotusLeafBlock extends BaseBlockNotFull implements RenderLayerPr } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return VSHAPE; } @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState state, Rotation rotation) { return BlocksHelper.rotateHorizontal(state, rotation, HORIZONTAL_FACING); } @Override + @SuppressWarnings("deprecation") public BlockState mirror(BlockState state, Mirror mirror) { return BlocksHelper.mirrorHorizontal(state, mirror, HORIZONTAL_FACING); } diff --git a/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java b/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java index dad92625..041f22ff 100644 --- a/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java +++ b/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java @@ -47,6 +47,7 @@ public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlo } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return state.getValue(LEAF) ? SHAPES.get(Axis.Y) : SHAPES.get(state.getValue(FACING).getAxis()); } @@ -57,6 +58,7 @@ public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlo } @Override + @SuppressWarnings("deprecation") public FluidState getFluidState(BlockState state) { return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state); } @@ -71,16 +73,19 @@ public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlo } @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState state, Rotation rotation) { return BlocksHelper.rotateHorizontal(state, rotation, FACING); } @Override + @SuppressWarnings("deprecation") public BlockState mirror(BlockState state, Mirror mirror) { return BlocksHelper.mirrorHorizontal(state, mirror, FACING); } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) { if (state.getValue(WATERLOGGED)) { world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); diff --git a/src/main/java/ru/betterend/blocks/EndStoneSmelter.java b/src/main/java/ru/betterend/blocks/EndStoneSmelter.java index 366106d1..4cbc201a 100644 --- a/src/main/java/ru/betterend/blocks/EndStoneSmelter.java +++ b/src/main/java/ru/betterend/blocks/EndStoneSmelter.java @@ -58,6 +58,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity { registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(LIT, false)); } + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { if (world.isClientSide) { return InteractionResult.SUCCESS; @@ -102,11 +103,13 @@ public class EndStoneSmelter extends BaseBlockWithEntity { } @Override + @SuppressWarnings("deprecation") public boolean hasAnalogOutputSignal(BlockState state) { return true; } @Override + @SuppressWarnings("deprecation") public int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) { //TODO return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos)); @@ -118,11 +121,13 @@ public class EndStoneSmelter extends BaseBlockWithEntity { } @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState state, Rotation rotation) { return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); } @Override + @SuppressWarnings("deprecation") public BlockState mirror(BlockState state, Mirror mirror) { return state.rotate(mirror.getRotation(state.getValue(FACING))); } diff --git a/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java b/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java index 3976ffe1..d5698e81 100644 --- a/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java +++ b/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java @@ -21,12 +21,15 @@ public class EndstoneDustBlock extends FallingBlock { private static final int COLOR = ColorUtil.color(226, 239, 168); public EndstoneDustBlock() { - super(FabricBlockSettings.copyOf(Blocks.SAND) - .breakByTool(FabricToolTags.SHOVELS) - .materialColor(Blocks.END_STONE.defaultMaterialColor())); + super(FabricBlockSettings + .copyOf(Blocks.SAND) + .breakByTool(FabricToolTags.SHOVELS) + .mapColor(Blocks.END_STONE.defaultMaterialColor()) + ); } @Override + @SuppressWarnings("deprecation") public List getDrops(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java b/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java index b17deea8..82bd8ff7 100644 --- a/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java +++ b/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java @@ -34,6 +34,7 @@ public class FilaluxWingsBlock extends BaseAttachedBlock implements RenderLayerP } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return BOUNDING_SHAPES.get(state.getValue(FACING)); } diff --git a/src/main/java/ru/betterend/blocks/FlowerPotBlock.java b/src/main/java/ru/betterend/blocks/FlowerPotBlock.java index b71c9893..12b0fd4a 100644 --- a/src/main/java/ru/betterend/blocks/FlowerPotBlock.java +++ b/src/main/java/ru/betterend/blocks/FlowerPotBlock.java @@ -101,6 +101,7 @@ public class FlowerPotBlock extends BaseBlockNotFull implements RenderLayerProvi } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) { int plantID = state.getValue(PLANT_ID); if (plantID < 1 || plantID > plants.length || plants[plantID - 1] == null) { @@ -198,6 +199,7 @@ public class FlowerPotBlock extends BaseBlockNotFull implements RenderLayerProvi } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { if (level.isClientSide) { return InteractionResult.CONSUME; @@ -421,12 +423,14 @@ public class FlowerPotBlock extends BaseBlockNotFull implements RenderLayerProvi } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { int id = state.getValue(PLANT_ID); return id > 0 && id <= plants.length ? SHAPE_FULL : SHAPE_EMPTY; } @Override + @SuppressWarnings("deprecation") public VoxelShape getCollisionShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return SHAPE_EMPTY; } diff --git a/src/main/java/ru/betterend/blocks/GlowingPillarLuminophorBlock.java b/src/main/java/ru/betterend/blocks/GlowingPillarLuminophorBlock.java index e3ab0f04..ca137efd 100644 --- a/src/main/java/ru/betterend/blocks/GlowingPillarLuminophorBlock.java +++ b/src/main/java/ru/betterend/blocks/GlowingPillarLuminophorBlock.java @@ -22,7 +22,7 @@ public class GlowingPillarLuminophorBlock extends BaseBlock { public GlowingPillarLuminophorBlock() { super(FabricBlockSettings.of(Material.LEAVES) - .materialColor(MaterialColor.COLOR_ORANGE) + .mapColor(MaterialColor.COLOR_ORANGE) .breakByTool(FabricToolTags.SHEARS) .strength(0.2F) .luminance(15) @@ -31,11 +31,13 @@ public class GlowingPillarLuminophorBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { return !state.getValue(NATURAL) || world.getBlockState(pos.below()).is(EndBlocks.GLOWING_PILLAR_ROOTS); } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) { if (!canSurvive(state, world, pos)) { return Blocks.AIR.defaultBlockState(); diff --git a/src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java b/src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java index a7ff88f4..92403686 100644 --- a/src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java +++ b/src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java @@ -1,10 +1,6 @@ package ru.betterend.blocks; -import java.util.Collections; -import java.util.List; - import com.google.common.collect.Lists; - import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.client.color.block.BlockColor; @@ -31,17 +27,22 @@ import ru.bclib.util.MHelper; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; +import java.util.Collections; +import java.util.List; + public class HelixTreeLeavesBlock extends BaseBlock implements CustomColorProvider { public static final IntegerProperty COLOR = EndBlockProperties.COLOR; private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0); public HelixTreeLeavesBlock() { - super(FabricBlockSettings.of(Material.LEAVES) - .materialColor(MaterialColor.COLOR_ORANGE) - .breakByTool(FabricToolTags.SHEARS) - .sound(SoundType.WART_BLOCK) - .sound(SoundType.GRASS) - .strength(0.2F)); + super(FabricBlockSettings + .of(Material.LEAVES) + .mapColor(MaterialColor.COLOR_ORANGE) + .breakByTool(FabricToolTags.SHEARS) + .sound(SoundType.WART_BLOCK) + .sound(SoundType.GRASS) + .strength(0.2F) + ); TagAPI.addTags(this, TagAPI.BLOCK_LEAVES); } diff --git a/src/main/java/ru/betterend/blocks/HelixTreeSaplingBlock.java b/src/main/java/ru/betterend/blocks/HelixTreeSaplingBlock.java index 5ccb2dcc..788665b4 100644 --- a/src/main/java/ru/betterend/blocks/HelixTreeSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/HelixTreeSaplingBlock.java @@ -11,6 +11,7 @@ import ru.betterend.registry.EndFeatures; public class HelixTreeSaplingBlock extends PottableFeatureSapling { @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.HELIX_TREE.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java b/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java index 40c12ed9..78759553 100644 --- a/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java +++ b/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java @@ -13,13 +13,16 @@ import ru.bclib.blocks.BaseBlock; public class HydraluxPetalBlock extends BaseBlock { public HydraluxPetalBlock() { - this(FabricBlockSettings.of(Material.PLANT) - .breakByTool(FabricToolTags.AXES) - .breakByHand(true) - .hardness(1) - .resistance(1) - .materialColor(MaterialColor.PODZOL) - .sound(SoundType.WART_BLOCK)); + this( + FabricBlockSettings + .of(Material.PLANT) + .breakByTool(FabricToolTags.AXES) + .breakByHand(true) + .hardness(1) + .resistance(1) + .mapColor(MaterialColor.PODZOL) + .sound(SoundType.WART_BLOCK) + ); } public HydraluxPetalBlock(Properties settings) { diff --git a/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java b/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java index bd50261f..44f5e696 100644 --- a/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java +++ b/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java @@ -66,6 +66,7 @@ public class JellyshroomCapBlock extends SlimeBlock implements RenderLayerProvid } @Override + @SuppressWarnings("deprecation") public List getDrops(BlockState state, LootContext.Builder builder) { return Lists.newArrayList(new ItemStack(this)); } diff --git a/src/main/java/ru/betterend/blocks/LacugroveSaplingBlock.java b/src/main/java/ru/betterend/blocks/LacugroveSaplingBlock.java index d173d767..0f6dd809 100644 --- a/src/main/java/ru/betterend/blocks/LacugroveSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/LacugroveSaplingBlock.java @@ -15,6 +15,7 @@ public class LacugroveSaplingBlock extends PottableFeatureSapling { } @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.LACUGROVE.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/LucerniaSaplingBlock.java b/src/main/java/ru/betterend/blocks/LucerniaSaplingBlock.java index 6e3bce0b..506d1691 100644 --- a/src/main/java/ru/betterend/blocks/LucerniaSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/LucerniaSaplingBlock.java @@ -15,6 +15,7 @@ public class LucerniaSaplingBlock extends PottableFeatureSapling { } @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.LUCERNIA.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/MossyGlowshroomSaplingBlock.java b/src/main/java/ru/betterend/blocks/MossyGlowshroomSaplingBlock.java index fe062fdc..705992f7 100644 --- a/src/main/java/ru/betterend/blocks/MossyGlowshroomSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/MossyGlowshroomSaplingBlock.java @@ -15,6 +15,7 @@ public class MossyGlowshroomSaplingBlock extends PottableFeatureSapling { } @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.MOSSY_GLOWSHROOM.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/MossyObsidian.java b/src/main/java/ru/betterend/blocks/MossyObsidian.java index eb4a6888..ce33774e 100644 --- a/src/main/java/ru/betterend/blocks/MossyObsidian.java +++ b/src/main/java/ru/betterend/blocks/MossyObsidian.java @@ -35,12 +35,14 @@ public class MossyObsidian extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) { if (random.nextInt(16) == 0 && !canSurvive(state, world, pos)) { world.setBlockAndUpdate(pos, Blocks.OBSIDIAN.defaultBlockState()); } } + @SuppressWarnings("deprecation") public boolean canSurvive(BlockState state, LevelReader worldView, BlockPos pos) { BlockPos blockPos = pos.above(); BlockState blockState = worldView.getBlockState(blockPos); diff --git a/src/main/java/ru/betterend/blocks/MurkweedBlock.java b/src/main/java/ru/betterend/blocks/MurkweedBlock.java index be422d9b..a2789094 100644 --- a/src/main/java/ru/betterend/blocks/MurkweedBlock.java +++ b/src/main/java/ru/betterend/blocks/MurkweedBlock.java @@ -29,6 +29,7 @@ public class MurkweedBlock extends EndPlantBlock { } @Override + @SuppressWarnings("deprecation") public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) { if (entity instanceof LivingEntity && !((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS)) { ((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 50)); @@ -41,6 +42,7 @@ public class MurkweedBlock extends EndPlantBlock { } @Override + @SuppressWarnings("deprecation") public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) { return false; } diff --git a/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java b/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java index 7258933d..0cb15a70 100644 --- a/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java +++ b/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java @@ -24,6 +24,7 @@ import java.util.List; public class NeedlegrassBlock extends EndPlantBlock { @Override + @SuppressWarnings("deprecation") public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) { if (entity instanceof LivingEntity) { entity.hurt(DamageSource.CACTUS, 0.1F); @@ -50,6 +51,7 @@ public class NeedlegrassBlock extends EndPlantBlock { } @Override + @SuppressWarnings("deprecation") public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) { return false; } diff --git a/src/main/java/ru/betterend/blocks/PythadendronSaplingBlock.java b/src/main/java/ru/betterend/blocks/PythadendronSaplingBlock.java index 8f01bf65..a965af01 100644 --- a/src/main/java/ru/betterend/blocks/PythadendronSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/PythadendronSaplingBlock.java @@ -15,6 +15,7 @@ public class PythadendronSaplingBlock extends PottableFeatureSapling { } @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.PYTHADENDRON_TREE.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java b/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java index 217f84f0..b087533f 100644 --- a/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java +++ b/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java @@ -58,6 +58,7 @@ public class RespawnObeliskBlock extends BaseBlock implements CustomColorProvide } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return (state.getValue(SHAPE) == TripleShape.BOTTOM) ? VOXEL_SHAPE_BOTTOM : VOXEL_SHAPE_MIDDLE_TOP; } @@ -68,6 +69,7 @@ public class RespawnObeliskBlock extends BaseBlock implements CustomColorProvide } @Override + @SuppressWarnings("deprecation") public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { for (int i = 0; i < 3; i++) { if (!world.getBlockState(pos.above(i)).getMaterial().isReplaceable()) { @@ -86,6 +88,7 @@ public class RespawnObeliskBlock extends BaseBlock implements CustomColorProvide } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) { TripleShape shape = state.getValue(SHAPE); if (shape == TripleShape.BOTTOM) { @@ -156,6 +159,7 @@ public class RespawnObeliskBlock extends BaseBlock implements CustomColorProvide } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ItemStack itemStack = player.getItemInHand(hand); boolean canActivate = itemStack.getItem() == EndItems.AMBER_GEM && itemStack.getCount() > 5; diff --git a/src/main/java/ru/betterend/blocks/SilkMothHiveBlock.java b/src/main/java/ru/betterend/blocks/SilkMothHiveBlock.java index a0d4d297..63b1d3b2 100644 --- a/src/main/java/ru/betterend/blocks/SilkMothHiveBlock.java +++ b/src/main/java/ru/betterend/blocks/SilkMothHiveBlock.java @@ -63,16 +63,19 @@ public class SilkMothHiveBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState state, Rotation rotation) { return BlocksHelper.rotateHorizontal(state, rotation, FACING); } @Override + @SuppressWarnings("deprecation") public BlockState mirror(BlockState state, Mirror mirror) { return BlocksHelper.mirrorHorizontal(state, mirror, FACING); } @Override + @SuppressWarnings("deprecation") public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) { Direction dir = state.getValue(FACING); BlockPos spawn = pos.relative(dir); @@ -94,6 +97,7 @@ public class SilkMothHiveBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { if (hand == InteractionHand.MAIN_HAND) { ItemStack stack = player.getMainHandItem(); diff --git a/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java b/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java index 8fb70bc9..71715b0d 100644 --- a/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java +++ b/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java @@ -71,6 +71,7 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return state.getValue(ACTIVE) ? BOTTOM : TOP; } @@ -87,6 +88,7 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) { if (!state.getValue(ACTIVE)) { if (canSupportCenter(world, pos.above(), Direction.DOWN) || world.getBlockState(pos.above()) @@ -101,11 +103,13 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider } @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState state, Rotation rotation) { return BlocksHelper.rotateHorizontal(state, rotation, FACING); } @Override + @SuppressWarnings("deprecation") public BlockState mirror(BlockState state, Mirror mirror) { return BlocksHelper.mirrorHorizontal(state, mirror, FACING); } @@ -128,6 +132,7 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider } @Override + @SuppressWarnings("deprecation") public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) { if (!state.getValue(ACTIVE)) { return; @@ -155,6 +160,7 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { if (hand == InteractionHand.MAIN_HAND) { ItemStack stack = player.getMainHandItem(); diff --git a/src/main/java/ru/betterend/blocks/TenaneaSaplingBlock.java b/src/main/java/ru/betterend/blocks/TenaneaSaplingBlock.java index 7610721f..e0c7c295 100644 --- a/src/main/java/ru/betterend/blocks/TenaneaSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/TenaneaSaplingBlock.java @@ -15,6 +15,7 @@ public class TenaneaSaplingBlock extends PottableFeatureSapling { } @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.TENANEA.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterBlock.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterBlock.java index 4c5f7dbe..3993962f 100644 --- a/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterBlock.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterBlock.java @@ -27,9 +27,11 @@ public class UmbrellaTreeClusterBlock extends BaseBlock { public static final BooleanProperty NATURAL = BlockProperties.NATURAL; public UmbrellaTreeClusterBlock() { - super(FabricBlockSettings.copyOf(Blocks.NETHER_WART_BLOCK) - .materialColor(MaterialColor.COLOR_PURPLE) - .luminance(15)); + super(FabricBlockSettings + .copyOf(Blocks.NETHER_WART_BLOCK) + .mapColor(MaterialColor.COLOR_PURPLE) + .luminance(15) + ); registerDefaultState(stateDefinition.any().setValue(NATURAL, false)); } @@ -39,6 +41,7 @@ public class UmbrellaTreeClusterBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ItemStack stack = player.getMainHandItem(); if (stack.getItem() == Items.GLASS_BOTTLE) { diff --git a/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java index 1ad1c7aa..084ac2b9 100644 --- a/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java @@ -19,9 +19,11 @@ public class UmbrellaTreeClusterEmptyBlock extends BaseBlock { public static final BooleanProperty NATURAL = EndBlockProperties.NATURAL; public UmbrellaTreeClusterEmptyBlock() { - super(FabricBlockSettings.copyOf(Blocks.NETHER_WART_BLOCK) - .materialColor(MaterialColor.COLOR_PURPLE) - .randomTicks()); + super(FabricBlockSettings + .copyOf(Blocks.NETHER_WART_BLOCK) + .mapColor(MaterialColor.COLOR_PURPLE) + .randomTicks() + ); registerDefaultState(stateDefinition.any().setValue(NATURAL, false)); } @@ -31,6 +33,7 @@ public class UmbrellaTreeClusterEmptyBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) { if (state.getValue(NATURAL) && random.nextInt(16) == 0) { BlocksHelper.setWithUpdate( diff --git a/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java index 162b4900..7eaca069 100644 --- a/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java @@ -55,6 +55,7 @@ public class UmbrellaTreeMembraneBlock extends SlimeBlock implements RenderLayer } @Override + @SuppressWarnings("deprecation") public List getDrops(BlockState state, LootContext.Builder builder) { if (state.getValue(COLOR) > 0) { return Lists.newArrayList(new ItemStack(this)); diff --git a/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java index 6213f6f3..66c76870 100644 --- a/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java @@ -16,6 +16,7 @@ public class UmbrellaTreeSaplingBlock extends PottableFeatureSapling { } @Override + @SuppressWarnings("deprecation") protected Feature getFeature() { return EndFeatures.UMBRELLA_TREE.getFeature(); } diff --git a/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java b/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java index 0a73fcd5..83babfe1 100644 --- a/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java +++ b/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java @@ -48,22 +48,26 @@ public class VentBubbleColumnBlock extends Block implements BucketPickup, Liquid } @Override + @SuppressWarnings("deprecation") public RenderShape getRenderShape(BlockState state) { return RenderShape.INVISIBLE; } @Override + @SuppressWarnings("deprecation") public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { BlockState blockState = world.getBlockState(pos.below()); return blockState.is(this) || blockState.is(EndBlocks.HYDROTHERMAL_VENT); } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { return Shapes.empty(); } @Override + @SuppressWarnings("deprecation") public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) { if (!state.canSurvive(world, pos)) { return Blocks.WATER.defaultBlockState(); @@ -101,6 +105,7 @@ public class VentBubbleColumnBlock extends Block implements BucketPickup, Liquid } @Environment(EnvType.CLIENT) + @SuppressWarnings("deprecation") public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) { BlockState blockState = world.getBlockState(pos.above()); if (blockState.isAir()) { @@ -150,6 +155,7 @@ public class VentBubbleColumnBlock extends Block implements BucketPickup, Liquid } @Override + @SuppressWarnings("deprecation") public FluidState getFluidState(BlockState state) { return Fluids.WATER.getSource(false); } diff --git a/src/main/java/ru/betterend/blocks/basis/FurBlock.java b/src/main/java/ru/betterend/blocks/basis/FurBlock.java index 88a015e4..951e8278 100644 --- a/src/main/java/ru/betterend/blocks/basis/FurBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/FurBlock.java @@ -1,11 +1,7 @@ package ru.betterend.blocks.basis; -import java.util.EnumMap; -import java.util.List; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.core.BlockPos; @@ -29,6 +25,9 @@ import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.RenderLayerProvider; import ru.bclib.util.MHelper; +import java.util.EnumMap; +import java.util.List; + public class FurBlock extends BaseAttachedBlock implements RenderLayerProvider { private static final EnumMap BOUNDING_SHAPES = Maps.newEnumMap(Direction.class); private final ItemLike drop; @@ -58,6 +57,7 @@ public class FurBlock extends BaseAttachedBlock implements RenderLayerProvider { } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return BOUNDING_SHAPES.get(state.getValue(FACING)); } diff --git a/src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java b/src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java index 7533c360..69ccbdd7 100644 --- a/src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java @@ -40,6 +40,7 @@ public class StoneLanternBlock extends EndLanternBlock implements CustomColorPro } @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return state.getValue(IS_FLOOR) ? SHAPE_FLOOR : SHAPE_CEIL; } diff --git a/src/main/java/ru/betterend/complexmaterials/ColoredMaterial.java b/src/main/java/ru/betterend/complexmaterials/ColoredMaterial.java index 70998ac1..f27aa10a 100644 --- a/src/main/java/ru/betterend/complexmaterials/ColoredMaterial.java +++ b/src/main/java/ru/betterend/complexmaterials/ColoredMaterial.java @@ -30,8 +30,7 @@ public class ColoredMaterial { String id = Registry.BLOCK.getKey(source).getPath(); colors.forEach((color, name) -> { String blockName = id + "_" + name; - Block block = constructor.apply(FabricBlockSettings.copyOf(source) - .materialColor(MaterialColor.COLOR_BLACK)); + Block block = constructor.apply(FabricBlockSettings.copyOf(source).mapColor(MaterialColor.COLOR_BLACK)); EndBlocks.registerBlock(blockName, block); if (craftEight) { GridRecipe.make(BetterEnd.MOD_ID, blockName, block) diff --git a/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java b/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java index cf662d75..89736e67 100644 --- a/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java +++ b/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java @@ -95,8 +95,7 @@ public class MetalMaterial { return new MetalMaterial( name, true, - FabricBlockSettings.copyOf(Blocks.IRON_BLOCK) - .materialColor(color), + FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).mapColor(color), EndItems.makeEndItemSettings(), material, armor @@ -108,7 +107,7 @@ public class MetalMaterial { name, true, FabricBlockSettings.copyOf(Blocks.IRON_BLOCK) - .materialColor(color) + .mapColor(color) .hardness(hardness) .resistance(resistance), EndItems.makeEndItemSettings(), @@ -121,8 +120,7 @@ public class MetalMaterial { return new MetalMaterial( name, false, - FabricBlockSettings.copyOf(Blocks.IRON_BLOCK) - .materialColor(color), + FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).mapColor(color), EndItems.makeEndItemSettings(), material, armor @@ -134,7 +132,7 @@ public class MetalMaterial { name, false, FabricBlockSettings.copyOf(Blocks.IRON_BLOCK) - .materialColor(color) + .mapColor(color) .hardness(hardness) .resistance(resistance), EndItems.makeEndItemSettings(), diff --git a/src/main/java/ru/betterend/complexmaterials/StoneMaterial.java b/src/main/java/ru/betterend/complexmaterials/StoneMaterial.java index 9a129dbd..107471e6 100644 --- a/src/main/java/ru/betterend/complexmaterials/StoneMaterial.java +++ b/src/main/java/ru/betterend/complexmaterials/StoneMaterial.java @@ -47,7 +47,7 @@ public class StoneMaterial { public final Block flowerPot; public StoneMaterial(String name, MaterialColor color) { - FabricBlockSettings material = FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color); + FabricBlockSettings material = FabricBlockSettings.copyOf(Blocks.END_STONE).mapColor(color); stone = EndBlocks.registerBlock(name, new BaseBlock(material)); polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock(material)); diff --git a/src/main/java/ru/betterend/effects/EndPotions.java b/src/main/java/ru/betterend/effects/EndPotions.java index 0b2e2394..103f36bb 100644 --- a/src/main/java/ru/betterend/effects/EndPotions.java +++ b/src/main/java/ru/betterend/effects/EndPotions.java @@ -6,8 +6,8 @@ import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.Potions; +import ru.bclib.mixin.common.PotionBrewingAccessor; import ru.betterend.BetterEnd; -import ru.betterend.mixin.common.PotionBrewingAccessor; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; diff --git a/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java b/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java index 5e4bc1c0..d1b32775 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java +++ b/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java @@ -1,10 +1,5 @@ package ru.betterend.integration.rei; -import java.util.Collections; -import java.util.Optional; - -import org.jetbrains.annotations.NotNull; - import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; @@ -12,8 +7,12 @@ import me.shedaniel.rei.api.common.util.EntryIngredients; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; +import org.jetbrains.annotations.NotNull; import ru.bclib.recipes.AnvilRecipe; +import java.util.Collections; +import java.util.Optional; + public class REIAnvilDisplay extends BasicDisplay implements SimpleGridMenuDisplay { private final AnvilRecipe recipe; diff --git a/src/main/java/ru/betterend/integration/rei/REIPlugin.java b/src/main/java/ru/betterend/integration/rei/REIPlugin.java index 9c371fef..fac1bd48 100644 --- a/src/main/java/ru/betterend/integration/rei/REIPlugin.java +++ b/src/main/java/ru/betterend/integration/rei/REIPlugin.java @@ -1,11 +1,6 @@ package ru.betterend.integration.rei; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - import com.google.common.collect.Lists; - import me.shedaniel.rei.api.client.plugins.REIClientPlugin; import me.shedaniel.rei.api.client.registry.category.CategoryRegistry; import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; @@ -29,6 +24,10 @@ import ru.betterend.recipe.builders.AlloyingRecipe; import ru.betterend.recipe.builders.InfusionRecipe; import ru.betterend.registry.EndBlocks; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + //https://github.com/shedaniel/RoughlyEnoughItems/blob/6.x-1.17/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java public class REIPlugin implements REIClientPlugin { public final static ResourceLocation PLUGIN_ID = BetterEnd.makeID("rei_plugin"); diff --git a/src/main/java/ru/betterend/interfaces/IBiomeArray.java b/src/main/java/ru/betterend/interfaces/IBiomeArray.java deleted file mode 100644 index 9c632b6d..00000000 --- a/src/main/java/ru/betterend/interfaces/IBiomeArray.java +++ /dev/null @@ -1,8 +0,0 @@ -package ru.betterend.interfaces; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.biome.Biome; - -public interface IBiomeArray { - public void be_setBiome(Biome biome, BlockPos pos); -} diff --git a/src/main/java/ru/betterend/interfaces/MultiModelItem.java b/src/main/java/ru/betterend/interfaces/MultiModelItem.java index b724b8ca..1245197f 100644 --- a/src/main/java/ru/betterend/interfaces/MultiModelItem.java +++ b/src/main/java/ru/betterend/interfaces/MultiModelItem.java @@ -2,7 +2,6 @@ package ru.betterend.interfaces; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import ru.betterend.BetterEnd; import ru.betterend.registry.EndItems; public interface MultiModelItem { diff --git a/src/main/java/ru/betterend/item/material/EndArmorMaterial.java b/src/main/java/ru/betterend/item/material/EndArmorMaterial.java index 182c6d99..fd740dd7 100644 --- a/src/main/java/ru/betterend/item/material/EndArmorMaterial.java +++ b/src/main/java/ru/betterend/item/material/EndArmorMaterial.java @@ -1,7 +1,5 @@ package ru.betterend.item.material; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.LazyLoadedValue; @@ -32,10 +30,11 @@ public enum EndArmorMaterial implements ArmorMaterial { private final SoundEvent equipSound; private final float toughness; private final float knockbackResistance; + @SuppressWarnings("deprecation") private final LazyLoadedValue repairIngredient; + @SuppressWarnings("deprecation") private EndArmorMaterial(String name, int durabilityMultiplier, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Supplier repairIngredient) { - this.name = name; this.durabilityMultiplier = durabilityMultiplier; this.protectionAmounts = protectionAmounts; diff --git a/src/main/java/ru/betterend/item/material/EndToolMaterial.java b/src/main/java/ru/betterend/item/material/EndToolMaterial.java index d546c6a4..ac7f7049 100644 --- a/src/main/java/ru/betterend/item/material/EndToolMaterial.java +++ b/src/main/java/ru/betterend/item/material/EndToolMaterial.java @@ -22,10 +22,11 @@ public enum EndToolMaterial implements Tier { private final float attackDamage; private final int miningLevel; private final int enchantability; + @SuppressWarnings("deprecation") private final LazyLoadedValue repairIngredient; + @SuppressWarnings("deprecation") private EndToolMaterial(int miningLevel, int durability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) { - this.durability = durability; this.miningSpeed = miningSpeed; this.attackDamage = attackDamage; diff --git a/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java index baa24bdc..7acd396b 100644 --- a/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java @@ -67,6 +67,7 @@ public abstract class ChorusFlowerBlockMixin extends Block { private void placeGrownFlower(Level world, BlockPos pos, int age) {} @Override + @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { if (GeneratorOptions.changeChorusPlant()) { return state.getValue(ChorusFlowerBlock.AGE) == 5 ? SHAPE_HALF : SHAPE_FULL; diff --git a/src/main/java/ru/betterend/mixin/common/ChunkBiomeContainerMixin.java b/src/main/java/ru/betterend/mixin/common/ChunkBiomeContainerMixin.java deleted file mode 100644 index d1f953a3..00000000 --- a/src/main/java/ru/betterend/mixin/common/ChunkBiomeContainerMixin.java +++ /dev/null @@ -1,132 +0,0 @@ -package ru.betterend.mixin.common; - -import net.minecraft.core.BlockPos; -import net.minecraft.util.BitStorage; -import net.minecraft.util.Mth; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.chunk.ChunkBiomeContainer; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import ru.betterend.BetterEnd; -import ru.betterend.integration.Integrations; -import ru.betterend.interfaces.IBiomeArray; - -import java.lang.reflect.Field; - -@Mixin(ChunkBiomeContainer.class) -public class ChunkBiomeContainerMixin implements IBiomeArray { - @Final - @Shadow - private Biome[] biomes; - - @Final - @Shadow - private static int WIDTH_BITS; - - @Final - @Shadow - private static int HORIZONTAL_MASK; - - @Override - public void be_setBiome(Biome biome, BlockPos pos) { - int biomeX = pos.getX() >> 2; - int biomeY = pos.getY() >> 2; - int biomeZ = pos.getZ() >> 2; - int index = be_getArrayIndex(biomeX, biomeY, biomeZ); - - if (Integrations.hasHydrogen() && be_shouldWriteToHydrogen()) { - try { - ChunkBiomeContainer self = (ChunkBiomeContainer) (Object) this; - BitStorage storage = be_getHydrogenStorage(self); - Biome[] palette = be_getHydrogenPalette(self); - int paletteIndex = be_getHydrogenPaletteIndex(biome, palette); - if (paletteIndex == -1) { - Biome[] newPalette = new Biome[palette.length + 1]; - System.arraycopy(palette, 0, newPalette, 0, palette.length); - paletteIndex = palette.length; - palette = newPalette; - palette[paletteIndex] = biome; - be_setHydrogenPalette(self, palette); - } - try { - storage.set(index, paletteIndex); - } - catch (Exception e) { - int size = storage.getSize(); - int bits = Mth.ceillog2(palette.length); - BitStorage newStorage = new BitStorage(bits, size); - for (int i = 0; i < size; i++) { - newStorage.set(i, storage.get(i)); - } - storage = newStorage; - storage.set(index, paletteIndex); - be_setHydrogenStorage(self, storage); - } - } - catch (Exception e) { - BetterEnd.LOGGER.warning(e.getLocalizedMessage()); - } - return; - } - - biomes[index] = biome; - } - - @Shadow - @Final - private int quartMinY; - @Shadow - @Final - private int quartHeight; - - private boolean be_shouldWriteToHydrogen() { - try { - Field field = ChunkBiomeContainer.class.getDeclaredField("intArray"); - return field != null; - } - catch (NoSuchFieldException e) { - return false; - } - } - - private int be_getArrayIndex(int biomeX, int biomeY, int biomeZ) { - int i = biomeX & HORIZONTAL_MASK; - int j = Mth.clamp(biomeY - this.quartMinY, 0, this.quartHeight); - int k = biomeZ & HORIZONTAL_MASK; - return j << WIDTH_BITS + WIDTH_BITS | k << WIDTH_BITS | i; - } - - private Field be_getField(String name) throws Exception { - Field field = ChunkBiomeContainer.class.getDeclaredField(name); - field.setAccessible(true); - return field; - } - - private BitStorage be_getHydrogenStorage(ChunkBiomeContainer container) throws Exception { - return (BitStorage) be_getField("intArray").get(container); - } - - private Biome[] be_getHydrogenPalette(ChunkBiomeContainer container) throws Exception { - return (Biome[]) be_getField("palette").get(container); - } - - private int be_getHydrogenPaletteIndex(Biome biome, Biome[] palette) { - int index = -1; - for (int i = 0; i < palette.length; i++) { - if (palette[i] == biome) { - index = i; - break; - } - } - return index; - } - - private void be_setHydrogenPalette(ChunkBiomeContainer container, Biome[] palette) throws Exception { - be_getField("palette").set(container, palette); - } - - private void be_setHydrogenStorage(ChunkBiomeContainer container, BitStorage storage) throws Exception { - be_getField("intArray").set(container, storage); - } -} diff --git a/src/main/java/ru/betterend/mixin/common/ComposterBlockAccessor.java b/src/main/java/ru/betterend/mixin/common/ComposterBlockAccessor.java deleted file mode 100644 index c0bc899e..00000000 --- a/src/main/java/ru/betterend/mixin/common/ComposterBlockAccessor.java +++ /dev/null @@ -1,14 +0,0 @@ -package ru.betterend.mixin.common; - -import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.block.ComposterBlock; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(ComposterBlock.class) -public interface ComposterBlockAccessor { - @Invoker - static void callAdd(float levelIncreaseChance, ItemLike item) { - throw new AssertionError("@Invoker dummy body called"); - } -} diff --git a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java index de8bea31..c929ef04 100644 --- a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java @@ -1,7 +1,5 @@ package ru.betterend.mixin.common; -import java.util.Collection; - import net.minecraft.sounds.SoundEvent; import net.minecraft.tags.EntityTypeTags; import net.minecraft.util.Mth; @@ -39,6 +37,8 @@ import ru.betterend.interfaces.MobEffectApplier; import ru.betterend.item.CrystaliteArmor; import ru.betterend.registry.EndAttributes; +import java.util.Collection; + @Mixin(value=LivingEntity.class, priority=200) public abstract class LivingEntityMixin extends Entity { diff --git a/src/main/java/ru/betterend/mixin/common/PlayerMixin.java b/src/main/java/ru/betterend/mixin/common/PlayerMixin.java index baa419f7..f86d1ded 100644 --- a/src/main/java/ru/betterend/mixin/common/PlayerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/PlayerMixin.java @@ -1,7 +1,5 @@ package ru.betterend.mixin.common; -import java.util.Optional; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; @@ -26,6 +24,8 @@ import ru.bclib.util.MHelper; import ru.betterend.interfaces.FallFlyingItem; import ru.betterend.registry.EndBlocks; +import java.util.Optional; + @Mixin(value=Player.class, priority=200) public abstract class PlayerMixin extends LivingEntity { protected PlayerMixin(EntityType entityType, Level level) { diff --git a/src/main/java/ru/betterend/mixin/common/PotionBrewingAccessor.java b/src/main/java/ru/betterend/mixin/common/PotionBrewingAccessor.java deleted file mode 100644 index d863d6cb..00000000 --- a/src/main/java/ru/betterend/mixin/common/PotionBrewingAccessor.java +++ /dev/null @@ -1,15 +0,0 @@ -package ru.betterend.mixin.common; - -import net.minecraft.world.item.Item; -import net.minecraft.world.item.alchemy.Potion; -import net.minecraft.world.item.alchemy.PotionBrewing; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(PotionBrewing.class) -public interface PotionBrewingAccessor { - @Invoker - static void callAddMix(Potion input, Item item, Potion output) { - throw new AssertionError("@Invoker dummy body called"); - } -} diff --git a/src/main/java/ru/betterend/particle/InfusionParticleType.java b/src/main/java/ru/betterend/particle/InfusionParticleType.java index d7a6f5af..5370d4fa 100644 --- a/src/main/java/ru/betterend/particle/InfusionParticleType.java +++ b/src/main/java/ru/betterend/particle/InfusionParticleType.java @@ -21,6 +21,7 @@ public class InfusionParticleType extends ParticleType imp itemStack ), infusionParticleType -> infusionParticleType.itemStack); + @SuppressWarnings("deprecation") public static final ParticleOptions.Deserializer PARAMETERS_FACTORY = new ParticleOptions.Deserializer() { public InfusionParticleType fromCommand(ParticleType particleType, StringReader stringReader) throws CommandSyntaxException { stringReader.expect(' '); diff --git a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java index c51d8c1b..46f0f301 100644 --- a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java @@ -20,11 +20,11 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; import ru.bclib.interfaces.UnknownReceipBookCategory; import ru.bclib.recipes.BCLRecipeManager; +import ru.bclib.util.ItemUtil; +import ru.bclib.util.RecipeHelper; import ru.betterend.BetterEnd; import ru.betterend.config.Configs; import ru.betterend.registry.EndBlocks; -import ru.bclib.util.ItemUtil; -import ru.bclib.util.RecipeHelper; public class AlloyingRecipe implements Recipe, UnknownReceipBookCategory { public final static String GROUP = "alloying"; diff --git a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java index c0d3dc24..2dfb6d34 100644 --- a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java @@ -1,9 +1,6 @@ package ru.betterend.recipe.builders; -import java.util.Arrays; - import com.google.gson.JsonObject; - import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -27,6 +24,8 @@ import ru.betterend.BetterEnd; import ru.betterend.config.Configs; import ru.betterend.rituals.InfusionRitual; +import java.util.Arrays; + public class InfusionRecipe implements Recipe, UnknownReceipBookCategory { public final static String GROUP = "infusion"; public final static RecipeType TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP); diff --git a/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java b/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java index a568502a..b4a10e53 100644 --- a/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java +++ b/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java @@ -2,14 +2,14 @@ package ru.betterend.registry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry; import ru.betterend.client.render.PedestalItemRenderer; @Environment(EnvType.CLIENT) public class EndBlockEntityRenders { public static void register() { - BlockEntityRendererRegistry.INSTANCE.register(EndBlockEntities.PEDESTAL, PedestalItemRenderer::new); - BlockEntityRendererRegistry.INSTANCE.register(EndBlockEntities.ETERNAL_PEDESTAL, PedestalItemRenderer::new); - BlockEntityRendererRegistry.INSTANCE.register(EndBlockEntities.INFUSION_PEDESTAL, PedestalItemRenderer::new); + BlockEntityRendererRegistry.register(EndBlockEntities.PEDESTAL, PedestalItemRenderer::new); + BlockEntityRendererRegistry.register(EndBlockEntities.ETERNAL_PEDESTAL, PedestalItemRenderer::new); + BlockEntityRendererRegistry.register(EndBlockEntities.INFUSION_PEDESTAL, PedestalItemRenderer::new); } } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index adf46683..af165447 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -1,17 +1,11 @@ package ru.betterend.registry; -import java.util.List; -import java.util.stream.Collectors; - -import org.jetbrains.annotations.NotNull; - import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MaterialColor; +import org.jetbrains.annotations.NotNull; import ru.bclib.blocks.BaseBarrelBlock; import ru.bclib.blocks.BaseChestBlock; import ru.bclib.blocks.BaseFurnaceBlock; @@ -150,6 +144,8 @@ import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndToolMaterial; import ru.betterend.tab.CreativeTabs; +import java.util.List; + public class EndBlocks { private static final BlockRegistry REGISTRY = new BlockRegistry(CreativeTabs.TAB_BLOCKS, Configs.BLOCK_CONFIG); @@ -526,12 +522,7 @@ public class EndBlocks { public static final Block END_PORTAL_BLOCK = registerEndBlockOnly("end_portal_block", new EndPortalBlock()); public static List getModBlocks() { - return BlockRegistry - .getModBlocks(BetterEnd.MOD_ID) - .stream() - .filter(BlockItem.class::isInstance) - .map(item -> ((BlockItem) item).getBlock()) - .collect(Collectors.toList()); + return BlockRegistry.getModBlocks(BetterEnd.MOD_ID); } public static Block registerBlock(ResourceLocation id, Block block) { diff --git a/src/main/java/ru/betterend/registry/EndEntitiesRenders.java b/src/main/java/ru/betterend/registry/EndEntitiesRenders.java index 4ab6b838..ce16a082 100644 --- a/src/main/java/ru/betterend/registry/EndEntitiesRenders.java +++ b/src/main/java/ru/betterend/registry/EndEntitiesRenders.java @@ -1,7 +1,7 @@ package ru.betterend.registry; -import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityModelLayerRegistry; -import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.renderer.entity.EntityRendererProvider.Context; import net.minecraft.client.renderer.entity.MobRenderer; @@ -66,7 +66,7 @@ public class EndEntitiesRenders { } private static void register(EntityType type, Function renderer) { - EntityRendererRegistry.INSTANCE.register(type, (context) -> renderer.apply(context)); + EntityRendererRegistry.register(type, (context) -> renderer.apply(context)); } private static ModelLayerLocation registerMain(String id) { diff --git a/src/main/java/ru/betterend/registry/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index a85aac82..166bd80c 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -24,11 +24,11 @@ import ru.bclib.api.BonemealAPI; import ru.bclib.api.TagAPI; import ru.bclib.blocks.BaseVineBlock; import ru.bclib.blocks.SimpleLeavesBlock; +import ru.bclib.mixin.common.ComposterBlockAccessor; import ru.betterend.BetterEnd; import ru.betterend.blocks.basis.EndTerrainBlock; import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.item.tool.EndHammerItem; -import ru.betterend.mixin.common.ComposterBlockAccessor; import java.util.List; diff --git a/src/main/java/ru/betterend/util/BlockFixer.java b/src/main/java/ru/betterend/util/BlockFixer.java index 0e2b1115..89b2bc55 100644 --- a/src/main/java/ru/betterend/util/BlockFixer.java +++ b/src/main/java/ru/betterend/util/BlockFixer.java @@ -1,10 +1,6 @@ package ru.betterend.util; -import java.util.Set; -import java.util.stream.IntStream; - import com.google.common.collect.Sets; - import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.Direction; @@ -23,6 +19,9 @@ import ru.betterend.blocks.BlueVineBlock; import ru.betterend.blocks.basis.FurBlock; import ru.betterend.registry.EndBlocks; +import java.util.Set; +import java.util.stream.IntStream; + public class BlockFixer { private static final BlockState AIR = Blocks.AIR.defaultBlockState(); private static final BlockState WATER = Blocks.WATER.defaultBlockState(); diff --git a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java index 457946e9..eb22f9f2 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java @@ -1,7 +1,6 @@ package ru.betterend.world.biome.cave; import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.ai.behavior.ShufflingList; import net.minecraft.world.level.biome.Biome.BiomeCategory; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.Feature; diff --git a/src/main/java/ru/betterend/world/features/BlueVineFeature.java b/src/main/java/ru/betterend/world/features/BlueVineFeature.java index 43aec70d..0578fca0 100644 --- a/src/main/java/ru/betterend/world/features/BlueVineFeature.java +++ b/src/main/java/ru/betterend/world/features/BlueVineFeature.java @@ -17,6 +17,7 @@ public class BlueVineFeature extends ScatterFeature { } @Override + @SuppressWarnings("deprecation") public boolean canGenerate(WorldGenLevel world, Random random, BlockPos center, BlockPos blockPos, float radius) { float d = MHelper.length( center.getX() - blockPos.getX(), diff --git a/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java b/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java index 360a96a3..7f7d7d36 100644 --- a/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java @@ -16,11 +16,11 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import ru.bclib.api.BiomeAPI; import ru.bclib.api.TagAPI; +import ru.bclib.interfaces.BiomeSetter; import ru.bclib.util.BlocksHelper; import ru.bclib.util.MHelper; import ru.bclib.world.biomes.BCLBiome; import ru.bclib.world.features.DefaultFeature; -import ru.betterend.interfaces.IBiomeArray; import ru.betterend.registry.EndBiomes; import ru.betterend.util.BlockFixer; import ru.betterend.world.biome.cave.EndCaveBiome; @@ -155,9 +155,9 @@ public abstract class EndCaveFeature extends DefaultFeature { } protected void setBiome(WorldGenLevel world, BlockPos pos, EndCaveBiome biome) { - IBiomeArray array = (IBiomeArray) world.getChunk(pos).getBiomes(); + BiomeSetter array = (BiomeSetter) world.getChunk(pos).getBiomes(); if (array != null) { - array.be_setBiome(biome.getActualBiome(), pos); + array.bclib_setBiome(biome.getActualBiome(), pos); } } diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index 99e8f654..30a58db7 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -6,14 +6,11 @@ "mixins": [ "BiomeGenerationSettingsAccessor", "NoiseBasedChunkGeneratorMixin", - "ChunkBiomeContainerMixin", "ChorusPlantFeatureMixin", "PlayerAdvancementsMixin", "ChorusFlowerBlockMixin", - "ComposterBlockAccessor", "ChorusPlantBlockMixin", "EndPodiumFeatureMixin", - "PotionBrewingAccessor", "MinecraftServerMixin", "EndDragonFightMixin", "WorldGenRegionMixin",