Merge remote-tracking branch 'origin/1.9' into 1.9

This commit is contained in:
Modmuss50 2016-03-29 11:19:49 +01:00
commit 918f1a0ed5
31 changed files with 781 additions and 479 deletions

View file

@ -7,7 +7,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.tiles.transformers.TileHVTransformer;
@ -16,14 +15,12 @@ import java.util.Random;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class BlockHVTransformer extends BlockLVTransformer
public class BlockHVTransformer extends BlockTransformer
{
public BlockHVTransformer()
{
super();
setUnlocalizedName("techreborn.hvt");
setCreativeTab(TechRebornCreativeTab.instance);
super("hvtransformer");
}
@Override
@ -31,36 +28,6 @@ public class BlockHVTransformer extends BlockLVTransformer
{
return new TileHVTransformer();
}
@Override
public String getFrontOff()
{
return prefix + "hv_transformer_front";
}
@Override
public String getFrontOn()
{
return prefix + "hv_transformer_front";
}
@Override
public String getSide()
{
return prefix + "hv_transformer_side";
}
@Override
public String getTop()
{
return prefix + "hv_transformer_side";
}
@Override
public String getBottom()
{
return prefix + "hv_transformer_side";
}
@Override
public void breakBlock(World world, BlockPos pos, IBlockState state)
{

View file

@ -7,8 +7,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import techreborn.blocks.storage.BlockBatBox;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.transformers.TileLVTransformer;
import java.util.Random;
@ -16,14 +14,12 @@ import java.util.Random;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class BlockLVTransformer extends BlockBatBox
public class BlockLVTransformer extends BlockTransformer
{
public BlockLVTransformer()
{
super();
setUnlocalizedName("techreborn.lvt");
setCreativeTab(TechRebornCreativeTab.instance);
super("lvtransformer");
}
@Override
@ -32,35 +28,6 @@ public class BlockLVTransformer extends BlockBatBox
return new TileLVTransformer();
}
@Override
public String getFrontOff()
{
return prefix + "lv_transformer_front";
}
@Override
public String getFrontOn()
{
return prefix + "lv_transformer_front";
}
@Override
public String getSide()
{
return prefix + "lv_transformer_side";
}
@Override
public String getTop()
{
return prefix + "lv_transformer_side";
}
@Override
public String getBottom()
{
return prefix + "lv_transformer_side";
}
@Override
public void breakBlock(World world, BlockPos pos, IBlockState state)
{

View file

@ -7,7 +7,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.tiles.transformers.TileMVTransformer;
@ -16,14 +15,12 @@ import java.util.Random;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class BlockMVTransformer extends BlockLVTransformer
public class BlockMVTransformer extends BlockTransformer
{
public BlockMVTransformer()
{
super();
setUnlocalizedName("techreborn.mvt");
setCreativeTab(TechRebornCreativeTab.instance);
super("mvtransformer");
}
@Override
@ -31,36 +28,6 @@ public class BlockMVTransformer extends BlockLVTransformer
{
return new TileMVTransformer();
}
@Override
public String getFrontOff()
{
return prefix + "mv_transformer_front";
}
@Override
public String getFrontOn()
{
return prefix + "mv_transformer_front";
}
@Override
public String getSide()
{
return prefix + "mv_transformer_side";
}
@Override
public String getTop()
{
return prefix + "mv_transformer_side";
}
@Override
public String getBottom()
{
return prefix + "mv_transformer_side";
}
@Override
public void breakBlock(World world, BlockPos pos, IBlockState state)
{

View file

@ -0,0 +1,323 @@
package techreborn.blocks.transformers;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDynamicLiquid;
import net.minecraft.block.BlockStaticLiquid;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidBase;
import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.IRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
/**
* Created by Rushmead
*/
public abstract class BlockTransformer extends BaseTileBlock implements IRotationTexture, ITexturedBlock
{
public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL);
protected final String prefix = "techreborn:blocks/machine/storage/";
public String name;
public BlockTransformer(String name)
{
super(Material.rock);
setHardness(2f);
setUnlocalizedName("techreborn." + name.toLowerCase());
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
this.name = name;
}
protected BlockStateContainer createBlockState()
{
FACING = PropertyDirection.create("facing", Facings.ALL);
return new BlockStateContainer(this, FACING);
}
@Override
public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
{
super.onBlockAdded(worldIn, pos, state);
this.setDefaultFacing(worldIn, pos, state);
}
private void setDefaultFacing(World worldIn, BlockPos pos, IBlockState state)
{
if (!worldIn.isRemote)
{
IBlockState sate = worldIn.getBlockState(pos.north());
Block block = sate.getBlock();
IBlockState state1 = worldIn.getBlockState(pos.south());
Block block1 = state1.getBlock();
IBlockState state2 = worldIn.getBlockState(pos.west());
Block block2 = state2.getBlock();
IBlockState state3 = worldIn.getBlockState(pos.east());
Block block3 = state3.getBlock();
EnumFacing enumfacing = (EnumFacing) state.getValue(FACING);
if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1))
{
enumfacing = EnumFacing.SOUTH;
} else if (enumfacing == EnumFacing.SOUTH && block1.isFullBlock(state1) && !block.isFullBlock(state))
{
enumfacing = EnumFacing.NORTH;
} else if (enumfacing == EnumFacing.WEST && block2.isFullBlock(state2) && !block3.isFullBlock(state2))
{
enumfacing = EnumFacing.EAST;
} else if (enumfacing == EnumFacing.EAST && block3.isFullBlock(state3) && !block2.isFullBlock(state2))
{
enumfacing = EnumFacing.WEST;
}
worldIn.setBlockState(pos, state.withProperty(FACING, enumfacing), 2);
}
}
@Override
public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
ItemStack stack)
{
super.onBlockPlacedBy(worldIn, pos, state, placer, stack);
EnumFacing facing = placer.getHorizontalFacing().getOpposite();
if (placer.rotationPitch < -50)
{
facing = EnumFacing.DOWN;
} else if (placer.rotationPitch > 50)
{
facing = EnumFacing.UP;
}
setFacing(facing, worldIn, pos);
}
protected List<ItemStack> dropInventory(IBlockAccess world, BlockPos pos, ItemStack itemToDrop)
{
TileEntity tileEntity = world.getTileEntity(pos);
if (tileEntity == null)
{
System.out.print("Null");
return null;
}
if (!(tileEntity instanceof IInventory))
{
System.out.print("Not INstance");
return null;
}
IInventory inventory = (IInventory) tileEntity;
List<ItemStack> items = new ArrayList<ItemStack>();
for (int i = 0; i < inventory.getSizeInventory(); i++)
{
ItemStack itemStack = inventory.getStackInSlot(i);
if (itemStack == null)
{
continue;
}
if (itemStack != null && itemStack.stackSize > 0)
{
if (itemStack.getItem() instanceof ItemBlock)
{
if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase
|| ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid
|| ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid)
{
continue;
}
}
}
items.add(itemStack.copy());
}
items.add(itemToDrop.copy());
return items;
}
@Override
public int getMetaFromState(IBlockState state)
{
int facingInt = getSideFromEnum(state.getValue(FACING));
return facingInt;
}
@Override
public IBlockState getStateFromMeta(int meta)
{
boolean active = false;
EnumFacing facing = getSideFromint(meta);
return this.getDefaultState().withProperty(FACING, facing);
}
public void setFacing(EnumFacing facing, World world, BlockPos pos)
{
world.setBlockState(pos, world.getBlockState(pos).withProperty(FACING, facing));
}
public EnumFacing getSideFromint(int i)
{
if (i == 0)
{
return EnumFacing.NORTH;
} else if (i == 1)
{
return EnumFacing.SOUTH;
} else if (i == 2)
{
return EnumFacing.EAST;
} else if (i == 3)
{
return EnumFacing.WEST;
} else if (i == 4)
{
return EnumFacing.UP;
} else if (i == 5)
{
return EnumFacing.DOWN;
}
return EnumFacing.NORTH;
}
public int getSideFromEnum(EnumFacing facing)
{
if (facing == EnumFacing.NORTH)
{
return 0;
} else if (facing == EnumFacing.SOUTH)
{
return 1;
} else if (facing == EnumFacing.EAST)
{
return 2;
} else if (facing == EnumFacing.WEST)
{
return 3;
} else if (facing == EnumFacing.UP)
{
return 4;
} else if (facing == EnumFacing.DOWN)
{
return 5;
}
return 0;
}
@Override
public String getFrontOff()
{
return prefix + name.toLowerCase() + "_front";
}
@Override
public String getFrontOn()
{
return prefix + name.toLowerCase() + "_front";
}
@Override
public String getSide()
{
return prefix + name.toLowerCase() + "_side";
}
@Override
public String getTop()
{
return prefix + name.toLowerCase() + "_side";
}
@Override
public String getBottom()
{
return prefix + name.toLowerCase() + "_side";
}
@Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing)
{
if (this instanceof IRotationTexture)
{
IRotationTexture rotationTexture = (IRotationTexture) this;
if (getFacing(blockState) == facing)
{
return rotationTexture.getFrontOff();
}
if (facing == EnumFacing.UP)
{
return rotationTexture.getTop();
}
if (facing == EnumFacing.DOWN)
{
return rotationTexture.getBottom();
}
return rotationTexture.getSide();
}
return "techreborn:blocks/machine/machine_side";
}
public EnumFacing getFacing(IBlockState state)
{
return state.getValue(FACING);
}
@Override
public int amountOfStates()
{
return 6;
}
public enum Facings implements Predicate<EnumFacing>,Iterable<EnumFacing>
{
ALL;
public EnumFacing[] facings()
{
return new EnumFacing[] { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST,
EnumFacing.UP, EnumFacing.DOWN };
}
public EnumFacing random(Random rand)
{
EnumFacing[] aenumfacing = this.facings();
return aenumfacing[rand.nextInt(aenumfacing.length)];
}
public boolean apply(EnumFacing p_apply_1_)
{
return p_apply_1_ != null;
}
public Iterator<EnumFacing> iterator()
{
return Iterators.forArray(this.facings());
}
}
}

