1.20.6

yurisuika · Oct 16, 2024 · 7b54abe · 7b54abe
1 parent 9da970c
commit 7b54abe
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 24 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 org.gradle.jvmargs = -Xmx3G
 loom.platform = forge
 
-minecraft_version = 1.20.4
-parchment_version = 2024.04.14
+minecraft_version = 1.20.6
+parchment_version = 2024.06.16
 
 mod_id = blossom
 mod_author = yurisuika
 mod_version = 2.0.0
 maven_group = dev.yurisuika.blossom
 archives_base_name = blossom
 
-forge_version = 1.20.4-49.1.12
+forge_version = 1.20.6-50.1.20
diff --git a/src/main/java/dev/yurisuika/blossom/Blossom.java b/src/main/java/dev/yurisuika/blossom/Blossom.java
@@ -16,13 +16,14 @@
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.animal.Bee;
 import net.minecraft.world.item.*;
+import net.minecraft.world.item.component.BlockItemStateProperties;
 import net.minecraft.world.level.FoliageColor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -137,21 +138,19 @@ public static void clientSetup(FMLClientSetupEvent event) {
             ItemBlockRenderTypes.setRenderLayer(Blossom.FRUITING_OAK_LEAVES.get(), RenderType.cutout());
 
             ItemProperties.register(FLOWERING_OAK_LEAVES.get().asItem(), new ResourceLocation("age"), (stack, world, entity, seed) -> {
-                CompoundTag tag = stack.getTagElement("BlockStateTag");
-                try {
-                    if (Objects.nonNull(tag) && Objects.nonNull(tag.get(FloweringLeavesBlock.AGE.getName()))) {
-                        return Integer.parseInt(tag.get(FloweringLeavesBlock.AGE.getName()).getAsString()) / 4.0F;
-                    }
-                } catch (NumberFormatException ignored) {}
+                BlockItemStateProperties blockItemStateProperties = stack.getOrDefault(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY);
+                Integer integer = blockItemStateProperties.get(FloweringLeavesBlock.AGE);
+                if (Objects.nonNull(integer)) {
+                    return integer.intValue() / 4.0F;
+                }
                 return 0.0F;
             });
             ItemProperties.register(FRUITING_OAK_LEAVES.get().asItem(), new ResourceLocation("age"), (stack, world, entity, seed) -> {
-                CompoundTag tag = stack.getTagElement("BlockStateTag");
-                try {
-                    if (Objects.nonNull(tag) && Objects.nonNull(tag.get(FloweringLeavesBlock.AGE.getName()))) {
-                        return Integer.parseInt(tag.get(FloweringLeavesBlock.AGE.getName()).getAsString()) / 8.0F;
-                    }
-                } catch (NumberFormatException ignored) {}
+                BlockItemStateProperties blockItemStateProperties = stack.getOrDefault(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY);
+                Integer integer = blockItemStateProperties.get(FruitingLeavesBlock.AGE);
+                if (Objects.nonNull(integer)) {
+                    return integer.intValue() / 8.0F;
+                }
                 return 0.0F;
             });
         }

diff --git a/src/main/java/dev/yurisuika/blossom/world/level/block/FloweringLeavesBlock.java b/src/main/java/dev/yurisuika/blossom/world/level/block/FloweringLeavesBlock.java
@@ -15,6 +15,7 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -247,12 +248,12 @@ public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos
         applyGrowth(level, pos, state);
     }
 
-    public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
+    public InteractionResult useItemOn(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
         ItemStack itemStack = player.getItemInHand(hand);
         Item item = itemStack.getItem();
         if (item instanceof ShearsItem) {
             level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.CROP_BREAK, SoundSource.NEUTRAL, 1.0F, 1.0F);
-            itemStack.hurtAndBreak(1, player, entity -> entity.broadcastBreakEvent(hand));
+            itemStack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand));
             if (!level.isClientSide()) {
                 player.awardStat(Stats.ITEM_USED.get(item));
             }

diff --git a/src/main/java/dev/yurisuika/blossom/world/level/block/FruitingLeavesBlock.java b/src/main/java/dev/yurisuika/blossom/world/level/block/FruitingLeavesBlock.java
@@ -14,6 +14,7 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -253,14 +254,14 @@ public static void dropFruit(Level level, BlockPos pos, Item item, int bonus) {
         popResource(level, pos, new ItemStack(item, count));
     }
 
-    public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
+    public InteractionResult useItemOn(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
         ItemStack itemStack = player.getItemInHand(hand);
         if (isMaxAge(state)) {
             Item item = itemStack.getItem();
             if (item instanceof ShearsItem) {
                 level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.CROP_BREAK, SoundSource.NEUTRAL, 1.0F, 1.0F);
-                dropFruit(level, pos, shearedItem, (itemStack.isEnchanted() && EnchantmentHelper.getEnchantments(itemStack).containsKey(Enchantments.BLOCK_FORTUNE)) ? EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, itemStack) : 0);
-                itemStack.hurtAndBreak(1, player, entity -> entity.broadcastBreakEvent(hand));
+                dropFruit(level, pos, shearedItem, (itemStack.isEnchanted() && EnchantmentHelper.getEnchantmentsForCrafting(itemStack).entrySet().contains(Enchantments.FORTUNE)) ? EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FORTUNE, itemStack) : 0);
+                itemStack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand));
                 if (!level.isClientSide()) {
                     player.awardStat(Stats.ITEM_USED.get(item));
                 }

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "48,)"
+loaderVersion = "50,)"
 license = "GNU Lesser General Public License v3.0"
 
 [[mods]]
@@ -18,13 +18,13 @@ Apples blossom upon leaves by the pollen from bees!
 [[dependencies.blossom]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.2,1.20.4]"
+versionRange = "[1.20.5,1.20.6]"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.blossom]]
 modId = "forge"
 mandatory = true
-versionRange = "[48,)"
+versionRange = "[50,)"
 ordering = "NONE"
 side = "BOTH"