mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Patch the Patch

Browse source 
- Bugfixes to recently added/changed functionality
This commit is contained in:
simibubi 2022-03-12 22:27:33 +01:00
parent 0b17aab01e
commit 939b276c56
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,13 +51,13 @@ public class ItemDrainCategory extends CreateRecipeCategory<EmptyingRecipe> {
.withFluidOutputs(fluidFromPotionItem) .withFluidOutputs(fluidFromPotionItem)
.withSingleItemOutput(new ItemStack(Items.GLASS_BOTTLE)) .withSingleItemOutput(new ItemStack(Items.GLASS_BOTTLE))
.build()); .build());
return; continue;
} }
LazyOptional<IFluidHandlerItem> capability = LazyOptional<IFluidHandlerItem> capability =
stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY); stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY);
if (!capability.isPresent()) if (!capability.isPresent())
return; continue;
ItemStack copy = stack.copy(); ItemStack copy = stack.copy();
capability = copy.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY); capability = copy.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY);
@ -65,9 +65,9 @@ public class ItemDrainCategory extends CreateRecipeCategory<EmptyingRecipe> {
FluidStack extracted = handler.drain(1000, FluidAction.EXECUTE); FluidStack extracted = handler.drain(1000, FluidAction.EXECUTE);
ItemStack result = handler.getContainer(); ItemStack result = handler.getContainer();
if (extracted.isEmpty()) if (extracted.isEmpty())
return; continue;
if (result.isEmpty()) if (result.isEmpty())
return; continue;
Ingredient ingredient = Ingredient.of(stack); Ingredient ingredient = Ingredient.of(stack);
ResourceLocation itemName = stack.getItem() ResourceLocation itemName = stack.getItem()

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

@ -56,13 +56,13 @@ public class SpoutCategory extends CreateRecipeCategory<FillingRecipe> {
.withFluidIngredients(FluidIngredient.fromFluidStack(fluidFromPotionItem)) .withFluidIngredients(FluidIngredient.fromFluidStack(fluidFromPotionItem))
.withSingleItemOutput(stack) .withSingleItemOutput(stack)
.build()); .build());
return; continue;
} }
LazyOptional<IFluidHandlerItem> capability = LazyOptional<IFluidHandlerItem> capability =
stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY); stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY);
if (!capability.isPresent()) if (!capability.isPresent())
return; continue;
for (FluidStack fluidStack : fluidStacks) { for (FluidStack fluidStack : fluidStacks) {
ItemStack copy = stack.copy(); ItemStack copy = stack.copy();

7
src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java
View file

@ -179,11 +179,8 @@ public class OpenEndedPipe extends FlowSource {
return false; return false;
if (fluid.isEmpty()) if (fluid.isEmpty())
return false; return false;
if (!FluidHelper.hasBlockState(fluid.getFluid())) { if (!FluidHelper.hasBlockState(fluid.getFluid()))
if (!simulate)
applyEffects(fluid);
return true; return true;
}
if (!fluidState.isEmpty() && fluidState.getType() != fluid.getFluid()) { if (!fluidState.isEmpty() && fluidState.getType() != fluid.getFluid()) {
FluidReactions.handlePipeSpillCollision(world, outputPos, fluid.getFluid(), fluidState); FluidReactions.handlePipeSpillCollision(world, outputPos, fluid.getFluid(), fluidState);
@ -272,6 +269,8 @@ public class OpenEndedPipe extends FlowSource {
int fill = super.fill(resource, action); int fill = super.fill(resource, action);
if (action.simulate()) if (action.simulate())
return fill; return fill;
if (!resource.isEmpty())
applyEffects(resource);
if (getFluidAmount() == 1000 || !FluidHelper.hasBlockState(containedFluidStack.getFluid())) if (getFluidAmount() == 1000 || !FluidHelper.hasBlockState(containedFluidStack.getFluid()))
if (provideFluidToSpace(containedFluidStack, false)) if (provideFluidToSpace(containedFluidStack, false))
setFluid(FluidStack.EMPTY); setFluid(FluidStack.EMPTY);