mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-27 23:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Less drains More II

Browse source 
- Fixed Potion buckets from Tinkers Construct not interacting correctly with drains and spouts #6316 #4124 #6415
This commit is contained in:
simibubi 2024-07-17 12:46:20 +02:00
parent ffa26fc0e4
commit f964e892de
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -200,8 +200,8 @@ dependencies {
// implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-1.16.5:0.10.0-Beta25") // implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-1.16.5:0.10.0-Beta25")
// runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69") // runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69")
// runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984") // runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984")
// runtimeOnly fg.deobf("slimeknights.mantle:Mantle:1.16.5-1.6.115") // runtimeOnly fg.deobf("curse.maven:mantle-74924:4509007")
// runtimeOnly fg.deobf("slimeknights.tconstruct:TConstruct:1.16.5-3.1.1.252") // runtimeOnly fg.deobf("curse.maven:tinkers-construct-74072:4509008")
// runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3") // runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3")
// implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false } // implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false }
// runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge") // runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge")

2
src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
View file

@ -42,7 +42,7 @@ public class ItemDrainCategory extends CreateRecipeCategory<EmptyingRecipe> {
public static void consumeRecipes(Consumer<EmptyingRecipe> consumer, IIngredientManager ingredientManager) { public static void consumeRecipes(Consumer<EmptyingRecipe> consumer, IIngredientManager ingredientManager) {
for (ItemStack stack : ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK)) { for (ItemStack stack : ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK)) {
if (stack.getItem() instanceof PotionItem) { if (PotionFluidHandler.isPotionItem(stack)) {
FluidStack fluidFromPotionItem = PotionFluidHandler.getFluidFromPotionItem(stack); FluidStack fluidFromPotionItem = PotionFluidHandler.getFluidFromPotionItem(stack);
Ingredient potion = Ingredient.of(stack); Ingredient potion = Ingredient.of(stack);
consumer.accept(new ProcessingRecipeBuilder<>(EmptyingRecipe::new, Create.asResource("potions")) consumer.accept(new ProcessingRecipeBuilder<>(EmptyingRecipe::new, Create.asResource("potions"))

2
src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
View file

@ -46,7 +46,7 @@ public class SpoutCategory extends CreateRecipeCategory<FillingRecipe> {
public static void consumeRecipes(Consumer<FillingRecipe> consumer, IIngredientManager ingredientManager) { public static void consumeRecipes(Consumer<FillingRecipe> consumer, IIngredientManager ingredientManager) {
Collection<FluidStack> fluidStacks = ingredientManager.getAllIngredients(ForgeTypes.FLUID_STACK); Collection<FluidStack> fluidStacks = ingredientManager.getAllIngredients(ForgeTypes.FLUID_STACK);
for (ItemStack stack : ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK)) { for (ItemStack stack : ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK)) {
if (stack.getItem() instanceof PotionItem) { if (PotionFluidHandler.isPotionItem(stack)) {
FluidStack fluidFromPotionItem = PotionFluidHandler.getFluidFromPotionItem(stack); FluidStack fluidFromPotionItem = PotionFluidHandler.getFluidFromPotionItem(stack);
Ingredient bottle = Ingredient.of(Items.GLASS_BOTTLE); Ingredient bottle = Ingredient.of(Items.GLASS_BOTTLE);
consumer.accept(new ProcessingRecipeBuilder<>(FillingRecipe::new, Create.asResource("potions")) consumer.accept(new ProcessingRecipeBuilder<>(FillingRecipe::new, Create.asResource("potions"))

7
src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java
View file

@ -22,9 +22,11 @@ import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffectUtil; import net.minecraft.world.effect.MobEffectUtil;
import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.item.PotionItem;
import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.Potion;
import net.minecraft.world.item.alchemy.PotionUtils; import net.minecraft.world.item.alchemy.PotionUtils;
import net.minecraft.world.item.alchemy.Potions; import net.minecraft.world.item.alchemy.Potions;
@ -36,6 +38,11 @@ import net.minecraftforge.fluids.FluidStack;
public class PotionFluidHandler { public class PotionFluidHandler {
public static boolean isPotionItem(ItemStack stack) {
return stack.getItem() instanceof PotionItem && !(stack.getContainerItem()
.getItem() instanceof BucketItem);
}
public static Pair<FluidStack, ItemStack> emptyPotion(ItemStack stack, boolean simulate) { public static Pair<FluidStack, ItemStack> emptyPotion(ItemStack stack, boolean simulate) {
FluidStack fluid = getFluidFromPotionItem(stack); FluidStack fluid = getFluidFromPotionItem(stack);
if (!simulate) if (!simulate)

4
src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemEmptying.java
View file

@ -24,7 +24,7 @@ public class GenericItemEmptying {
private static final RecipeWrapper WRAPPER = new RecipeWrapper(new ItemStackHandler(1)); private static final RecipeWrapper WRAPPER = new RecipeWrapper(new ItemStackHandler(1));
public static boolean canItemBeEmptied(Level world, ItemStack stack) { public static boolean canItemBeEmptied(Level world, ItemStack stack) {
if (stack.getItem() instanceof PotionItem) if (PotionFluidHandler.isPotionItem(stack))
return true; return true;
WRAPPER.setItem(0, stack); WRAPPER.setItem(0, stack);
@ -49,7 +49,7 @@ public class GenericItemEmptying {
FluidStack resultingFluid = FluidStack.EMPTY; FluidStack resultingFluid = FluidStack.EMPTY;
ItemStack resultingItem = ItemStack.EMPTY; ItemStack resultingItem = ItemStack.EMPTY;
if (stack.getItem() instanceof PotionItem) if (PotionFluidHandler.isPotionItem(stack))
return PotionFluidHandler.emptyPotion(stack, simulate); return PotionFluidHandler.emptyPotion(stack, simulate);
WRAPPER.setItem(0, stack); WRAPPER.setItem(0, stack);