View file

@ -3,6 +3,7 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotFurnaceFuel;
import reborncore.client.gui.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileAlloyFurnace;
@ -27,7 +28,7 @@ public class ContainerAlloyFurnace extends RebornContainer
// outputs
this.addSlotToContainer(new SlotOutput(tileAlloyfurnace.inventory, 2, 116, 35));
// Fuel
this.addSlotToContainer(new Slot(tileAlloyfurnace.inventory, 3, 56, 53));
this.addSlotToContainer(new SlotFurnaceFuel(tileAlloyfurnace.inventory, 3, 56, 53));
int i;

View file

@ -6,6 +6,7 @@ import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotFurnaceFuel;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.SlotCharge;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.generator.TileGenerator;
@ -26,9 +27,9 @@ public class ContainerGenerator extends RebornContainer
this.player = player;
// fuel
this.addSlotToContainer(new Slot(tile.inventory, 0, 80, 53));
this.addSlotToContainer(new SlotFurnaceFuel(tile.inventory, 0, 80, 53));
// charge
this.addSlotToContainer(new SlotFurnaceFuel(tile.inventory, 1, 80, 17));
this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 17));
int i;

View file

@ -14,51 +14,11 @@ import reborncore.common.util.BucketHandler;
import techreborn.Core;
import techreborn.blocks.BlockMachineFrame;
import techreborn.events.OreUnifier;
import techreborn.items.ItemCells;
import techreborn.items.ItemCrushedOre;
import techreborn.items.ItemDusts;
import techreborn.items.ItemDustsSmall;
import techreborn.items.ItemEnergyCrystal;
import techreborn.items.ItemGems;
import techreborn.items.ItemIngots;
import techreborn.items.ItemLapotronCrystal;
import techreborn.items.ItemLapotronicOrb;
import techreborn.items.ItemLithiumBattery;
import techreborn.items.ItemMissingRecipe;
import techreborn.items.ItemNuggets;
import techreborn.items.ItemParts;
import techreborn.items.ItemPlates;
import techreborn.items.ItemReBattery;
import techreborn.items.ItemScrapBox;
import techreborn.items.ItemUUmatter;
import techreborn.items.ItemUpgrades;
import techreborn.items.*;
import techreborn.items.armor.ItemLapotronPack;
import techreborn.items.armor.ItemLithiumBatpack;
import techreborn.items.armor.ItemTRArmour;
import techreborn.items.tools.ItemAdvancedChainsaw;
import techreborn.items.tools.ItemAdvancedDrill;
import techreborn.items.tools.ItemCloakingDevice;
import techreborn.items.tools.ItemDebugTool;
import techreborn.items.tools.ItemDiamondChainsaw;
import techreborn.items.tools.ItemDiamondDrill;
import techreborn.items.tools.ItemDiamondJackhammer;
import techreborn.items.tools.ItemFluidbucket;
import techreborn.items.tools.ItemHammer;
import techreborn.items.tools.ItemIronChainsaw;
import techreborn.items.tools.ItemIronDrill;
import techreborn.items.tools.ItemIronJackhammer;
import techreborn.items.tools.ItemNanosaber;
import techreborn.items.tools.ItemOmniTool;
import techreborn.items.tools.ItemRockCutter;
import techreborn.items.tools.ItemSteelJackhammer;
import techreborn.items.tools.ItemTRAxe;
import techreborn.items.tools.ItemTRHoe;
import techreborn.items.tools.ItemTRPickaxe;
import techreborn.items.tools.ItemTRSpade;
import techreborn.items.tools.ItemTRSword;
import techreborn.items.tools.ItemTechManual;
import techreborn.items.tools.ItemTreeTap;
import techreborn.items.tools.ItemWrench;
import techreborn.items.tools.*;
import techreborn.lib.Reference;
public class ModItems
@ -931,6 +891,12 @@ public class ModItems
OreUnifier.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk"));
OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water"));
OreUnifier.registerOre("containerWater", Items.water_bucket);
OreUnifier.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
OreUnifier.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
}
}

