diff --git a/src/main/java/net/mcreator/customoregen/block/ConcentratedcoaloreBlock.java b/src/main/java/net/mcreator/customoregen/block/ConcentratedcoaloreBlock.java index a7faac7af..1a529e624 100644 --- a/src/main/java/net/mcreator/customoregen/block/ConcentratedcoaloreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/ConcentratedcoaloreBlock.java @@ -11,8 +11,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - public class ConcentratedcoaloreBlock extends Block { public ConcentratedcoaloreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 15f).requiresCorrectToolForDrops()); @@ -23,10 +21,4 @@ public class ConcentratedcoaloreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } } diff --git a/src/main/java/net/mcreator/customoregen/block/CopperhighoreBlock.java b/src/main/java/net/mcreator/customoregen/block/CopperhighoreBlock.java index f7b9e4f54..75fcae711 100644 --- a/src/main/java/net/mcreator/customoregen/block/CopperhighoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/CopperhighoreBlock.java @@ -11,8 +11,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - public class CopperhighoreBlock extends Block { public CopperhighoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(1f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +21,4 @@ public class CopperhighoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } } diff --git a/src/main/java/net/mcreator/customoregen/block/CopperloweroreBlock.java b/src/main/java/net/mcreator/customoregen/block/CopperloweroreBlock.java index 077a9b791..af068e0af 100644 --- a/src/main/java/net/mcreator/customoregen/block/CopperloweroreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/CopperloweroreBlock.java @@ -11,8 +11,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - public class CopperloweroreBlock extends Block { public CopperloweroreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(4.5f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +21,4 @@ public class CopperloweroreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } } diff --git a/src/main/java/net/mcreator/customoregen/block/DeepslatediamondoreBlock.java b/src/main/java/net/mcreator/customoregen/block/DeepslatediamondoreBlock.java index 4f83e6014..003a4b587 100644 --- a/src/main/java/net/mcreator/customoregen/block/DeepslatediamondoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/DeepslatediamondoreBlock.java @@ -13,9 +13,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; import net.mcreator.customoregen.init.CustomOreGenModBlocks; - public class DeepslatediamondoreBlock extends Block { public DeepslatediamondoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 11f).requiresCorrectToolForDrops()); @@ -26,10 +24,4 @@ public class DeepslatediamondoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/DeepslateironoreBlock.java b/src/main/java/net/mcreator/customoregen/block/DeepslateironoreBlock.java index 5bdb4b688..a3b4ae57a 100644 --- a/src/main/java/net/mcreator/customoregen/block/DeepslateironoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/DeepslateironoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class DeepslateironoreBlock extends Block { public DeepslateironoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +22,4 @@ public class DeepslateironoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/DeepslatelapisoreBlock.java b/src/main/java/net/mcreator/customoregen/block/DeepslatelapisoreBlock.java index d0d2629e4..d91f9295a 100644 --- a/src/main/java/net/mcreator/customoregen/block/DeepslatelapisoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/DeepslatelapisoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class DeepslatelapisoreBlock extends Block { public DeepslatelapisoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(4.5f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +22,4 @@ public class DeepslatelapisoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock.java b/src/main/java/net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock.java index 1715153db..fba225fe8 100644 --- a/src/main/java/net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class DeepslatepuregoldenoreBlock extends Block { public DeepslatepuregoldenoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +22,4 @@ public class DeepslatepuregoldenoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/DeepslateredstoneoreBlock.java b/src/main/java/net/mcreator/customoregen/block/DeepslateredstoneoreBlock.java index d28c9f32a..a22ba4296 100644 --- a/src/main/java/net/mcreator/customoregen/block/DeepslateredstoneoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/DeepslateredstoneoreBlock.java @@ -1,8 +1,6 @@ package net.mcreator.customoregen.block; -import org.checkerframework.checker.units.qual.s; - import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockBehaviour; @@ -13,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class DeepslateredstoneoreBlock extends Block { public DeepslateredstoneoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 10f).lightLevel(s -> 1).requiresCorrectToolForDrops().hasPostProcess((bs, br, bp) -> true).emissiveRendering((bs, br, bp) -> true)); @@ -25,10 +22,4 @@ public class DeepslateredstoneoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock.java b/src/main/java/net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock.java index c18fc1244..91c72371f 100644 --- a/src/main/java/net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock.java @@ -11,8 +11,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - public class DeepslatesharddiamondoreBlock extends Block { public DeepslatesharddiamondoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 14.5f).requiresCorrectToolForDrops()); @@ -23,10 +21,4 @@ public class DeepslatesharddiamondoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } } diff --git a/src/main/java/net/mcreator/customoregen/block/HighemeraldoreBlock.java b/src/main/java/net/mcreator/customoregen/block/HighemeraldoreBlock.java index 7a20589e3..152c742f4 100644 --- a/src/main/java/net/mcreator/customoregen/block/HighemeraldoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/HighemeraldoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class HighemeraldoreBlock extends Block { public HighemeraldoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +22,4 @@ public class HighemeraldoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/IronoreBlock.java b/src/main/java/net/mcreator/customoregen/block/IronoreBlock.java index eaa7f9a1e..61333c23f 100644 --- a/src/main/java/net/mcreator/customoregen/block/IronoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/IronoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class IronoreBlock extends Block { public IronoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(2f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +22,4 @@ public class IronoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/LapisoreBlock.java b/src/main/java/net/mcreator/customoregen/block/LapisoreBlock.java index c4658d787..a703bf831 100644 --- a/src/main/java/net/mcreator/customoregen/block/LapisoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/LapisoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class LapisoreBlock extends Block { public LapisoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +22,4 @@ public class LapisoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/LoweremeraldoreBlock.java b/src/main/java/net/mcreator/customoregen/block/LoweremeraldoreBlock.java index faac392e6..574b0e314 100644 --- a/src/main/java/net/mcreator/customoregen/block/LoweremeraldoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/LoweremeraldoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class LoweremeraldoreBlock extends Block { public LoweremeraldoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(4.5f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +22,4 @@ public class LoweremeraldoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/PuregoldenoreBlock.java b/src/main/java/net/mcreator/customoregen/block/PuregoldenoreBlock.java index 683cbc51e..4f19725fb 100644 --- a/src/main/java/net/mcreator/customoregen/block/PuregoldenoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/PuregoldenoreBlock.java @@ -11,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class PuregoldenoreBlock extends Block { public PuregoldenoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 10f)); @@ -23,10 +22,4 @@ public class PuregoldenoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/RedstoneoreBlock.java b/src/main/java/net/mcreator/customoregen/block/RedstoneoreBlock.java index 9052e89fd..60b92f11a 100644 --- a/src/main/java/net/mcreator/customoregen/block/RedstoneoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/RedstoneoreBlock.java @@ -1,8 +1,6 @@ package net.mcreator.customoregen.block; -import org.checkerframework.checker.units.qual.s; - import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockBehaviour; @@ -13,8 +11,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - +import net.mcreator.customoregen.init.CustomOreGenModBlocks; public class RedstoneoreBlock extends Block { public RedstoneoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 10f).lightLevel(s -> 1).requiresCorrectToolForDrops()); @@ -25,10 +22,4 @@ public class RedstoneoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } -} +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/customoregen/block/SharddiamondblockoreBlock.java b/src/main/java/net/mcreator/customoregen/block/SharddiamondblockoreBlock.java index bb7b4a347..169fdf78c 100644 --- a/src/main/java/net/mcreator/customoregen/block/SharddiamondblockoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/SharddiamondblockoreBlock.java @@ -11,8 +11,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; -import net.mcreator.customoregen.procedures.OreexperienceProcedure; - public class SharddiamondblockoreBlock extends Block { public SharddiamondblockoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(1.3f, 10f).requiresCorrectToolForDrops()); @@ -23,10 +21,4 @@ public class SharddiamondblockoreBlock extends Block { return 15; } - @Override - public boolean onDestroyedByPlayer(BlockState blockstate, Level world, BlockPos pos, Player entity, boolean willHarvest, FluidState fluid) { - boolean retval = super.onDestroyedByPlayer(blockstate, world, pos, entity, willHarvest, fluid); - OreexperienceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ(), entity); - return retval; - } } diff --git a/src/main/java/net/mcreator/customoregen/event/EnchantabilityFix.java b/src/main/java/net/mcreator/customoregen/event/EnchantabilityFix.java index 98a84ebd1..29f3fe9d8 100644 --- a/src/main/java/net/mcreator/customoregen/event/EnchantabilityFix.java +++ b/src/main/java/net/mcreator/customoregen/event/EnchantabilityFix.java @@ -3,17 +3,18 @@ package net.mcreator.customoregen.event; import net.mcreator.customoregen.CustomOreGenMod; import net.mcreator.customoregen.init.CustomOreGenModItems; import net.minecraft.core.component.DataComponents; -import net.minecraft.world.item.enchantment.Enchantable; +// import net.minecraft.world.item.enchantment.Enchantable; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.ModifyDefaultComponentsEvent; -@Mod.EventBusSubscriber(modid = CustomOreGenMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = CustomOreGenMod.MODID, bus = EventBusSubscriber.Bus.MOD) public class EnchantabilityFix { @SubscribeEvent public static void modifyComponents(ModifyDefaultComponentsEvent event) { // Tools - Value 9 + /* event.modify(CustomOreGenModItems.SHARDDIAMONDPICKAXE.get(), builder -> builder.set(DataComponents.ENCHANTABLE, new Enchantable(9))); event.modify(CustomOreGenModItems.SHARDDIAMONDSHOVEL.get(), builder -> builder.set(DataComponents.ENCHANTABLE, new Enchantable(9))); event.modify(CustomOreGenModItems.SHARDDIAMONDAXE.get(), builder -> builder.set(DataComponents.ENCHANTABLE, new Enchantable(9))); @@ -24,5 +25,6 @@ public class EnchantabilityFix { event.modify(CustomOreGenModItems.SHARDDIAMONDCHESTPLATE.get(), builder -> builder.set(DataComponents.ENCHANTABLE, new Enchantable(14))); event.modify(CustomOreGenModItems.SHARDDIAMONDLEGGINGS.get(), builder -> builder.set(DataComponents.ENCHANTABLE, new Enchantable(14))); event.modify(CustomOreGenModItems.SHARDDIAMONDBOOTS.get(), builder -> builder.set(DataComponents.ENCHANTABLE, new Enchantable(14))); + */ } } diff --git a/src/main/java/net/mcreator/customoregen/procedures/OreexperienceProcedure.java b/src/main/java/net/mcreator/customoregen/procedures/OreexperienceProcedure.java index 31dda7f55..e73d4cf35 100644 --- a/src/main/java/net/mcreator/customoregen/procedures/OreexperienceProcedure.java +++ b/src/main/java/net/mcreator/customoregen/procedures/OreexperienceProcedure.java @@ -32,7 +32,6 @@ public class OreexperienceProcedure { } if (!hasSilkTouch) { - world.destroyBlock(BlockPos.containing(x, y, z), false); if (world instanceof ServerLevel _level) _level.addFreshEntity(new ExperienceOrb(_level, x, y, z, 2)); } diff --git a/src/main/resources/data/mekanism/recipes/enriching/shard_diamond.json b/src/main/resources/data/mekanism/recipes/enriching/shard_diamond.json deleted file mode 100644 index e6e9e33ad..000000000 --- a/src/main/resources/data/mekanism/recipes/enriching/shard_diamond.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "mekanism:enriching", - "input": { - "ingredient": { - "tag": "forge:ores/shard_diamond" - } - }, - "output": { - "item": "custom_ore_gen:diamondshard", - "count": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 87731c929..7ce28d3d1 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 15, + "pack_format": 48, "description": "Changement de la distribution des ressources sur Minecraft, ne pas utilisé seul sans KubeJS" } } \ No newline at end of file diff --git a/src/test/java/net/mcreator/customoregen/OresCommandTest.java b/src/test/java/net/mcreator/customoregen/OresCommandTest.java index 63842c562..ea24502e8 100644 --- a/src/test/java/net/mcreator/customoregen/OresCommandTest.java +++ b/src/test/java/net/mcreator/customoregen/OresCommandTest.java @@ -161,7 +161,7 @@ class OresCommandTest { @Test void testEventBusSubscriberAnnotation_IsPresent() { // Verify the class has the proper event bus subscriber annotation - assertNotNull(OresCommand.class.getAnnotation(net.minecraftforge.fml.common.Mod.EventBusSubscriber.class)); + assertNotNull(OresCommand.class.getAnnotation(net.neoforged.fml.common.EventBusSubscriber.class)); } @Test diff --git a/src/test/java/net/mcreator/customoregen/config/ModConfigsTest.java b/src/test/java/net/mcreator/customoregen/config/ModConfigsTest.java index 9c1aceacc..2ff94deaa 100644 --- a/src/test/java/net/mcreator/customoregen/config/ModConfigsTest.java +++ b/src/test/java/net/mcreator/customoregen/config/ModConfigsTest.java @@ -1,6 +1,6 @@ package net.mcreator.customoregen.config; -import net.minecraftforge.common.ForgeConfigSpec; +import net.neoforged.neoforge.common.ModConfigSpec; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.DisplayName; @@ -177,16 +177,16 @@ class ModConfigsTest { ModConfigs.FeatureToggleConfig features = ModConfigs.FEATURES; // Verify integer config values - assertTrue(oreGen.shardDiamondOreMinHeight instanceof ForgeConfigSpec.ConfigValue); - assertTrue(toolStats.shardDiamondPickaxeDurability instanceof ForgeConfigSpec.ConfigValue); - assertTrue(drops.shardDiamondOreMinDrops instanceof ForgeConfigSpec.ConfigValue); + assertTrue(oreGen.shardDiamondOreMinHeight instanceof ModConfigSpec.ConfigValue); + assertTrue(toolStats.shardDiamondPickaxeDurability instanceof ModConfigSpec.ConfigValue); + assertTrue(drops.shardDiamondOreMinDrops instanceof ModConfigSpec.ConfigValue); // Verify double config values - assertTrue(toolStats.shardDiamondPickaxeSpeed instanceof ForgeConfigSpec.DoubleValue); + assertTrue(toolStats.shardDiamondPickaxeSpeed instanceof ModConfigSpec.DoubleValue); // Verify boolean config values - assertTrue(drops.shardDiamondOreEnableFortune instanceof ForgeConfigSpec.ConfigValue); - assertTrue(features.enableShardDiamondTools instanceof ForgeConfigSpec.ConfigValue); + assertTrue(drops.shardDiamondOreEnableFortune instanceof ModConfigSpec.ConfigValue); + assertTrue(features.enableShardDiamondTools instanceof ModConfigSpec.ConfigValue); } @Test