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,170 +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.init;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import techreborn.api.ISubItemRetriever;
|
||||
import techreborn.items.ItemCells;
|
||||
/**
|
||||
* Created by Mark on 03/04/2016.
|
||||
*/
|
||||
public class SubItemRetriever implements ISubItemRetriever {
|
||||
@Override
|
||||
public ItemStack getCellByName(String name) {
|
||||
return ItemCells.getCellByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getCellByName(String name, int count) {
|
||||
return ItemCells.getCellByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getDustByName(String name) {
|
||||
// return ItemDusts.getDustByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getDustByName(String name, int count) {
|
||||
// return ItemDusts.getDustByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getSmallDustByName(String name) {
|
||||
// return ItemDustsSmall.getSmallDustByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getSmallDustByName(String name, int count) {
|
||||
// return ItemDustsSmall.getSmallDustByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getGemByName(String name) {
|
||||
// TODO: Fix recipe
|
||||
//return ItemGems.getGemByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getGemByName(String name, int count) {
|
||||
// TODO: Fix recipe
|
||||
//return ItemGems.getGemByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getIngotByName(String name) {
|
||||
//return ItemIngots.getIngotByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getIngotByName(String name, int count) {
|
||||
//return ItemIngots.getIngotByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ItemStack getNuggetByName(String name) {
|
||||
// TODO: fix recipe
|
||||
// return ItemNuggets.getNuggetByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getNuggetByName(String name, int count) {
|
||||
// TODO: fix recipe
|
||||
// return ItemNuggets.getNuggetByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPartByName(String name) {
|
||||
// return ItemParts.getPartByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPartByName(String name, int count) {
|
||||
// return ItemParts.getPartByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPlateByName(String name) {
|
||||
// TODO: fix recipe
|
||||
// return ItemPlates.getPlateByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPlateByName(String name, int count) {
|
||||
// TODO: fix recipe
|
||||
// return ItemPlates.getPlateByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name) {
|
||||
// return ItemUpgrades.getUpgradeByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name, int count) {
|
||||
// return ItemUpgrades.getUpgradeByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getOreByName(String name) {
|
||||
// return BlockOre.getOreByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getOreByName(String name, int count) {
|
||||
// return BlockOre.getOreByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStorageBlockByName(String name) {
|
||||
// return BlockStorage.getStorageBlockByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStorageBlockByName(String name, int count) {
|
||||
// return BlockStorage.getStorageBlockByName(name, count);
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -25,8 +25,9 @@
|
|||
package techreborn.init.recipes;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import techreborn.init.ModFluids;
|
||||
import techreborn.items.ItemDynamicCell;
|
||||
import techreborn.items.ItemCells;
|
||||
|
||||
|
||||
import java.security.InvalidParameterException;
|
||||
|
||||
|
@ -37,7 +38,7 @@ import java.security.InvalidParameterException;
|
|||
public class DistillationTowerRecipes extends RecipeMethods {
|
||||
|
||||
public static void init() {
|
||||
register(ItemCells.getCellByName("oil", 16), 1400, 13, getMaterial("diesel", 16, Type.CELL), getMaterial("sulfuricAcid", 16, Type.CELL), getMaterial("glyceryl", Type.CELL));
|
||||
register(ItemDynamicCell.getCellWithFluid(ModFluids.OIL.getFluid(), 16), 1400, 13, getMaterial("diesel", 16, Type.CELL), getMaterial("sulfuricAcid", 16, Type.CELL), getMaterial("glyceryl", Type.CELL));
|
||||
}
|
||||
|
||||
static void register(ItemStack input, int ticks, int euPerTick, boolean oreDict, ItemStack... outputs) {
|
||||
|
|
|
@ -24,23 +24,18 @@
|
|||
|
||||
package techreborn.init.recipes;
|
||||
|
||||
import techreborn.api.reactor.FusionReactorRecipe;
|
||||
import techreborn.api.reactor.FusionReactorRecipeHelper;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.items.ItemCells;
|
||||
|
||||
/**
|
||||
* @author drcrazy
|
||||
*
|
||||
*/
|
||||
public class FusionReactorRecipes extends RecipeMethods {
|
||||
public static void init() {
|
||||
FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("helium3"),
|
||||
ItemCells.getCellByName("deuterium"), ItemCells.getCellByName("heliumplasma"), 40000000, 32768, 1024));
|
||||
FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("tritium"),
|
||||
ItemCells.getCellByName("deuterium"), ItemCells.getCellByName("helium3"), 60000000, 16384, 2048));
|
||||
FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("wolframium"),
|
||||
ItemCells.getCellByName("Berylium"), TRContent.Dusts.PLATINUM.getStack(), 80000000, -2048, 1024));
|
||||
// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("helium3"),
|
||||
// ItemCells.getCellByName("deuterium"), ItemCells.getCellByName("heliumplasma"), 40000000, 32768, 1024));
|
||||
// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("tritium"),
|
||||
// ItemCells.getCellByName("deuterium"), ItemCells.getCellByName("helium3"), 60000000, 16384, 2048));
|
||||
// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("wolframium"),
|
||||
// ItemCells.getCellByName("Berylium"), TRContent.Dusts.PLATINUM.getStack(), 80000000, -2048, 1024));
|
||||
// TODO: Fix recipe
|
||||
// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("wolframium"),
|
||||
// ItemCells.getCellByName("lithium"), BlockOre.getOreByName("iridium"), 90000000, -2048, 1024));
|
||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.item.Item;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.recipe.Ingredient;
|
||||
import reborncore.common.util.StringUtils;
|
||||
import techreborn.items.ItemCells;
|
||||
|
||||
/**
|
||||
* Created by Prospector
|
||||
|
@ -50,8 +49,8 @@ public abstract class RecipeMethods {
|
|||
// } else if (type == Type.NUGGET) {
|
||||
// return ItemNuggets.getNuggetByName(name, count);
|
||||
// } else
|
||||
if (type == Type.CELL) {
|
||||
return ItemCells.getCellByName(name, count);
|
||||
// if (type == Type.CELL) {
|
||||
// return ItemCells.getCellByName(name, count);
|
||||
// } else if (type == Type.PART) {
|
||||
// return ItemParts.getPartByName(name, count);
|
||||
// } else if (type == Type.CABLE) {
|
||||
|
@ -64,7 +63,7 @@ public abstract class RecipeMethods {
|
|||
// return ItemUpgrades.getUpgradeByName(name, count);
|
||||
// } else if (type == Type.ORE) {
|
||||
// return BlockOre.getOreByName(name, count);
|
||||
}
|
||||
// }
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue