more misc fluid work, gonna leave most of this untill we have an offical or new api
This commit is contained in:
parent
0742abb840
commit
6a93c3fd46
28 changed files with 147 additions and 404 deletions
|
@ -1,75 +0,0 @@
|
|||
/*
|
||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) 2018 TechReborn
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.api;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface ISubItemRetriever {
|
||||
|
||||
ItemStack getCellByName(String name);
|
||||
|
||||
ItemStack getCellByName(String name, int count);
|
||||
|
||||
ItemStack getDustByName(String name);
|
||||
|
||||
ItemStack getDustByName(String name, int count);
|
||||
|
||||
ItemStack getSmallDustByName(String name);
|
||||
|
||||
ItemStack getSmallDustByName(String name, int count);
|
||||
|
||||
ItemStack getGemByName(String name);
|
||||
|
||||
ItemStack getGemByName(String name, int count);
|
||||
|
||||
ItemStack getIngotByName(String name);
|
||||
|
||||
ItemStack getIngotByName(String name, int count);
|
||||
|
||||
ItemStack getNuggetByName(String name);
|
||||
|
||||
ItemStack getNuggetByName(String name, int count);
|
||||
|
||||
ItemStack getPartByName(String name);
|
||||
|
||||
ItemStack getPartByName(String name, int count);
|
||||
|
||||
ItemStack getPlateByName(String name);
|
||||
|
||||
ItemStack getPlateByName(String name, int count);
|
||||
|
||||
ItemStack getUpgradeByName(String name);
|
||||
|
||||
ItemStack getUpgradeByName(String name, int count);
|
||||
|
||||
ItemStack getOreByName(String name);
|
||||
|
||||
ItemStack getOreByName(String name, int count);
|
||||
|
||||
ItemStack getStorageBlockByName(String name);
|
||||
|
||||
ItemStack getStorageBlockByName(String name, int count);
|
||||
|
||||
}
|
|
@ -35,8 +35,6 @@ public final class TechRebornAPI {
|
|||
*/
|
||||
public static IRecipeCompact recipeCompact;
|
||||
|
||||
public static ISubItemRetriever subItemRetriever;
|
||||
|
||||
public static IC2Helper ic2Helper;
|
||||
|
||||
/**
|
||||
|
|
|
@ -117,7 +117,7 @@ public class FluidReplicatorRecipe implements Cloneable {
|
|||
if (!FluidUtils.fluidEquals(fluid, output)) {
|
||||
return false;
|
||||
}
|
||||
final Fluid tankFluid = blockEntity.tank.getFluidType();
|
||||
final Fluid tankFluid = blockEntity.tank.getFluid();
|
||||
if (tankFluid != null && !FluidUtils.fluidEquals(tankFluid, fluid)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@ public class IndustrialGrinderRecipe extends RebornRecipe {
|
|||
return false;
|
||||
}
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluidInstance();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ public class IndustrialGrinderRecipe extends RebornRecipe {
|
|||
public boolean onCraft(final BlockEntity be) {
|
||||
IndustrialGrinderBlockEntity blockEntity = (IndustrialGrinderBlockEntity) be;
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluidInstance();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@ public class IndustrialSawmillRecipe extends RebornRecipe {
|
|||
return false;
|
||||
}
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluidInstance();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ public class IndustrialSawmillRecipe extends RebornRecipe {
|
|||
public boolean onCraft(BlockEntity be) {
|
||||
IndustrialSawmillBlockEntity blockEntity = (IndustrialSawmillBlockEntity) be;
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluidInstance();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue