move to silk fluids
This commit is contained in:
parent
85554bcfe2
commit
9b46e3237e
18 changed files with 52 additions and 50 deletions
|
@ -26,6 +26,7 @@ package techreborn.init;
|
|||
|
||||
import net.fabricmc.fabric.api.block.FabricBlockSettings;
|
||||
import net.minecraft.block.Material;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
@ -93,9 +94,8 @@ public enum ModFluids {
|
|||
Registry.register(Registry.ITEM, identifier, bucket);
|
||||
}
|
||||
|
||||
@Deprecated //TODO this is bad!
|
||||
public Fluid getFluid() {
|
||||
return new Fluid();
|
||||
return stillFluid;
|
||||
}
|
||||
|
||||
public RebornFluidBlock getBlock() {
|
||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.common.crafting.RebornRecipe;
|
|||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import reborncore.common.crafting.RecipeManager;
|
||||
import reborncore.common.registration.RebornRegister;
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import reborncore.common.fluid.FluidStack;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import io.github.prospector.silk.fluid.FluidInstance;
|
||||
import reborncore.common.fluid.FluidUtil;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.api.recipe.recipes.BlastFurnaceRecipe;
|
||||
|
@ -369,7 +369,7 @@ public class ModRecipes {
|
|||
|
||||
|
||||
public static ItemStack getBucketWithFluid(Fluid fluid) {
|
||||
return FluidUtil.getFilledBucket(new FluidStack(fluid, 1000));
|
||||
return FluidUtil.getFilledBucket(new FluidInstance(fluid, 1000));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
package techreborn.init.recipes;
|
||||
|
||||
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import techreborn.api.generator.EFluidGenerator;
|
||||
import techreborn.api.generator.GeneratorRecipeHelper;
|
||||
import techreborn.init.ModFluids;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue