diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-04-22 15:47:18 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-04-22 15:47:18 +0800 |
| commit | ca88276257bfccf055d03dcfce8df6b43ca40bf9 (patch) | |
| tree | 7ee656ab7a3a94a2cc15af07f56bd970300de586 /forge | |
| parent | e3ab358e5fe608414629f4e214b1ec8f856dbe2d (diff) | |
| parent | 8eb903cc67d5e6813570ddd1d74bcfd3a3ffba45 (diff) | |
| download | RoughlyEnoughItems-ca88276257bfccf055d03dcfce8df6b43ca40bf9.tar.gz RoughlyEnoughItems-ca88276257bfccf055d03dcfce8df6b43ca40bf9.tar.bz2 RoughlyEnoughItems-ca88276257bfccf055d03dcfce8df6b43ca40bf9.zip | |
Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19
Diffstat (limited to 'forge')
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java | 6 | ||||
| -rw-r--r-- | forge/src/main/resources/META-INF/accesstransformer.cfg | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java b/forge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java index a4db8f406..e2ee44500 100644 --- a/forge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java @@ -28,7 +28,9 @@ import dev.architectury.event.CompoundEventResult; import dev.architectury.hooks.fluid.forge.FluidStackHooksForge; import me.shedaniel.rei.api.common.fluid.FluidSupportProvider; import me.shedaniel.rei.api.common.util.EntryStacks; +import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.material.Fluid; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; @@ -55,4 +57,8 @@ public class DefaultPluginImpl { return CompoundEventResult.pass(); }); } + + public static Fluid getFluidFromBucket(BucketItem item) { + return item.getFluid(); + } } diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg index d468de9f2..f43fc89ba 100644 --- a/forge/src/main/resources/META-INF/accesstransformer.cfg +++ b/forge/src/main/resources/META-INF/accesstransformer.cfg @@ -20,7 +20,6 @@ public net.minecraft.world.item.alchemy.PotionBrewing f_43494_ public net.minecraft.world.item.alchemy.PotionBrewing$Mix f_43532_ public net.minecraft.world.item.alchemy.PotionBrewing$Mix f_43533_ public net.minecraft.world.item.alchemy.PotionBrewing$Mix f_43534_ -public net.minecraft.world.item.BucketItem f_40687_ public net.minecraft.world.item.crafting.UpgradeRecipe f_44519_ public net.minecraft.world.item.crafting.UpgradeRecipe f_44518_ public net.minecraft.world.item.CreativeModeTab f_40763_ |