diff --git a/patches/minecraft/net/minecraft/world/level/block/FlowerBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/FlowerBlock.java.patch new file mode 100644 index 0000000000..adbf2207cc --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/FlowerBlock.java.patch @@ -0,0 +1,41 @@ +--- a/net/minecraft/world/level/block/FlowerBlock.java ++++ b/net/minecraft/world/level/block/FlowerBlock.java +@@ -15,6 +_,17 @@ + private final MobEffect f_53508_; + private final int f_53509_; + ++ private final java.util.function.Supplier suspiciousStewEffectSupplier; ++ ++ public FlowerBlock(java.util.function.Supplier effectSupplier, int p_53513_, BlockBehaviour.Properties p_53514_) { ++ super(p_53514_); ++ this.f_53508_ = null; ++ this.suspiciousStewEffectSupplier = effectSupplier; ++ this.f_53509_ = p_53513_; ++ } ++ ++ /** @deprecated FORGE: Use supplier version instead */ ++ @Deprecated + public FlowerBlock(MobEffect p_53512_, int p_53513_, BlockBehaviour.Properties p_53514_) { + super(p_53514_); + this.f_53508_ = p_53512_; +@@ -23,6 +_,7 @@ + } else { + this.f_53509_ = p_53513_ * 20; + } ++ this.suspiciousStewEffectSupplier = net.minecraftforge.registries.ForgeRegistries.MOB_EFFECTS.getDelegateOrThrow(p_53512_); + + } + +@@ -32,10 +_,12 @@ + } + + public MobEffect m_53521_() { ++ if (true) return this.suspiciousStewEffectSupplier.get(); + return this.f_53508_; + } + + public int m_53522_() { ++ if (this.f_53508_ == null && !this.suspiciousStewEffectSupplier.get().m_8093_()) return this.f_53509_ * 20; + return this.f_53509_; + } + } diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index 26f6ccc3bc..a580f8a6b4 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -79,9 +79,10 @@ net/minecraft/world/level/Level.markAndNotifyBlock(Lnet/minecraft/core/BlockPos; net/minecraft/world/level/LevelSettings.(Ljava/lang/String;Lnet/minecraft/world/level/GameType;ZLnet/minecraft/world/Difficulty;ZLnet/minecraft/world/level/GameRules;Lnet/minecraft/world/level/DataPackConfig;Lcom/mojang/serialization/Lifecycle;)V=|p_46910_,p_46911_,p_46912_,p_46913_,p_46914_,p_46915_,p_46916_,lifecycle net/minecraft/world/level/block/ConcretePowderBlock.touchesLiquid(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z=|p_52065_,p_52066_,state net/minecraft/world/level/block/FireBlock.tryCatchFire(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ILnet/minecraft/util/RandomSource;ILnet/minecraft/core/Direction;)V=|p_53432_,p_53433_,p_53434_,p_53435_,p_53436_,face +net/minecraft/world/level/block/FlowerBlock.(Ljava/util/function/Supplier;ILnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V=|effectSupplier,p_53513_,p_53514_ net/minecraft/world/level/block/FlowerPotBlock.(Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V=|emptyPot,p_53528_,properties net/minecraft/world/level/block/LiquidBlock.(Ljava/util/function/Supplier;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V=|p_54694_,p_54695_ net/minecraft/world/level/block/PoweredRailBlock.(Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Z)V=|p_55218_,isPoweredRail net/minecraft/world/level/entity/PersistentEntitySectionManager.addEntityWithoutEvent(Lnet/minecraft/world/level/entity/EntityAccess;Z)Z=|p_157539_,p_157540_ net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.processEntityInfos(Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings;Ljava/util/List;)Ljava/util/List;=|template,p_215387_0_,p_215387_1_,p_215387_2_,p_215387_3_ -net/minecraft/world/level/storage/loot/LootPool.([Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer;[Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition;[Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction;Lnet/minecraft/world/level/storage/loot/providers/number/NumberProvider;Lnet/minecraft/world/level/storage/loot/providers/number/NumberProvider;Ljava/lang/String;)V=|p_165128_,p_165129_,p_165130_,p_165131_,p_165132_,name \ No newline at end of file +net/minecraft/world/level/storage/loot/LootPool.([Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer;[Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition;[Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction;Lnet/minecraft/world/level/storage/loot/providers/number/NumberProvider;Lnet/minecraft/world/level/storage/loot/providers/number/NumberProvider;Ljava/lang/String;)V=|p_165128_,p_165129_,p_165130_,p_165131_,p_165132_,name