imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Introduce FluidBucketHooks.getFluid (#243)

Browse Source 
* Introduce FluidBucketHooks.getFluid

* Update common/src/main/java/dev/architectury/hooks/fluid/FluidBucketHooks.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
This commit is contained in:
shedaniel
2022-04-19 01:37:13 +08:00
committed by GitHub
parent c4ab233286
commit 85146c5cc0
5 changed files with 131 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/src/main/java/dev/architectury/hooks/fluid/FluidBucketHooks.java Normal file
View File

@@ -0,0 +1,38 @@
/*
* This file is part of architectury.
* Copyright (C) 2020, 2021, 2022 architectury
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package dev.architectury.hooks.fluid;
import dev.architectury.injectables.annotations.ExpectPlatform;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.level.material.Fluid;
public final class FluidBucketHooks {
/**
* Returns the fluid contained in the bucket.
* This requires special handling since forge defers the fiuid.
*
* @param item the bucket item
* @return the fluid contained in the bucket
*/
@ExpectPlatform
public static Fluid getFluid(BucketItem item) {
throw new AssertionError();
}
}

30
fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidBucketHooksImpl.java Normal file
View File

@@ -0,0 +1,30 @@
/*
* This file is part of architectury.
* Copyright (C) 2020, 2021, 2022 architectury
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package dev.architectury.hooks.fluid.fabric;
import dev.architectury.mixin.fabric.BucketItemAccessor;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.level.material.Fluid;
public class FluidBucketHooksImpl {
public static Fluid getFluid(BucketItem item) {
return ((BucketItemAccessor) item).getContent();
}
}

31
fabric/src/main/java/dev/architectury/mixin/fabric/BucketItemAccessor.java Normal file
View File

@@ -0,0 +1,31 @@
/*
* This file is part of architectury.
* Copyright (C) 2020, 2021, 2022 architectury
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package dev.architectury.mixin.fabric;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.level.material.Fluid;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(BucketItem.class)
public interface BucketItemAccessor {
@Accessor("content")
Fluid getContent();
}

5
fabric/src/main/resources/architectury.mixins.json
View File

@@ -5,6 +5,7 @@
"compatibilityLevel": "JAVA_16",
"minVersion": "0.7.11",
"client": [
"client.ClientPlayerAttackInvoker",
"client.MixinAbstractContainerScreen",
"client.MixinClientLevel",
"client.MixinClientPacketListener",
@@ -17,10 +18,10 @@
"client.MixinMouseHandler",
"client.MixinMultiPlayerGameMode",
"client.MixinScreen",
"client.MixinTextureAtlas",
"client.ClientPlayerAttackInvoker"
"client.MixinTextureAtlas"
],
"mixins": [
"BucketItemAccessor",
"ExplosionPreInvoker",
"HorseTameInvoker",
"LivingDeathInvoker",

29
forge/src/main/java/dev/architectury/hooks/fluid/forge/FluidBucketHooksImpl.java Normal file
View File

@@ -0,0 +1,29 @@
/*
* This file is part of architectury.
* Copyright (C) 2020, 2021, 2022 architectury
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package dev.architectury.hooks.fluid.forge;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.level.material.Fluid;
public class FluidBucketHooksImpl {
public static Fluid getFluid(BucketItem item) {
return item.getFluid();
}
}