View file

@ -2,8 +2,10 @@ package techreborn.init;
import java.security.InvalidParameterException;
import net.minecraft.block.Block;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -12,7 +14,6 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import org.apache.commons.lang3.ArrayUtils;
import reborncore.common.util.CraftingHelper;
import reborncore.common.util.OreUtil;
import techreborn.Core;
@ -23,12 +24,34 @@ import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.api.recipe.RecipeHandler;
import techreborn.api.recipe.RecyclerRecipe;
import techreborn.api.recipe.ScrapboxRecipe;
import techreborn.api.recipe.machines.*;
import techreborn.blocks.*;
import techreborn.api.recipe.machines.AlloySmelterRecipe;
import techreborn.api.recipe.machines.BlastFurnaceRecipe;
import techreborn.api.recipe.machines.CentrifugeRecipe;
import techreborn.api.recipe.machines.ChemicalReactorRecipe;
import techreborn.api.recipe.machines.CompressorRecipe;
import techreborn.api.recipe.machines.ExtractorRecipe;
import techreborn.api.recipe.machines.GrinderRecipe;
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe;
import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.api.recipe.machines.PlateCuttingMachineRecipe;
import techreborn.api.recipe.machines.VacuumFreezerRecipe;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockOre2;
import techreborn.blocks.BlockStorage;
import techreborn.blocks.BlockStorage2;
import techreborn.config.ConfigTechReborn;
import techreborn.items.*;
import techreborn.parts.CableMultipart;
import techreborn.parts.ItemCables;
import techreborn.items.ItemCells;
import techreborn.items.ItemDusts;
import techreborn.items.ItemDustsSmall;
import techreborn.items.ItemGems;
import techreborn.items.ItemIngots;
import techreborn.items.ItemNuggets;
import techreborn.items.ItemParts;
import techreborn.items.ItemPlates;
import techreborn.items.ItemUpgrades;
import techreborn.parts.ItemStandaloneCables;
import techreborn.utils.RecipeUtils;
import techreborn.utils.StackWIPHandler;
@ -254,35 +277,42 @@ public class ModRecipes {
}
static void addWireRecipes() {
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("copper", 6), "XXX", "CCC", "XXX", 'C',
"ingotCopper");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("tin", 9), "XXX", "CCC", "XXX", 'C',
"ingotTin");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("gold", 12), "XXX", "CCC", "XXX", 'C',
"ingotGold");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("hv", 8), "XXX", "CCC", "XXX", 'C',
ItemIngots.getIngotByName("refinediron"));
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("copper", 6), "CCC", 'C', "ingotCopper");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("tin", 9), "CCC", 'C', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("gold", 12), "CCC", 'C', "ingotGold");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("hv", 12), "CCC", 'C',
"ingotRefinedIron");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 4), "GGG", "SDS", "GGG",
'G', "blockGlass", 'S', "dustRedstone", 'D', "diamondTR");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 6), "GGG", "SDS", "GGG",
'G', "blockGlass", 'S', "dustRedstone", 'D', "gemRuby");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 6), "GGG", "SDS", "GGG",
'G', "blockGlass", 'S', "ingotSilver", 'D', "diamondTR");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 8), "GGG", "SDS", "GGG",
'G', "blockGlass", 'S', "ingotElectrum", 'D', "diamondTR");
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedcopper"),
ItemParts.getPartByName("rubber"), ItemStandaloneCables.getCableByName("copper"));
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedgold"),
ItemParts.getPartByName("rubber"), ItemStandaloneCables.getCableByName("gold"));
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedhv"),
ItemParts.getPartByName("rubber"), ItemStandaloneCables.getCableByName("hv"));
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedcopper"), "materialRubber",
ItemStandaloneCables.getCableByName("copper"));
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedgold"), "materialRubber",
"materialRubber", ItemStandaloneCables.getCableByName("gold"));
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedhv"), "materialRubber",
"materialRubber", ItemStandaloneCables.getCableByName("hv"));
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedcopper", 6), "RRR", "III",
"RRR", 'R', "materialRubber", 'I', "ingotCopper");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedgold", 4), "RRR", "RIR", "RRR",
'R', "materialRubber", 'I', "ingotGold");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedhv", 4), "RRR", "RIR", "RRR",
'R', "materialRubber", 'I', "ingotRefinedIron");
}
private static void addCompressorRecipes() {
RecipeHandler.addRecipe(new CompressorRecipe(ItemParts.getPartByName("mixedmetalingot"),
ItemParts.getPartByName("advancedAlloy"), 400, 20));
RecipeHandler.addRecipe(new CompressorRecipe(ItemParts.getPartByName("carbonfiber"),
RecipeHandler.addRecipe(new CompressorRecipe(ItemParts.getPartByName("carbonmesh"),
ItemPlates.getPlateByName("carbon"), 400, 20));
RecipeHandler.addRecipe(
@ -419,11 +449,16 @@ public class ModRecipes {
"ingotSteel", 'B', ModItems.ironChainsaw, 'C',
TechRebornAPI.recipeCompact.getItem("electronicCircuit"));
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonmesh"), ItemDusts.getDustByName("coal"),
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemDusts.getDustByName("coal"),
ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"));
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"),
ItemParts.getPartByName("carbonmesh"), ItemParts.getPartByName("carbonmesh"));
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"));
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonmesh"),
ItemParts.getPartByName("carbonfiber"), ItemParts.getPartByName("carbonfiber"));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("computerMonitor"), "ADA", "DGD", "ADA", 'D', dyes,
'A', "ingotAluminum", 'G', Blocks.glass_pane);
@ -548,7 +583,8 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Supercondensator), "EOE", "SAS", "EOE", 'E',
ItemParts.getPartByName("energyFlowCircuit"), 'O', ModItems.lapotronicOrb, 'S',
ItemParts.getPartByName("superconductor"), 'A', BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
ItemParts.getPartByName("superconductor"), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("diamondSawBlade"), "DSD", "S S", "DSD", 'S',
"plateSteel", 'D', "dustDiamond");
@ -638,6 +674,45 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.scrapBox), "SSS", "SSS", "SSS", 'S',
ItemParts.getPartByName("scrap"));
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock"), "TTT", "WCW", 'T',
ItemParts.getPartByName("CoolantSimple"), 'W', ItemStandaloneCables.getCableByName("insulatedcopper"),
'C', ItemParts.getPartByName("electronicCircuit"));
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("heliumCoolantSimple"), 'W',
ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
ItemParts.getPartByName("electronicCircuit"));
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("NaKCoolantSimple"), 'W',
ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
ItemParts.getPartByName("electronicCircuit"));
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G',
"glass", 'W', ItemStandaloneCables.getCableByName("insulatedgold"), 'C',
ItemParts.getPartByName("electronicCircuit"), 'T', ModBlocks.mvt);
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P',
"plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
ItemParts.getPartByName("electronicCircuit"), 'B', ModItems.reBattery);
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("CoolantSimple"), " T ", "TWT", " T ", 'T',
"ingotTin", 'W', "containerWater");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("CoolantTriple"), "TTT", "CCC", "TTT", 'T',
"ingotTin", 'C', ItemParts.getPartByName("CoolantSimple"));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("CoolantSix"), "TCT", "TPT", "TCT", 'T', "ingotTin",
'C', ItemParts.getPartByName("CoolantTriple"), 'P', ItemPlates.getPlateByName("copper"));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), "TST", "PCP", "TST", 'T',
"ingotTin", 'C', ItemParts.getPartByName("CoolantSimple"), 'S', ItemCells.getCellByName("sodium"), 'P',
ItemCells.getCellByName("potassium"));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), "TPT", "SCS", "TPT", 'T',
"ingotTin", 'C', ItemParts.getPartByName("CoolantSimple"), 'S', ItemCells.getCellByName("sodium"), 'P',
ItemCells.getCellByName("potassium"));
Core.logHelper.info("Shapped Recipes Added");
}
@ -670,7 +745,8 @@ public class ModRecipes {
}
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog);
GameRegistry.addShapelessRecipe(ItemParts.getPartByName("frequencyTransmitter"), ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit"));
GameRegistry.addShapelessRecipe(ItemParts.getPartByName("frequencyTransmitter"),
ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit"));
for (String name : ItemDustsSmall.types) {
GameRegistry.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name));
@ -1933,8 +2009,9 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), " L ", "CBC", " M ", 'L', ModBlocks.lvt, 'C',
ItemParts.getPartByName("advancedCircuit"), 'M', ModBlocks.mvt, 'B', ModBlocks.LesuStorage);
CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC", 'C',
"ingotChrome", 'T', "ingotTitanium", 'B', TechRebornAPI.recipeCompact.getItem("advancedMachine"));
CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT",
"CTC", 'C', "ingotChrome", 'T', "ingotTitanium", 'B',
TechRebornAPI.recipeCompact.getItem("advancedMachine"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "III", "CBC", "III", 'I',
"plateIron", 'C', "circuitBasic", 'B', TechRebornAPI.recipeCompact.getItem("machine"));
@ -1947,7 +2024,8 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.quantumChest), "DCD", "ATA", "DQD", 'D',
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.digitalChest, 'T', ModBlocks.Compressor);
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.digitalChest, 'T',
ModBlocks.Compressor);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P',
ItemPlates.getPlateByName("tungstensteel"), 'T', TechRebornAPI.recipeCompact.getItem("hvTransformer"),
@ -1994,8 +2072,7 @@ public class ModRecipes {
// Blast Furnace
RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemCells.getCellByName("silicon", 2), null,
ItemPlates.getPlateByName("silicon"),
ItemCells.getCellByName("empty", 2), 1000, 120, 1500));
ItemPlates.getPlateByName("silicon"), ItemCells.getCellByName("empty", 2), 1000, 120, 1500));
// CentrifugeRecipes
@ -2018,99 +2095,75 @@ public class ModRecipes {
// Methane
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.mushroom_stew, 16),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.apple, 32), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.porkchop, 12), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.apple, 32), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.porkchop, 12),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_porkchop, 16),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.bread, 64), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.fish, 12), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.cooked_fish, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.beef, 12), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.cooked_beef, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Blocks.pumpkin, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.bread, 64), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.fish, 12), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_fish, 16),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.beef, 12), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_beef, 16),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.pumpkin, 16),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.speckled_melon, 1),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1),
new ItemStack(Items.gold_nugget, 6), null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.spider_eye, 32), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.chicken, 12), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.spider_eye, 32),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.chicken, 12), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_chicken, 16),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.rotten_flesh, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.melon, 64), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.cookie, 64), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.cake, 8), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.rotten_flesh, 16),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.melon, 64), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cookie, 64), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cake, 8), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.golden_carrot, 1),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1),
new ItemStack(Items.gold_nugget, 6), null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.carrot, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.baked_potato, 24), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.potato, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.carrot, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.baked_potato, 24),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.potato, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.poisonous_potato, 12),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.nether_wart, 1), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.nether_wart, 1),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
// Fix with ic2
// RecipeHandler.addRecipe(new CentrifugeRecipe(new
// ItemStack(TechRebornAPI.recipeCompact.getItem("terraWart").getItem(),
// 16), ItemCells.getCellByName("empty"),
// ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.brown_mushroom, 1),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
5000, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Blocks.red_mushroom, 1), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.red_mushroom, 1),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
// Rubber Wood Yields
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(TechRebornAPI.recipeCompact.getItem("rubberWood").getItem(), 16),
ItemCells.getCellByName("empty", 5),
new ItemStack(ModItems.parts, 8, 41), new ItemStack(Blocks.sapling, 6),
ItemCells.getCellByName("methane", 1), ItemCells.getCellByName("carbon", 4), 5000, 5, false));
ItemCells.getCellByName("empty", 5), new ItemStack(ModItems.parts, 8, 41),
new ItemStack(Blocks.sapling, 6), ItemCells.getCellByName("methane", 1),
ItemCells.getCellByName("carbon", 4), 5000, 5, false));
// Soul Sand Byproducts
RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Blocks.soul_sand, 16), ItemCells.getCellByName("empty"),
RecipeHandler
.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.soul_sand, 16), ItemCells.getCellByName("empty"),
ItemCells.getCellByName("oil", 1), ItemDusts.getDustByName("saltpeter", 4),
ItemDusts.getDustByName("coal", 1), new ItemStack(Blocks.sand, 10), 2500, 5));
@ -2121,8 +2174,8 @@ public class ModRecipes {
// Dust Byproducts
RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.glowstone_dust, 16),
ItemCells.getCellByName("empty"), new ItemStack(Items.redstone, 8),
ItemDusts.getDustByName("gold", 8), ItemCells.getCellByName("helium", 1), null, 25000, 5));
ItemCells.getCellByName("empty"), new ItemStack(Items.redstone, 8), ItemDusts.getDustByName("gold", 8),
ItemCells.getCellByName("helium", 1), null, 25000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("phosphorous", 5),
ItemCells.getCellByName("empty", 3), ItemCells.getCellByName("calcium", 3), null, null, null, 1280, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("ashes", 1),
@ -2131,10 +2184,10 @@ public class ModRecipes {
.addRecipe(new CentrifugeRecipe(new ItemStack(Items.redstone, 10), ItemCells.getCellByName("empty", 4),
ItemCells.getCellByName("silicon", 1), ItemDusts.getDustByName("pyrite", 3),
ItemDusts.getDustByName("ruby", 1), ItemCells.getCellByName("mercury", 3), 6800, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16),
ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"),
ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5));
RecipeHandler.addRecipe(
new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"),
ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("cinnabar", 2),
ItemCells.getCellByName("empty"), ItemCells.getCellByName("mercury", 1),
ItemDusts.getDustByName("sulfur", 1), null, null, 80, 5));
@ -2143,14 +2196,11 @@ public class ModRecipes {
// Deuterium/Tritium
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("helium", 16), null,
ItemCells.getCellByName("deuterium", 1),
ItemCells.getCellByName("empty", 15), null, null, 10000, 5));
ItemCells.getCellByName("deuterium", 1), ItemCells.getCellByName("empty", 15), null, null, 10000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("deuterium", 4), null,
ItemCells.getCellByName("tritium", 1),
ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
ItemCells.getCellByName("tritium", 1), ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("hydrogen", 4), null,
ItemCells.getCellByName("deuterium", 1),
ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
ItemCells.getCellByName("deuterium", 1), ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
// Lava Cell Byproducts
ItemStack lavaCells = TechRebornAPI.recipeCompact.getItem("lavaCell");
@ -2180,10 +2230,10 @@ public class ModRecipes {
ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("gold", 2),
ItemDusts.getDustByName("copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.gold_ore, 1),
ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("gold", 3),
ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(new ItemStack(Blocks.gold_ore, 1), ItemCells.getCellByName("mercury", 1),
null, ItemDusts.getDustByName("gold", 3), ItemDustsSmall.getSmallDustByName("Copper", 1),
ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.diamond_ore, 1),
TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.diamond, 1),
ItemDustsSmall.getSmallDustByName("Diamond", 6), ItemDustsSmall.getSmallDustByName("Coal", 2),
@ -2231,10 +2281,10 @@ public class ModRecipes {
TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("tin", 2),
ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("tin", 2),
ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("zinc", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler
.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1),
null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
ItemDusts.getDustByName("zinc", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Tin Ore");
}
@ -2268,10 +2318,10 @@ public class ModRecipes {
TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("zinc", 2),
ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Tin", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("zinc", 2),
ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("iron", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler
.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1),
null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
ItemDusts.getDustByName("iron", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Zinc Ore");
}
@ -2287,8 +2337,7 @@ public class ModRecipes {
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1),
null, ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1),
ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"),
100, 120));
ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Silver Ore");
}
@ -2304,8 +2353,7 @@ public class ModRecipes {
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1),
null, ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1),
ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"),
100, 120));
ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore");
}
@ -2322,9 +2370,9 @@ public class ModRecipes {
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000),
uranium238Stack, uranium235Stack, null, null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
TechRebornAPI.recipeCompact.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null,
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null,
uranium238Stack, uranium235Stack, null, new ItemStack(Items.bucket), 100, 120));
} catch (Exception e) {
@ -2343,9 +2391,9 @@ public class ModRecipes {
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000),
uranium238Stack, uranium235Stack, null, null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
TechRebornAPI.recipeCompact.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null,
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null,
uranium238Stack, uranium235Stack, null, new ItemStack(Items.bucket), 100, 120));
} catch (Exception e) {
@ -2357,11 +2405,10 @@ public class ModRecipes {
if (OreUtil.doesOreExistAndValid("oreAluminum")) {
try {
ItemStack oreStack = OreDictionary.getOres("oreAluminum").get(0);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1),
ItemDustsSmall.getSmallDustByName("Bauxite", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("aluminum", 2),
ItemDustsSmall.getSmallDustByName("Bauxite", 1),
ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore");
}
@ -2410,11 +2457,10 @@ public class ModRecipes {
if (OreUtil.doesOreExistAndValid("oreCadmium")) {
try {
ItemStack oreStack = OreDictionary.getOres("oreCadmium").get(0);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1),
ItemDustsSmall.getSmallDustByName("Cadmium", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("cadmium", 2),
ItemDustsSmall.getSmallDustByName("Cadmium", 1),
ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Cadmium Ore");
}
@ -2494,11 +2540,10 @@ public class ModRecipes {
ItemStack oreStack = OreDictionary.getOres("oreTeslatite").get(0);
ItemStack dustStack = OreDictionary.getOres("dustTeslatite").get(0);
dustStack.stackSize = 10;
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
dustStack, ItemDustsSmall.getSmallDustByName("Sodalite", 1),
ItemDustsSmall.getSmallDustByName("Glowstone", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
TechRebornAPI.recipeCompact.getItem("waterCell"), null, dustStack,
ItemDustsSmall.getSmallDustByName("Sodalite", 1),
ItemDustsSmall.getSmallDustByName("Glowstone", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Teslatite Ore");
}
@ -2524,8 +2569,7 @@ public class ModRecipes {
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("saltpeter", 2),
ItemDustsSmall.getSmallDustByName("Saltpeter", 1),
ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemCells.getCellByName("empty"),
100, 120));
ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Saltpeter Ore");
}
@ -2553,8 +2597,8 @@ public class ModRecipes {
dustStack.stackSize = 4;
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.quartz_ore, 1),
TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.quartz, 2),
dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2),
ItemCells.getCellByName("empty"), 100, 120));
dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), ItemCells.getCellByName("empty"),
100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Nether Quartz Ore");
}
@ -2705,8 +2749,7 @@ public class ModRecipes {
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1),
TechRebornAPI.recipeCompact.getItem("waterCell"), null,
TechRebornAPI.recipeCompact.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6),
ItemDustsSmall.getSmallDustByName("Platinum", 2), ItemCells.getCellByName("empty"), 100,
120));
ItemDustsSmall.getSmallDustByName("Platinum", 2), ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1),
new ItemStack(Items.water_bucket), null, TechRebornAPI.recipeCompact.getItem("iridiumOre"),
ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDustsSmall.getSmallDustByName("Platinum", 2),
@ -2772,10 +2815,10 @@ public class ModRecipes {
TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("platinum", 2),
ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9),
ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("platinum", 3),
ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 1),
ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), ItemCells.getCellByName("mercury", 1),
null, ItemDusts.getDustByName("platinum", 3), ItemDustsSmall.getSmallDustByName("Iridium", 1),
ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemCells.getCellByName("empty"), 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 10),
TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemGems.getGemByName("peridot", 1),
@ -2826,21 +2869,18 @@ public class ModRecipes {
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sulfuricAcid", 7), null,
ItemCells.getCellByName("hydrogen", 2), ItemDusts.getDustByName("sulfur"),
ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("empty", 3), 400, 90));
ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("empty", 3), 400, 90));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("ruby", 6),
ItemCells.getCellByName("empty"), ItemDusts.getDustByName("aluminum", 2),
ItemCells.getCellByName("empty", 1),
ItemDusts.getDustByName("chrome", 1), null, 140, 90));
ItemCells.getCellByName("empty", 1), ItemDusts.getDustByName("chrome", 1), null, 140, 90));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("sapphire", 5),
ItemCells.getCellByName("empty"), ItemDusts.getDustByName("aluminum", 2),
ItemCells.getCellByName("empty", 5), null, null, 100, 60));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("nitrogenDioxide", 3), null,
ItemCells.getCellByName("nitrogen", 1),
ItemCells.getCellByName("empty", 5), null,
ItemCells.getCellByName("nitrogen", 1), ItemCells.getCellByName("empty", 5), null,
ItemCells.getCellByName("empty"), 160, 60));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sodiumSulfide", 2), null,
@ -2852,108 +2892,88 @@ public class ModRecipes {
ItemCells.getCellByName("empty", 5), null, null, 100, 60));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("emerald", 29),
ItemCells.getCellByName("empty", 18),
ItemCells.getCellByName("berylium", 3), ItemDusts.getDustByName("aluminum", 2),
ItemCells.getCellByName("silicon", 6),
ItemCells.getCellByName("empty", 18), ItemCells.getCellByName("berylium", 3),
ItemDusts.getDustByName("aluminum", 2), ItemCells.getCellByName("silicon", 6),
ItemCells.getCellByName("empty", 9), 520, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(
new ItemStack(TechRebornAPI.recipeCompact.getItem("silicondioxideDust").getItem(), 3, 0),
ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("silicon", 1),
ItemCells.getCellByName("empty", 1), null, null, 60, 60));
RecipeHandler
.addRecipe(
new IndustrialElectrolyzerRecipe(
new ItemStack(TechRebornAPI.recipeCompact.getItem("silicondioxideDust").getItem(), 3,
0),
ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("silicon", 1),
ItemCells.getCellByName("empty", 1), null, null, 60, 60));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(new ItemStack(Items.dye, 3, 15),
ItemCells.getCellByName("empty", 1), null,
ItemCells.getCellByName("calcium", 1), null, null, 20, 106));
ItemCells.getCellByName("empty", 1), null, ItemCells.getCellByName("calcium", 1), null, null, 20, 106));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("glyceryl", 20), null,
ItemCells.getCellByName("carbon", 3), ItemCells.getCellByName("hydrogen", 5),
ItemCells.getCellByName("nitrogen", 3),
ItemCells.getCellByName("empty", 9), 800, 90));
ItemCells.getCellByName("nitrogen", 3), ItemCells.getCellByName("empty", 9), 800, 90));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("peridot", 9),
ItemCells.getCellByName("empty", 4),
ItemDusts.getDustByName("magnesium", 2), ItemDusts.getDustByName("iron"),
ItemCells.getCellByName("silicon", 2),
ItemCells.getCellByName("empty", 4), ItemDusts.getDustByName("magnesium", 2),
ItemDusts.getDustByName("iron"), ItemCells.getCellByName("silicon", 2),
ItemCells.getCellByName("empty", 2), 200, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("calciumCarbonate", 5), null,
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("calcium"),
ItemCells.getCellByName("empty", 1),
ItemCells.getCellByName("empty", 2), 400, 90));
ItemCells.getCellByName("empty", 1), ItemCells.getCellByName("empty", 2), 400, 90));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sodiumPersulfate", 6), null,
ItemCells.getCellByName("sodium"), ItemDusts.getDustByName("sulfur"),
ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("empty", 3), 420, 90));
ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("empty", 3), 420, 90));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("pyrope", 20),
ItemCells.getCellByName("empty", 9),
ItemDusts.getDustByName("aluminum", 2), ItemDusts.getDustByName("magnesium", 3),
ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),
ItemDusts.getDustByName("magnesium", 3), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 9), 400, 120));
ItemStack sand = new ItemStack(Blocks.sand);
sand.stackSize = 16;
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(sand,
ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("silicon", 1),
ItemCells.getCellByName("empty", 2), null, null, 1000, 25));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(sand, ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("silicon", 1), ItemCells.getCellByName("empty", 2), null, null, 1000, 25));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("almandine", 20),
ItemCells.getCellByName("empty", 9),
ItemDusts.getDustByName("aluminum", 2), ItemDusts.getDustByName("iron", 3),
ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),
ItemDusts.getDustByName("iron", 3), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 6), 480, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("spessartine", 20),
ItemCells.getCellByName("empty", 9),
ItemDusts.getDustByName("aluminum", 2), ItemDusts.getDustByName("manganese", 3),
ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),
ItemDusts.getDustByName("manganese", 3), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 6), 480, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("andradite", 20),
ItemCells.getCellByName("empty", 12),
ItemCells.getCellByName("calcium", 3), ItemDusts.getDustByName("iron", 2),
ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 12), ItemCells.getCellByName("calcium", 3),
ItemDusts.getDustByName("iron", 2), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 6), 480, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("grossular", 20),
ItemCells.getCellByName("empty", 12),
ItemCells.getCellByName("calcium", 3), ItemDusts.getDustByName("aluminum", 2),
ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 12), ItemCells.getCellByName("calcium", 3),
ItemDusts.getDustByName("aluminum", 2), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 6), 440, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("Uvarovite", 20),
ItemCells.getCellByName("empty", 12),
ItemCells.getCellByName("calcium", 3), ItemDusts.getDustByName("chrome", 2),
ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 12), ItemCells.getCellByName("calcium", 3),
ItemDusts.getDustByName("chrome", 2), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 6), 480, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(
ItemCells.getCellByName("empty", 6), null,
ItemCells.getCellByName("hydrogen", 4),
ItemCells.getCellByName("empty", 5),
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("empty", 6), null,
ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5),
ItemCells.getCellByName("empty", 1), null, 100, 30));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("darkAshes"),
ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30));
ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30));
if (OreUtil.doesOreExistAndValid("dustSalt")) {
ItemStack salt = OreDictionary.getOres("dustSalt").get(0);
salt.stackSize = 2;
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(salt,
ItemCells.getCellByName("empty", 2),
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(salt, ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("sodium"), ItemCells.getCellByName("chlorine"), null, null, 40, 60));
}
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), "TST", "PCP", "TST", 'T',
"ingotTin", 'S', ItemCells.getCellByName("sodium"), 'P', ItemCells.getCellByName("potassium"), 'C',
TechRebornAPI.recipeCompact.getItem("reactorCoolantSimple"));
Item drill = TechRebornAPI.recipeCompact.getItem("miningDrill").getItem();
ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE);

