Update neoforge

Mechalopa · May 26, 2024 · e1bf6f1 · e1bf6f1
1 parent 07f0510
commit e1bf6f1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.109'
+    id 'net.neoforged.gradle.userdev' version '7.0.133'
 }
 
 version = mod_version

diff --git a/gradle.properties b/gradle.properties
@@ -4,11 +4,11 @@ org.gradle.daemon=false
 org.gradle.debug=false
 #read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-neogradle.subsystems.parchment.minecraftVersion=1.20.4
-neogradle.subsystems.parchment.mappingsVersion=2024.04.14
+neogradle.subsystems.parchment.minecraftVersion=1.20.6
+neogradle.subsystems.parchment.mappingsVersion=2024.05.01
 minecraft_version=1.20.6
 minecraft_version_range=[1.20.6]
-neo_version=20.6.26-beta
+neo_version=20.6.80-beta
 neo_version_range=[20.6,)
 loader_version_range=[2,)
 jei_version=17.3.0.51

diff --git a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java
@@ -13,13 +13,13 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.npc.VillagerTrades.ItemListing;
+import net.minecraft.world.item.BoneMealItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.DoublePlantBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
-import net.neoforged.bus.api.Event.Result;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.common.BasicItemListing;
@@ -34,19 +34,29 @@ public class ModEvents
 	@SubscribeEvent
 	public static void onBonemeal(BonemealEvent event)
 	{
-		if (!event.isCanceled() && !event.getLevel().isClientSide() && event.getLevel() instanceof ServerLevel && event.getBlock() != null)
+		if (!event.isCanceled() && !event.getLevel().isClientSide() && event.getLevel() instanceof ServerLevel && event.getState() != null)
 		{
 			ServerLevel serverLevel = (ServerLevel)event.getLevel();
 			BlockPos pos = event.getPos();
 			RandomSource r = serverLevel.getRandom();
 
-			if (event.getBlock().is(ModTags.BlockTags.CONVERTABLE_TO_FASCIATED_DANDELION) && fasciate(serverLevel, pos, ModBlocks.FASCIATED_DANDELION.get().defaultBlockState(), r, ModConfigs.cachedServer.DANDELION_FASCIATION_CHANCE))
+			if (event.getState().is(ModTags.BlockTags.CONVERTABLE_TO_FASCIATED_DANDELION) && fasciate(serverLevel, pos, ModBlocks.FASCIATED_DANDELION.get().defaultBlockState(), r, ModConfigs.cachedServer.DANDELION_FASCIATION_CHANCE))
 			{
-				event.setResult(Result.ALLOW);
+				event.setSuccessful(true);
+
+				if (event.getStack() != null && !event.getStack().isEmpty() && event.getStack().getItem() != null && event.getStack().getItem() instanceof BoneMealItem)
+				{
+					event.getStack().shrink(1);
+				}
 			}
-			else if (event.getBlock().is(ModTags.BlockTags.CONVERTABLE_TO_FASCIATED_OXEYE_DAISY) && fasciate(serverLevel, pos, ModBlocks.FASCIATED_OXEYE_DAISY.get().defaultBlockState(), r, ModConfigs.cachedServer.OXEYE_DAISY_FASCIATION_CHANCE))
+			else if (event.getState().is(ModTags.BlockTags.CONVERTABLE_TO_FASCIATED_OXEYE_DAISY) && fasciate(serverLevel, pos, ModBlocks.FASCIATED_OXEYE_DAISY.get().defaultBlockState(), r, ModConfigs.cachedServer.OXEYE_DAISY_FASCIATION_CHANCE))
 			{
-				event.setResult(Result.ALLOW);
+				event.setSuccessful(true);
+
+				if (event.getStack() != null && !event.getStack().isEmpty() && event.getStack().getItem() != null && event.getStack().getItem() instanceof BoneMealItem)
+				{
+					event.getStack().shrink(1);
+				}
 			}
 		}
 	}
@@ -82,7 +92,7 @@ private static boolean fasciate(ServerLevel serverLevel, BlockPos blockpos, Bloc
 	@SubscribeEvent
 	public static void onBlockExplode(ExplosionEvent.Detonate event)
 	{
-		if (!event.getLevel().isClientSide() && event.getExplosion().getDirectSourceEntity() != null && event.getExplosion().getDirectSourceEntity().getType().is(ModTags.EntityTypeTags.CAN_CONVERT_TO_CREEPANSY) && !event.getAffectedBlocks().isEmpty() && EventHooks.getMobGriefingEvent(event.getLevel(), event.getExplosion().getDirectSourceEntity()))
+		if (!event.getLevel().isClientSide() && event.getExplosion().getDirectSourceEntity() != null && event.getExplosion().getDirectSourceEntity().getType().is(ModTags.EntityTypeTags.CAN_CONVERT_TO_CREEPANSY) && !event.getAffectedBlocks().isEmpty() && EventHooks.canEntityGrief(event.getLevel(), event.getExplosion().getDirectSourceEntity()))
 		{
 			Level level = event.getLevel();