it compiles :D

This commit is contained in:
modmuss50 2019-06-12 19:29:04 +01:00
parent 500ff29dbd
commit 6b9f6cb4f8
142 changed files with 755 additions and 1724 deletions

View file

@ -26,6 +26,7 @@ package techreborn.api;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import java.util.List;
public interface IC2Helper {

View file

@ -25,7 +25,6 @@
package techreborn.api.fluidreplicator;
import net.minecraft.util.math.BlockPos;
import reborncore.fluid.Fluid;
import techreborn.init.TRContent;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;

View file

@ -26,11 +26,11 @@ package techreborn.api.fluidreplicator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.item.ItemStack;
import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.util.Inventory;
import reborncore.common.util.Tank;
import reborncore.fluid.Fluid;
import reborncore.fluid.FluidStack;
import techreborn.init.ModRecipes;
import techreborn.init.TRContent;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
@ -75,7 +75,7 @@ public class FluidReplicatorRecipeCrafter extends RecipeCrafter {
}
private boolean canFit(Fluid fluid, Tank tank) {
if (tank.fill(new FluidStack(fluid, Fluid.BUCKET_VOLUME), false) != Fluid.BUCKET_VOLUME) {
if (tank.fill(new FluidStack(fluid, 1000), false) != 1000) {
return false;
}
return true;
@ -118,7 +118,7 @@ public class FluidReplicatorRecipeCrafter extends RecipeCrafter {
// Checks to see if it can fit the output
// And fill tank with replicated fluid
if (canFit(currentRecipe.getFluid(), tileFluidReplicator.tank) && currentRecipe.onCraft(tileFluidReplicator)) {
tileFluidReplicator.tank.fill(new FluidStack(currentRecipe.getFluid(), Fluid.BUCKET_VOLUME), true);
tileFluidReplicator.tank.fill(new FluidStack(currentRecipe.getFluid(), 1000), true);
// This uses all the inputs
useAllInputs();
// Reset

View file

@ -24,9 +24,7 @@
package techreborn.api.fluidreplicator;
import org.apache.commons.lang3.Validate;
import reborncore.common.util.FluidUtils;
import reborncore.fluid.Fluid;
import techreborn.utils.FluidUtils;

View file

@ -25,8 +25,8 @@
package techreborn.api.generator;
import com.google.common.collect.Sets;
import reborncore.fluid.Fluid;
import techreborn.utils.FluidUtils;
import java.util.HashSet;
import java.util.Optional;

View file

@ -24,13 +24,13 @@
package techreborn.api.recipe;
import reborncore.common.crafting.Recipe;
import net.minecraft.block.entity.BlockEntity;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.util.Inventory;
import techreborn.init.ModRecipes;
import java.util.List;
import net.minecraft.block.entity.BlockEntity;
/**
* @author drcrazy
@ -50,7 +50,7 @@ public class ScrapboxRecipeCrafter extends RecipeCrafter {
@Override
public void updateCurrentRecipe(){
List<Recipe> scrapboxRecipeList = ModRecipes.SCRAPBOX.getRecipes(tile.getWorld());
List<RebornRecipe> scrapboxRecipeList = ModRecipes.SCRAPBOX.getRecipes(tile.getWorld());
int random = tile.getWorld().random.nextInt(scrapboxRecipeList.size());
// Sets the current recipe then syncs
setCurrentRecipe(scrapboxRecipeList.get(random));

View file

@ -30,8 +30,6 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.JsonHelper;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.RebornRecipeType;
import reborncore.common.crafting.Recipe;
import reborncore.common.crafting.RecipeType;
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
public class BlastFurnaceRecipe extends RebornRecipe {

View file

@ -26,7 +26,6 @@ package techreborn.api.recipe.recipes;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.Identifier;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.RebornRecipeType;
import reborncore.fluid.FluidStack;

View file

@ -26,7 +26,6 @@ package techreborn.api.recipe.recipes;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.Identifier;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.RebornRecipeType;
import reborncore.fluid.FluidStack;