View file

@ -14,8 +14,7 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemParts extends ItemTextureBase
{
public class ItemParts extends ItemTextureBase {
public static final String[] types = new String[] { "advancedCircuitParts", "basicCircuitBoard",
"advancedCircuitBoard", "processorCircuitBoard", "energyFlowCircuit", "dataControlCircuit", "dataOrb",
"dataStorageCircuit", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead",
@ -25,39 +24,33 @@ public class ItemParts extends ItemTextureBase
"doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "quadPlutoniumCell",
"destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor", "machineParts",
"thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber",
"scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber", "frequencyTransmitter" };
"scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber",
"frequencyTransmitter", "CoolantSimple", "CoolantTriple", "CoolantSix" };
public ItemParts()
{
public ItemParts() {
setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.part");
}
public static ItemStack getPartByName(String name, int count)
{
for (int i = 0; i < types.length; i++)
{
if (types[i].equalsIgnoreCase(name))
{
public static ItemStack getPartByName(String name, int count) {
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
return new ItemStack(ModItems.parts, count, i);
}
}
throw new InvalidParameterException("The part " + name + " could not be found.");
}
public static ItemStack getPartByName(String name)
{
public static ItemStack getPartByName(String name) {
return getPartByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack)
{
public String getUnlocalizedName(ItemStack itemStack) {
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length)
{
if (meta < 0 || meta >= types.length) {
meta = 0;
}
@ -65,35 +58,29 @@ public class ItemParts extends ItemTextureBase
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < types.length; ++meta)
{
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
for (int meta = 0; meta < types.length; ++meta) {
list.add(new ItemStack(item, 1, meta));
}
}
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player)
{
switch (itemStack.getItemDamage())
{
case 37: // Destructo pack
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
break;
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
switch (itemStack.getItemDamage()) {
case 37: // Destructo pack
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
break;
}
return itemStack;
}
@Override
public String getTextureName(int damage)
{
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/part/" + types[damage];
}
@Override
public int getMaxMeta()
{
public int getMaxMeta() {
return types.length;
}
}

View file

@ -9,6 +9,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import techreborn.api.recipe.RecipeCrafter;
import techreborn.api.upgrade.IMachineUpgrade;
import techreborn.client.TechRebornCreativeTabMisc;
@ -33,7 +34,7 @@ public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, IT
{
if (types[i].equalsIgnoreCase(name))
{
return new ItemStack(ModItems.plate, count, i);
return new ItemStack(ModItems.upgrades, count, i);
}
}
throw new InvalidParameterException("The upgrade " + name + " could not be found.");
@ -90,6 +91,12 @@ public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, IT
}
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
{
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
}
@Override
public int getMaxMeta()
{

View file

@ -93,23 +93,17 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex
return 1 - charge;
}
@Override public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected)
{System.out.print("Hey!");
}
@Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
{
System.out.print("Hey!");
for(int i = 0; i < player.inventory.getSizeInventory(); i++){
if(player.inventory.getStackInSlot(i) != null){
ItemStack item = player.inventory.getStackInSlot(i);
if(item.getItem() instanceof IEnergyItemInfo){
IEnergyItemInfo energyItemInfo = (IEnergyItemInfo) item.getItem();
if(energyItemInfo.canAcceptEnergy(item)){
if(energyItemInfo.getMaxPower(item) != PoweredItem.getEnergy(item)){
if(PoweredItem.canUseEnergy(energyItemInfo.getMaxPower(item), itemStack)){
PoweredItem.useEnergy(energyItemInfo.getMaxPower(item), itemStack);
PoweredItem.addEnergy(energyItemInfo.getMaxPower(item), item);
PoweredItem.useEnergy(energyItemInfo.getMaxTransfer(item), itemStack);
PoweredItem.setEnergy(PoweredItem.getEnergy(item) + energyItemInfo.getMaxTransfer(item), item);
}
}
}
@ -135,6 +129,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining)

View file

@ -1,7 +1,5 @@
package techreborn.items.armor;
import java.util.List;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
@ -11,6 +9,7 @@ import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore;
@ -20,6 +19,8 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import java.util.List;
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem
{
@ -35,7 +36,23 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT
setCreativeTab(TechRebornCreativeTab.instance);
RebornCore.jsonDestroyer.registerObject(this);
}
@Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
{
for(int i = 0; i < player.inventory.getSizeInventory(); i++){
if(player.inventory.getStackInSlot(i) != null){
ItemStack item = player.inventory.getStackInSlot(i);
if(item.getItem() instanceof IEnergyItemInfo){
IEnergyItemInfo energyItemInfo = (IEnergyItemInfo) item.getItem();
if(energyItemInfo.getMaxPower(item) != PoweredItem.getEnergy(item)){
if(PoweredItem.canUseEnergy(energyItemInfo.getMaxPower(item), itemStack)){
PoweredItem.useEnergy(energyItemInfo.getMaxTransfer(item), itemStack);
PoweredItem.setEnergy(PoweredItem.getEnergy(item) + energyItemInfo.getMaxTransfer(item), item);
}
}
}
}
}
}
@Override
@SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
@ -118,4 +135,5 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
}

View file

@ -26,7 +26,7 @@ import techreborn.blocks.storage.BlockBatBox;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.items.ItemTR;
import techreborn.lib.ModInfo;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileEnergyStorage;
import java.util.ArrayList;
import java.util.List;
@ -60,7 +60,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem
if (!player.isSneaking())
{
if (tile instanceof TileBatBox)
if (tile instanceof TileEnergyStorage)
{
tile.getWorld().setBlockState(tile.getPos(),
tile.getWorld().getBlockState(pos).withProperty(BlockBatBox.FACING, side.getOpposite()));

View file

@ -3,8 +3,7 @@ package techreborn.parts;
import net.minecraft.util.IStringSerializable;
import reborncore.api.power.EnumPowerTier;
public enum EnumStandaloneCableType implements IStringSerializable
{
public enum EnumStandaloneCableType implements IStringSerializable {
COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW), TIN("tin",
"techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM), GOLD("gold",
"techreborn:blocks/cables/gold_cable", 512, 12.0, true, EnumPowerTier.MEDIUM), HV("hv",
@ -26,8 +25,7 @@ public enum EnumStandaloneCableType implements IStringSerializable
private String friendlyName;
EnumStandaloneCableType(String friendlyName, String textureName, int transferRate, double cableThickness,
boolean canKill, EnumPowerTier tier)
{
boolean canKill, EnumPowerTier tier) {
this.friendlyName = friendlyName;
this.textureName = textureName;
this.transferRate = transferRate;
@ -37,8 +35,7 @@ public enum EnumStandaloneCableType implements IStringSerializable
}
@Override
public String getName()
{
public String getName() {
return friendlyName.toLowerCase();
}
}

View file

@ -65,6 +65,9 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable,
if (inventory.getStackInSlot(0) != null)
{
ItemStack stack = inventory.getStackInSlot(0);
if(!(stack.getItem() instanceof IEnergyItemInfo)){
return;
}
IEnergyItemInfo item = (IEnergyItemInfo) inventory.getStackInSlot(0).getItem();
if (PoweredItem.getEnergy(stack) != PoweredItem.getMaxPower(stack))
{
@ -78,6 +81,9 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable,
if (inventory.getStackInSlot(1) != null)
{
ItemStack stack = inventory.getStackInSlot(1);
if(!(stack.getItem() instanceof IEnergyItemInfo)){
return;
}
IEnergyItemInfo item = (IEnergyItemInfo) stack.getItem();
if (item.canProvideEnergy(stack))
{

View file

@ -1,28 +1,17 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class TileHVTransformer extends TileLVTransformer
public class TileHVTransformer extends TileTransformer
{
@Override
public double getMaxOutput()
public TileHVTransformer()
{
return 512;
super("HVTransformer", ModBlocks.hvt, EnumPowerTier.EXTREME, 2048, 412, 2048*2);
}
@Override
public double getMaxInput()
{
return 2048;
}
@Override
public EnumPowerTier getTier()
{
return EnumPowerTier.EXTREME;
}
}

View file

@ -1,45 +1,17 @@
package techreborn.tiles.transformers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import techreborn.tiles.storage.TileBatBox;
import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class TileLVTransformer extends TileBatBox
public class TileLVTransformer extends TileTransformer
{
@Override
public double getMaxOutput()
public TileLVTransformer()
{
return 32;
}
@Override
public double getMaxInput()
{
return 128;
}
@Override
// Can take medium power in
public EnumPowerTier getTier()
{
return EnumPowerTier.MEDIUM;
}
@Override
public double getMaxPower()
{
return getMaxInput() * 2;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer)
{
return new ItemStack(worldObj.getBlockState(pos).getBlock());
super("LVTransformer", ModBlocks.lvt, EnumPowerTier.LOW, 128, 32, 128*2);
}
}

View file

@ -1,13 +1,19 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class TileMVTransformer extends TileLVTransformer
public class TileMVTransformer extends TileTransformer
{
public TileMVTransformer()
{
super("MVTransformer", ModBlocks.mvt, EnumPowerTier.HIGH, 512, 128, 512*2);
}
@Override
public double getMaxOutput()
{

View file

@ -0,0 +1,107 @@
package techreborn.tiles.transformers;
import ic2.api.tile.IWrenchable;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.blocks.transformers.BlockTransformer;
/**
* Created by Rushmead
*/
public class TileTransformer extends TilePowerAcceptor implements IWrenchable, ITickable
{
public String name;
public Block wrenchDrop;
public EnumPowerTier tier;
public int maxInput;
public int maxOutput;
public int maxStorage;
public TileTransformer(String name, Block wrenchDrop, EnumPowerTier tier, int maxInput, int maxOuput, int maxStorage)
{
super(1);
this.wrenchDrop = wrenchDrop;
this.tier = tier;
this.name = name;
this.maxInput = maxInput;
this.maxOutput = maxOuput;
this.maxStorage = maxStorage;
}
@Override public boolean wrenchCanSetFacing(EntityPlayer p0, EnumFacing p1)
{
return true;
}
@Override public EnumFacing getFacing()
{
return getFacingEnum();
}
@Override public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{
if (entityPlayer.isSneaking())
{
return true;
}
return false;
}
@Override public float getWrenchDropRate()
{
return 1.0F;
}
@Override public ItemStack getWrenchDrop(EntityPlayer p0)
{
return new ItemStack(wrenchDrop);
}
@Override public double getMaxPower()
{
return maxStorage;
}
@Override public boolean canAcceptEnergy(EnumFacing direction)
{
return getFacingEnum() != direction;
}
@Override public EnumFacing getFacingEnum()
{
Block block = worldObj.getBlockState(pos).getBlock();
if (block instanceof BlockTransformer)
{
return ((BlockTransformer) block).getFacing(worldObj.getBlockState(pos));
}
return null;
}
@Override public boolean canProvideEnergy(EnumFacing direction)
{
return getFacing() == direction;
}
@Override public double getMaxOutput()
{
return maxOutput;
}
@Override public double getMaxInput()
{
return maxInput;
}
@Override public EnumPowerTier getTier()
{
return tier;
}
}

View file

@ -78,9 +78,9 @@ tile.techreborn.mfe.name=MFE
tile.techreborn.mfsu.name=MFSU
tile.techreborn.reinforcedglass.name=Reinforced Glass
tile.techreborn.nuke.name=Nuke
tile.techreborn.lvt.name=LV Transformer
tile.techreborn.mvt.name=MV Transformer
tile.techreborn.hvt.name=HV Transformer
tile.techreborn.lvtransformer.name=LV Transformer
tile.techreborn.mvtransformer.name=MV Transformer
tile.techreborn.hvtransformer.name=HV Transformer
#Blocks
@ -435,6 +435,9 @@ item.techreborn.energyCrystal.name=Energy Crystal
item.techreborn.lapotronCrystal.name=Lapotron Crystal
item.techreborn.treetap.name=Treetap
item.techreborn.nanosaber.name=Nanosaber
item.techreborn.upgrade.Overclock.name=Overclocker Upgrade
item.techreborn.upgrade.Transformer.name=Tranformer Upgrade
item.techreborn.upgrade.EnergyStorage.name=Energy Storage Upgrade
#Gems
item.techreborn.gem.ruby.name=Ruby
@ -623,9 +626,12 @@ item.techreborn.part.rubber.name=Rubber
item.techreborn.part.scrap.name=Scrap
item.techreborn.part.electronicCircuit.name=Electronic Circuit
item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit
item.techreborn.part.pump.name=Pump
item.techreborn.part.teleporter.name=Teleporter
item.techreborn.part.advancedAlloy.name=Advanced Alloy
item.techreborn.part.frequencyTransmitter.name=Frequency Transmitter
item.techreborn.part.tungstenGrindingHead.name=Tungsten Grinding Head
item.techreborn.part.CoolantSimple.name=10k Coolant Cell
item.techreborn.part.CoolantTriple.name=30k Coolant Cell
item.techreborn.part.CoolantSix.name=60k Coolant Cell
#Tools
item.techreborn.rockcutter.name=Rockcutter

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 539 B