Flattened frames
This commit is contained in:
parent
94b1e19abf
commit
1d4116a215
51 changed files with 465 additions and 570 deletions
|
@ -112,13 +112,13 @@ public class BlockMachineCasing extends BlockMultiblockBase {
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired){
|
if (RebornCoreConfig.wrenchRequired){
|
||||||
if (state.getValue(TYPE) == "reinforced") {
|
if (state.getValue(TYPE) == "reinforced") {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
|
||||||
}
|
}
|
||||||
else if (state.getValue(TYPE) == "advanced") {
|
else if (state.getValue(TYPE) == "advanced") {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 2));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -24,96 +24,71 @@
|
||||||
|
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import com.google.common.base.CaseFormat;
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.BlockStateContainer;
|
|
||||||
import net.minecraft.block.state.IBlockState;
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.NonNullList;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.BaseBlock;
|
import reborncore.common.BaseBlock;
|
||||||
import reborncore.common.blocks.PropertyString;
|
|
||||||
import reborncore.common.util.ArrayUtils;
|
|
||||||
import techreborn.init.ModBlocks;
|
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.security.InvalidParameterException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class BlockMachineFrames extends BaseBlock {
|
public class BlockMachineFrames extends BaseBlock {
|
||||||
public static final String[] types = new String[] { "basic", "advanced", "highly_advanced" };
|
// public static final String[] types = new String[] { "basic", "advanced", "highly_advanced" };
|
||||||
public static final PropertyString TYPE = new PropertyString("type", types);
|
// public static final PropertyString TYPE = new PropertyString("type", types);
|
||||||
private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
|
// private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
|
||||||
|
|
||||||
public BlockMachineFrames() {
|
public BlockMachineFrames() {
|
||||||
super(Material.IRON);
|
super(Material.IRON);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
setHardness(1f);
|
setHardness(1f);
|
||||||
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "basic"));
|
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure"));
|
||||||
for (int i = 0; i < types.length; i++) {
|
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant("type=" + types[i]));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack getFrameByName(String name, int count) {
|
// public static ItemStack getFrameByName(String name, int count) {
|
||||||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
// name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||||
if (name.equals("machine")) {
|
// if (name.equals("machine")) {
|
||||||
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 0);
|
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 0);
|
||||||
}
|
// }
|
||||||
if (name.equals("advanced_machine")) {
|
// if (name.equals("advanced_machine")) {
|
||||||
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 1);
|
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 1);
|
||||||
}
|
// }
|
||||||
if (name.equals("highly_advanced_machine")) {
|
// if (name.equals("highly_advanced_machine")) {
|
||||||
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 2);
|
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 2);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
// for (int i = 0; i < types.length; i++) {
|
||||||
|
// if (types[i].equalsIgnoreCase(name)) {
|
||||||
|
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// throw new InvalidParameterException("The part " + name + " could not be found.");
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public static ItemStack getFrameByName(String name) {
|
||||||
|
// return getFrameByName(name, 1);
|
||||||
|
// }
|
||||||
|
|
||||||
for (int i = 0; i < types.length; i++) {
|
|
||||||
if (types[i].equalsIgnoreCase(name)) {
|
|
||||||
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new InvalidParameterException("The part " + name + " could not be found.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStack getFrameByName(String name) {
|
// @Override
|
||||||
return getFrameByName(name, 1);
|
// public int damageDropped(IBlockState state) {
|
||||||
}
|
// return getMetaFromState(state);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// @Override
|
||||||
|
// public IBlockState getStateFromMeta(int meta) {
|
||||||
|
// if (meta > types.length) {
|
||||||
|
// meta = 0;
|
||||||
|
// }
|
||||||
|
// return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// @Override
|
||||||
|
// public int getMetaFromState(IBlockState state) {
|
||||||
|
// return typesList.indexOf(state.getValue(TYPE));
|
||||||
|
// }
|
||||||
|
|
||||||
@Override
|
// @Override
|
||||||
@SideOnly(Side.CLIENT)
|
// protected BlockStateContainer createBlockState() {
|
||||||
public void getSubBlocks(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
// return new BlockStateContainer(this, TYPE);
|
||||||
for (int meta = 0; meta < types.length; meta++) {
|
// }
|
||||||
list.add(new ItemStack(this, 1, meta));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int damageDropped(IBlockState state) {
|
|
||||||
return getMetaFromState(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IBlockState getStateFromMeta(int meta) {
|
|
||||||
if (meta > types.length) {
|
|
||||||
meta = 0;
|
|
||||||
}
|
|
||||||
return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMetaFromState(IBlockState state) {
|
|
||||||
return typesList.indexOf(state.getValue(TYPE));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected BlockStateContainer createBlockState() {
|
|
||||||
return new BlockStateContainer(this, TYPE);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,14 +27,11 @@ package techreborn.blocks;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.RayTraceResult;
|
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
|
||||||
import reborncore.common.blocks.PropertyString;
|
import reborncore.common.blocks.PropertyString;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegistry;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
|
@ -42,12 +39,10 @@ import reborncore.common.util.OreDrop;
|
||||||
import techreborn.init.TRIngredients;
|
import techreborn.init.TRIngredients;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.world.config.IOreNameProvider;
|
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegistry(modID = ModInfo.MOD_ID)
|
||||||
public class BlockOre extends Block implements IOreNameProvider {
|
public class BlockOre extends Block {
|
||||||
|
|
||||||
public static final PropertyString VARIANTS = getVarients();
|
public static final PropertyString VARIANTS = getVarients();
|
||||||
@ConfigRegistry(config = "misc", category = "blocks", key = "rubyMinQuatity", comment = "Minimum quantity of Ruby gems per Ruby ore")
|
@ConfigRegistry(config = "misc", category = "blocks", key = "rubyMinQuatity", comment = "Minimum quantity of Ruby gems per Ruby ore")
|
||||||
|
@ -149,46 +144,22 @@ public class BlockOre extends Block implements IOreNameProvider {
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Override
|
// @Override
|
||||||
// @SideOnly(Side.CLIENT)
|
// public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
|
||||||
// public void getSubBlocks(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
// return new ItemStack(this, 1, getMetaFromState(state));
|
||||||
// for (int meta = 0; meta < ores.length; meta++) {
|
|
||||||
// list.add(new ItemStack(this, 1, meta));
|
|
||||||
// }
|
|
||||||
// }
|
// }
|
||||||
|
//
|
||||||
@Override
|
|
||||||
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
|
|
||||||
return new ItemStack(this, 1, getMetaFromState(state));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int damageDropped(IBlockState state) {
|
|
||||||
return getMetaFromState(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Override
|
// @Override
|
||||||
// public IBlockState getStateFromMeta(int meta) {
|
// public int damageDropped(IBlockState state) {
|
||||||
// if (meta > ores.length) {
|
// return getMetaFromState(state);
|
||||||
// meta = 0;
|
|
||||||
// }
|
|
||||||
// return getBlockState().getBaseState().withProperty(VARIANTS, oreNamesList.get(meta));
|
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// @Override
|
|
||||||
// public int getMetaFromState(IBlockState state) {
|
|
||||||
// return oreNamesList.indexOf(state.getValue(VARIANTS));
|
|
||||||
// }
|
|
||||||
//
|
//
|
||||||
// @Override
|
// @Override
|
||||||
// protected BlockStateContainer createBlockState() {
|
// protected BlockStateContainer createBlockState() {
|
||||||
// return new BlockStateContainer(this, VARIANTS);
|
// return new BlockStateContainer(this, VARIANTS);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getUserLoclisedName(IBlockState state) {
|
|
||||||
// return StringUtils.toFirstCapital(oreNamesList.get(getMetaFromState(state)));
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PropertyString getVarients() {
|
public static PropertyString getVarients() {
|
||||||
// if (OreBlockStateManager.endOreStone) {
|
// if (OreBlockStateManager.endOreStone) {
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class BlockCreativeSolarPanel extends BaseTileBlock {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired) {
|
if (RebornCoreConfig.wrenchRequired) {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
|
||||||
} else {
|
} else {
|
||||||
super.getDrops(drops, world, pos, state, fortune);
|
super.getDrops(drops, world, pos, state, fortune);
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class BlockAdjustableSU extends BlockEnergyStorage {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired) {
|
if (RebornCoreConfig.wrenchRequired) {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 2));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
|
||||||
} else {
|
} else {
|
||||||
super.getDrops(drops, world, pos, state, fortune);
|
super.getDrops(drops, world, pos, state, fortune);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class BlockHighVoltageSU extends BlockEnergyStorage {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired) {
|
if (RebornCoreConfig.wrenchRequired) {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
|
||||||
} else {
|
} else {
|
||||||
super.getDrops(drops, world, pos, state, fortune);
|
super.getDrops(drops, world, pos, state, fortune);
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired) {
|
if (RebornCoreConfig.wrenchRequired) {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
|
||||||
} else {
|
} else {
|
||||||
super.getDrops(drops, world, pos, state, fortune);
|
super.getDrops(drops, world, pos, state, fortune);
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,7 +113,7 @@ public class BlockLSUStorage extends BaseTileBlock {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired) {
|
if (RebornCoreConfig.wrenchRequired) {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
||||||
} else {
|
} else {
|
||||||
super.getDrops(drops, world, pos, state, fortune);
|
super.getDrops(drops, world, pos, state, fortune);
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class BlockLapotronicSU extends BlockEnergyStorage {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired) {
|
if (RebornCoreConfig.wrenchRequired) {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
|
||||||
} else {
|
} else {
|
||||||
super.getDrops(drops, world, pos, state, fortune);
|
super.getDrops(drops, world, pos, state, fortune);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired) {
|
if (RebornCoreConfig.wrenchRequired) {
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
||||||
} else {
|
} else {
|
||||||
super.getDrops(drops, world, pos, state, fortune);
|
super.getDrops(drops, world, pos, state, fortune);
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class BlockHVTransformer extends BlockTransformer {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired){
|
if (RebornCoreConfig.wrenchRequired){
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
drops.add(new ItemStack(this));
|
drops.add(new ItemStack(this));
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class BlockMVTransformer extends BlockTransformer {
|
||||||
@Override
|
@Override
|
||||||
public void getDrops(NonNullList<ItemStack> drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) {
|
public void getDrops(NonNullList<ItemStack> drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) {
|
||||||
if (RebornCoreConfig.wrenchRequired){
|
if (RebornCoreConfig.wrenchRequired){
|
||||||
drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0));
|
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
drops.add(new ItemStack(this));
|
drops.add(new ItemStack(this));
|
||||||
|
|
|
@ -151,6 +151,7 @@ public class RegisterItemJsons {
|
||||||
|
|
||||||
private static void registerBlocks() {
|
private static void registerBlocks() {
|
||||||
register(ModBlocks.REFINED_IRON_FENCE, "iron_fence");
|
register(ModBlocks.REFINED_IRON_FENCE, "iron_fence");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void register(Item item, int meta, String name) {
|
private static void register(Item item, int meta, String name) {
|
||||||
|
|
|
@ -26,14 +26,10 @@ package techreborn.init;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockSlab;
|
import net.minecraft.block.BlockSlab;
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemSlab;
|
import net.minecraft.item.ItemSlab;
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
|
||||||
import reborncore.RebornRegistry;
|
import reborncore.RebornRegistry;
|
||||||
import reborncore.common.util.OreUtil;
|
|
||||||
import techreborn.Core;
|
import techreborn.Core;
|
||||||
import techreborn.blocks.*;
|
import techreborn.blocks.*;
|
||||||
import techreborn.blocks.cable.BlockCable;
|
import techreborn.blocks.cable.BlockCable;
|
||||||
|
@ -61,7 +57,10 @@ public class ModBlocks {
|
||||||
public static Block CABLE;
|
public static Block CABLE;
|
||||||
public static Block COMPUTER_CUBE;
|
public static Block COMPUTER_CUBE;
|
||||||
public static Block FLARE;
|
public static Block FLARE;
|
||||||
public static Block IRON_FURNACE;
|
public static Block MACHINE_CASINGS;
|
||||||
|
public static Block MACHINE_BLOCK_ADVANCED;
|
||||||
|
public static Block MACHINE_BLOCK_BASIC;
|
||||||
|
public static Block MACHINE_BLOCK_ELITE;
|
||||||
public static Block NUKE;
|
public static Block NUKE;
|
||||||
public static Block REFINED_IRON_FENCE;
|
public static Block REFINED_IRON_FENCE;
|
||||||
public static Block REINFORCED_GLASS;
|
public static Block REINFORCED_GLASS;
|
||||||
|
@ -70,8 +69,8 @@ public class ModBlocks {
|
||||||
public static Block RUBBER_LOG_SLAB_HALF;
|
public static Block RUBBER_LOG_SLAB_HALF;
|
||||||
public static Block RUBBER_LOG_SLAB_DOUBLE;
|
public static Block RUBBER_LOG_SLAB_DOUBLE;
|
||||||
public static Block RUBBER_LOG_STAIR;
|
public static Block RUBBER_LOG_STAIR;
|
||||||
public static Block RUBBER_SAPLING;
|
|
||||||
public static Block RUBBER_PLANKS;
|
public static Block RUBBER_PLANKS;
|
||||||
|
public static Block RUBBER_SAPLING;
|
||||||
|
|
||||||
// Machines - machines
|
// Machines - machines
|
||||||
public static Block ALLOY_SMELTER;
|
public static Block ALLOY_SMELTER;
|
||||||
|
@ -91,6 +90,7 @@ public class ModBlocks {
|
||||||
public static Block INDUSTRIAL_GRINDER;
|
public static Block INDUSTRIAL_GRINDER;
|
||||||
public static Block INDUSTRIAL_SAWMILL;
|
public static Block INDUSTRIAL_SAWMILL;
|
||||||
public static Block IRON_ALLOY_FURNACE;
|
public static Block IRON_ALLOY_FURNACE;
|
||||||
|
public static Block IRON_FURNACE;
|
||||||
public static Block MATTER_FABRICATOR;
|
public static Block MATTER_FABRICATOR;
|
||||||
public static Block RECYCLER;
|
public static Block RECYCLER;
|
||||||
public static Block ROLLING_MACHINE;
|
public static Block ROLLING_MACHINE;
|
||||||
|
@ -142,167 +142,46 @@ public class ModBlocks {
|
||||||
public static Block MAGIC_ENERGY_CONVERTER;
|
public static Block MAGIC_ENERGY_CONVERTER;
|
||||||
public static Block PLAYER_DETECTOR;
|
public static Block PLAYER_DETECTOR;
|
||||||
|
|
||||||
|
|
||||||
public static Block MACHINE_CASINGS;
|
|
||||||
public static Block MACHINE_FRAMES;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Register blocks
|
* Register blocks
|
||||||
*/
|
*/
|
||||||
public static void init() {
|
public static void init() {
|
||||||
TRIngredients.registerBlocks();
|
TRIngredients.registerBlocks();
|
||||||
|
|
||||||
THERMAL_GENERATOR = new BlockThermalGenerator();
|
// Misc. blocks
|
||||||
registerBlock(THERMAL_GENERATOR, "thermal_generator");
|
COMPUTER_CUBE = new BlockComputerCube();
|
||||||
|
registerBlock(COMPUTER_CUBE, "computer_cube");
|
||||||
QUANTUM_TANK = new BlockQuantumTank();
|
|
||||||
registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank");
|
|
||||||
|
|
||||||
CREATIVE_QUANTUM_TANK = new BlockCreativeQuantumTank();
|
|
||||||
registerBlock(CREATIVE_QUANTUM_TANK, ItemBlockQuantumTank.class, "creative_quantum_tank");
|
|
||||||
|
|
||||||
QUANTUM_CHEST = new BlockQuantumChest();
|
|
||||||
registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest");
|
|
||||||
|
|
||||||
CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest();
|
|
||||||
registerBlock(CREATIVE_QUANTUM_CHEST, ItemBlockQuantumChest.class, "creative_quantum_chest");
|
|
||||||
|
|
||||||
DIGITAL_CHEST = new BlockDigitalChest();
|
|
||||||
registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest");
|
|
||||||
|
|
||||||
INDUSTRIAL_CENTRIFUGE = new BlockIndustrialCentrifuge();
|
|
||||||
registerBlock(INDUSTRIAL_CENTRIFUGE, "industrial_centrifuge");
|
|
||||||
|
|
||||||
ROLLING_MACHINE = new BlockRollingMachine();
|
|
||||||
registerBlock(ROLLING_MACHINE, "rolling_machine");
|
|
||||||
|
|
||||||
INDUSTRIAL_BLAST_FURNACE = new BlockIndustrialBlastFurnace();
|
|
||||||
registerBlock(INDUSTRIAL_BLAST_FURNACE, "industrial_blast_furnace");
|
|
||||||
|
|
||||||
ALLOY_SMELTER = new BlockAlloySmelter();
|
|
||||||
registerBlock(ALLOY_SMELTER, "alloy_smelter");
|
|
||||||
|
|
||||||
INDUSTRIAL_GRINDER = new BlockIndustrialGrinder();
|
|
||||||
registerBlock(INDUSTRIAL_GRINDER, "industrial_grinder");
|
|
||||||
|
|
||||||
IMPLOSION_COMPRESSOR = new BlockImplosionCompressor();
|
|
||||||
registerBlock(IMPLOSION_COMPRESSOR, "implosion_compressor");
|
|
||||||
|
|
||||||
MATTER_FABRICATOR = new BlockMatterFabricator();
|
|
||||||
registerBlock(MATTER_FABRICATOR, "matter_fabricator");
|
|
||||||
|
|
||||||
CHUNK_LOADER = new BlockChunkLoader();
|
|
||||||
registerBlock(CHUNK_LOADER, "chunk_loader");
|
|
||||||
|
|
||||||
CHARGE_O_MAT = new BlockChargeOMat();
|
|
||||||
registerBlock(CHARGE_O_MAT, "charge_o_mat");
|
|
||||||
|
|
||||||
PLAYER_DETECTOR = new BlockPlayerDetector();
|
|
||||||
registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector");
|
|
||||||
|
|
||||||
CABLE = new BlockCable();
|
CABLE = new BlockCable();
|
||||||
registerBlock(CABLE, ItemBlockCable.class, "cable");
|
registerBlock(CABLE, ItemBlockCable.class, "cable");
|
||||||
|
|
||||||
|
MACHINE_BLOCK_ADVANCED = new BlockMachineFrames();
|
||||||
|
registerBlock(MACHINE_BLOCK_ADVANCED, "machineBlockAdvanced");
|
||||||
|
|
||||||
|
MACHINE_BLOCK_BASIC = new BlockMachineFrames();
|
||||||
|
registerBlock(MACHINE_BLOCK_BASIC, "machineBlockBasic");
|
||||||
|
|
||||||
|
MACHINE_BLOCK_ELITE = new BlockMachineFrames();
|
||||||
|
registerBlock(MACHINE_BLOCK_ELITE, "machineBlockElite");
|
||||||
|
|
||||||
MACHINE_CASINGS = new BlockMachineCasing();
|
MACHINE_CASINGS = new BlockMachineCasing();
|
||||||
registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machine_casing");
|
registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machine_casing");
|
||||||
|
|
||||||
DRAGON_EGG_SYPHON = new BlockDragonEggSyphon();
|
NUKE = new BlockNuke();
|
||||||
registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon");
|
registerBlock(NUKE, "nuke");
|
||||||
|
|
||||||
MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter();
|
REFINED_IRON_FENCE = new BlockRefinedIronFence();
|
||||||
registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter");
|
registerBlock(REFINED_IRON_FENCE, "refined_iron_fence");
|
||||||
|
|
||||||
ASSEMBLY_MACHINE = new BlockAssemblingMachine();
|
REINFORCED_GLASS = new BlockReinforcedGlass();
|
||||||
registerBlock(ASSEMBLY_MACHINE, "assembly_machine");
|
registerBlock(REINFORCED_GLASS, "reinforced_glass");
|
||||||
|
|
||||||
DIESEL_GENERATOR = new BlockDieselGenerator();
|
RUBBER_LEAVES = new BlockRubberLeaves();
|
||||||
registerBlock(DIESEL_GENERATOR, "diesel_generator");
|
registerBlock(RUBBER_LEAVES, "rubber_leaves");
|
||||||
|
|
||||||
INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer();
|
|
||||||
registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer");
|
|
||||||
|
|
||||||
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber();
|
|
||||||
registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber");
|
|
||||||
|
|
||||||
SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator();
|
|
||||||
registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator");
|
|
||||||
|
|
||||||
GAS_TURBINE = new BlockGasTurbine();
|
|
||||||
registerBlock(GAS_TURBINE, "gas_turbine");
|
|
||||||
|
|
||||||
IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace();
|
|
||||||
registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace");
|
|
||||||
|
|
||||||
CHEMICAL_REACTOR = new BlockChemicalReactor();
|
|
||||||
registerBlock(CHEMICAL_REACTOR, "chemical_reactor");
|
|
||||||
|
|
||||||
INTERDIMENSIONAL_SU = new BlockInterdimensionalSU();
|
|
||||||
registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su");
|
|
||||||
|
|
||||||
ADJUSTABLE_SU = new BlockAdjustableSU();
|
|
||||||
registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su");
|
|
||||||
|
|
||||||
LAPOTRONIC_SU = new BlockLapotronicSU();
|
|
||||||
registerBlock(LAPOTRONIC_SU, "lapotronic_su");
|
|
||||||
|
|
||||||
LSU_STORAGE = new BlockLSUStorage();
|
|
||||||
registerBlock(LSU_STORAGE, "lsu_storage");
|
|
||||||
|
|
||||||
DISTILLATION_TOWER = new BlockDistillationTower();
|
|
||||||
registerBlock(DISTILLATION_TOWER, "distillation_tower");
|
|
||||||
|
|
||||||
VACUUM_FREEZER = new BlockVacuumFreezer();
|
|
||||||
registerBlock(VACUUM_FREEZER, "vacuum_freezer");
|
|
||||||
|
|
||||||
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer();
|
|
||||||
registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer");
|
|
||||||
|
|
||||||
FUSION_COIL = new BlockFusionCoil();
|
|
||||||
registerBlock(FUSION_COIL, "fusion_coil");
|
|
||||||
|
|
||||||
LIGHTNING_ROD = new BlockLightningRod();
|
|
||||||
registerBlock(LIGHTNING_ROD, "lightning_rod");
|
|
||||||
|
|
||||||
INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill();
|
|
||||||
registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill");
|
|
||||||
|
|
||||||
MACHINE_FRAMES = new BlockMachineFrames();
|
|
||||||
registerBlock(MACHINE_FRAMES, ItemBlockMachineFrames.class, "machine_frame");
|
|
||||||
|
|
||||||
GRINDER = new BlockGrinder();
|
|
||||||
registerBlock(GRINDER, "grinder");
|
|
||||||
|
|
||||||
SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator();
|
|
||||||
registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator");
|
|
||||||
|
|
||||||
EXTRACTOR = new BlockExtractor();
|
|
||||||
registerBlock(EXTRACTOR, "extractor");
|
|
||||||
|
|
||||||
COMPRESSOR = new BlockCompressor();
|
|
||||||
registerBlock(COMPRESSOR, "compressor");
|
|
||||||
|
|
||||||
ELECTRIC_FURNACE = new BlockElectricFurnace();
|
|
||||||
registerBlock(ELECTRIC_FURNACE, "electric_furnace");
|
|
||||||
|
|
||||||
SOLAR_PANEL = new BlockSolarPanel();
|
|
||||||
registerBlock(SOLAR_PANEL, ItemBlockSolarPanel.class, "solar_panel");
|
|
||||||
|
|
||||||
CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel();
|
|
||||||
registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel");
|
|
||||||
|
|
||||||
WATER_MILL = new BlockWaterMill();
|
|
||||||
registerBlock(WATER_MILL, "water_mill");
|
|
||||||
|
|
||||||
WIND_MILL = new BlockWindMill();
|
|
||||||
registerBlock(WIND_MILL, "wind_mill");
|
|
||||||
|
|
||||||
RUBBER_LOG = new BlockRubberLog();
|
RUBBER_LOG = new BlockRubberLog();
|
||||||
registerBlock(RUBBER_LOG, "rubber_log");
|
registerBlock(RUBBER_LOG, "rubber_log");
|
||||||
|
|
||||||
RUBBER_PLANKS = new BlockRubberPlank();
|
|
||||||
registerBlock(RUBBER_PLANKS, "rubber_planks");
|
|
||||||
|
|
||||||
RUBBER_LOG_SLAB_HALF = new BlockRubberPlankSlab.BlockHalf("rubber_plank");
|
RUBBER_LOG_SLAB_HALF = new BlockRubberPlankSlab.BlockHalf("rubber_plank");
|
||||||
registerBlockNoItem(RUBBER_LOG_SLAB_HALF, "rubber_plank_slab");
|
registerBlockNoItem(RUBBER_LOG_SLAB_HALF, "rubber_plank_slab");
|
||||||
|
|
||||||
|
@ -312,21 +191,157 @@ public class ModBlocks {
|
||||||
RUBBER_LOG_STAIR = new BlockRubberPlankStair(RUBBER_LOG.getDefaultState(), "rubber_plank");
|
RUBBER_LOG_STAIR = new BlockRubberPlankStair(RUBBER_LOG.getDefaultState(), "rubber_plank");
|
||||||
registerBlock(RUBBER_LOG_STAIR, "rubber_plank_stair");
|
registerBlock(RUBBER_LOG_STAIR, "rubber_plank_stair");
|
||||||
|
|
||||||
RUBBER_LEAVES = new BlockRubberLeaves();
|
RUBBER_PLANKS = new BlockRubberPlank();
|
||||||
registerBlock(RUBBER_LEAVES, "rubber_leaves");
|
registerBlock(RUBBER_PLANKS, "rubber_planks");
|
||||||
|
|
||||||
RUBBER_SAPLING = new BlockRubberSapling();
|
RUBBER_SAPLING = new BlockRubberSapling();
|
||||||
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling");
|
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling");
|
||||||
|
|
||||||
REFINED_IRON_FENCE = new BlockRefinedIronFence();
|
// Machines - machines
|
||||||
registerBlock(REFINED_IRON_FENCE, "refined_iron_fence");
|
ALLOY_SMELTER = new BlockAlloySmelter();
|
||||||
|
registerBlock(ALLOY_SMELTER, "alloy_smelter");
|
||||||
|
|
||||||
REINFORCED_GLASS = new BlockReinforcedGlass();
|
ASSEMBLY_MACHINE = new BlockAssemblingMachine();
|
||||||
registerBlock(REINFORCED_GLASS, "reinforced_glass");
|
registerBlock(ASSEMBLY_MACHINE, "assembly_machine");
|
||||||
|
|
||||||
|
AUTO_CRAFTING_TABLE = new BlockAutoCraftingTable();
|
||||||
|
registerBlock(AUTO_CRAFTING_TABLE, "auto_crafting_table");
|
||||||
|
|
||||||
|
COMPRESSOR = new BlockCompressor();
|
||||||
|
registerBlock(COMPRESSOR, "compressor");
|
||||||
|
|
||||||
|
CHEMICAL_REACTOR = new BlockChemicalReactor();
|
||||||
|
registerBlock(CHEMICAL_REACTOR, "chemical_reactor");
|
||||||
|
|
||||||
|
DISTILLATION_TOWER = new BlockDistillationTower();
|
||||||
|
registerBlock(DISTILLATION_TOWER, "distillation_tower");
|
||||||
|
|
||||||
|
ELECTRIC_FURNACE = new BlockElectricFurnace();
|
||||||
|
registerBlock(ELECTRIC_FURNACE, "electric_furnace");
|
||||||
|
|
||||||
|
EXTRACTOR = new BlockExtractor();
|
||||||
|
registerBlock(EXTRACTOR, "extractor");
|
||||||
|
|
||||||
|
FLUID_REPLICATOR = new BlockFluidReplicator();
|
||||||
|
registerBlock(FLUID_REPLICATOR, "fluid_replicator");
|
||||||
|
|
||||||
|
GRINDER = new BlockGrinder();
|
||||||
|
registerBlock(GRINDER, "grinder");
|
||||||
|
|
||||||
|
IMPLOSION_COMPRESSOR = new BlockImplosionCompressor();
|
||||||
|
registerBlock(IMPLOSION_COMPRESSOR, "implosion_compressor");
|
||||||
|
|
||||||
|
INDUSTRIAL_BLAST_FURNACE = new BlockIndustrialBlastFurnace();
|
||||||
|
registerBlock(INDUSTRIAL_BLAST_FURNACE, "industrial_blast_furnace");
|
||||||
|
|
||||||
|
INDUSTRIAL_CENTRIFUGE = new BlockIndustrialCentrifuge();
|
||||||
|
registerBlock(INDUSTRIAL_CENTRIFUGE, "industrial_centrifuge");
|
||||||
|
|
||||||
|
INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer();
|
||||||
|
registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer");
|
||||||
|
|
||||||
|
INDUSTRIAL_GRINDER = new BlockIndustrialGrinder();
|
||||||
|
registerBlock(INDUSTRIAL_GRINDER, "industrial_grinder");
|
||||||
|
|
||||||
|
INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill();
|
||||||
|
registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill");
|
||||||
|
|
||||||
|
IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace();
|
||||||
|
registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace");
|
||||||
|
|
||||||
|
IRON_FURNACE = new BlockIronFurnace();
|
||||||
|
registerBlock(IRON_FURNACE, "iron_furnace");
|
||||||
|
|
||||||
|
MATTER_FABRICATOR = new BlockMatterFabricator();
|
||||||
|
registerBlock(MATTER_FABRICATOR, "matter_fabricator");
|
||||||
|
|
||||||
RECYCLER = new BlockRecycler();
|
RECYCLER = new BlockRecycler();
|
||||||
registerBlock(RECYCLER, "recycler");
|
registerBlock(RECYCLER, "recycler");
|
||||||
|
|
||||||
|
ROLLING_MACHINE = new BlockRollingMachine();
|
||||||
|
registerBlock(ROLLING_MACHINE, "rolling_machine");
|
||||||
|
|
||||||
|
SCRAPBOXINATOR = new BlockScrapboxinator();
|
||||||
|
registerBlock(SCRAPBOXINATOR, "scrapboxinator");
|
||||||
|
|
||||||
|
VACUUM_FREEZER = new BlockVacuumFreezer();
|
||||||
|
registerBlock(VACUUM_FREEZER, "vacuum_freezer");
|
||||||
|
|
||||||
|
// Machines - generators
|
||||||
|
CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel();
|
||||||
|
registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel");
|
||||||
|
|
||||||
|
DIESEL_GENERATOR = new BlockDieselGenerator();
|
||||||
|
registerBlock(DIESEL_GENERATOR, "diesel_generator");
|
||||||
|
|
||||||
|
DRAGON_EGG_SYPHON = new BlockDragonEggSyphon();
|
||||||
|
registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon");
|
||||||
|
|
||||||
|
FUSION_COIL = new BlockFusionCoil();
|
||||||
|
registerBlock(FUSION_COIL, "fusion_coil");
|
||||||
|
|
||||||
|
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer();
|
||||||
|
registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer");
|
||||||
|
|
||||||
|
GAS_TURBINE = new BlockGasTurbine();
|
||||||
|
registerBlock(GAS_TURBINE, "gas_turbine");
|
||||||
|
|
||||||
|
LIGHTNING_ROD = new BlockLightningRod();
|
||||||
|
registerBlock(LIGHTNING_ROD, "lightning_rod");
|
||||||
|
|
||||||
|
PLASMA_GENERATOR = new BlockPlasmaGenerator();
|
||||||
|
registerBlock(PLASMA_GENERATOR, "plasma_generator");
|
||||||
|
|
||||||
|
SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator();
|
||||||
|
registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator");
|
||||||
|
|
||||||
|
SOLAR_PANEL = new BlockSolarPanel();
|
||||||
|
registerBlock(SOLAR_PANEL, ItemBlockSolarPanel.class, "solar_panel");
|
||||||
|
|
||||||
|
SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator();
|
||||||
|
registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator");
|
||||||
|
|
||||||
|
THERMAL_GENERATOR = new BlockThermalGenerator();
|
||||||
|
registerBlock(THERMAL_GENERATOR, "thermal_generator");
|
||||||
|
|
||||||
|
WATER_MILL = new BlockWaterMill();
|
||||||
|
registerBlock(WATER_MILL, "water_mill");
|
||||||
|
|
||||||
|
WIND_MILL = new BlockWindMill();
|
||||||
|
registerBlock(WIND_MILL, "wind_mill");
|
||||||
|
|
||||||
|
// Machines - storage
|
||||||
|
CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest();
|
||||||
|
registerBlock(CREATIVE_QUANTUM_CHEST, ItemBlockQuantumChest.class, "creative_quantum_chest");
|
||||||
|
|
||||||
|
CREATIVE_QUANTUM_TANK = new BlockCreativeQuantumTank();
|
||||||
|
registerBlock(CREATIVE_QUANTUM_TANK, ItemBlockQuantumTank.class, "creative_quantum_tank");
|
||||||
|
|
||||||
|
DIGITAL_CHEST = new BlockDigitalChest();
|
||||||
|
registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest");
|
||||||
|
|
||||||
|
QUANTUM_CHEST = new BlockQuantumChest();
|
||||||
|
registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest");
|
||||||
|
|
||||||
|
QUANTUM_TANK = new BlockQuantumTank();
|
||||||
|
registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank");
|
||||||
|
|
||||||
|
// Machines - energy storage & transformers
|
||||||
|
ADJUSTABLE_SU = new BlockAdjustableSU();
|
||||||
|
registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su");
|
||||||
|
|
||||||
|
CHARGE_O_MAT = new BlockChargeOMat();
|
||||||
|
registerBlock(CHARGE_O_MAT, "charge_o_mat");
|
||||||
|
|
||||||
|
INTERDIMENSIONAL_SU = new BlockInterdimensionalSU();
|
||||||
|
registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su");
|
||||||
|
|
||||||
|
LAPOTRONIC_SU = new BlockLapotronicSU();
|
||||||
|
registerBlock(LAPOTRONIC_SU, "lapotronic_su");
|
||||||
|
|
||||||
|
LSU_STORAGE = new BlockLSUStorage();
|
||||||
|
registerBlock(LSU_STORAGE, "lsu_storage");
|
||||||
|
|
||||||
LOW_VOLTAGE_SU = new BlockLowVoltageSU();
|
LOW_VOLTAGE_SU = new BlockLowVoltageSU();
|
||||||
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
|
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
|
||||||
|
|
||||||
|
@ -345,23 +360,12 @@ public class ModBlocks {
|
||||||
HV_TRANSFORMER = new BlockHVTransformer();
|
HV_TRANSFORMER = new BlockHVTransformer();
|
||||||
registerBlock(HV_TRANSFORMER, "hv_transformer");
|
registerBlock(HV_TRANSFORMER, "hv_transformer");
|
||||||
|
|
||||||
AUTO_CRAFTING_TABLE = new BlockAutoCraftingTable();
|
// Machines - misc
|
||||||
registerBlock(AUTO_CRAFTING_TABLE, "auto_crafting_table");
|
ALARM = new BlockAlarm();
|
||||||
|
registerBlock(ALARM, "alarm");
|
||||||
|
|
||||||
IRON_FURNACE = new BlockIronFurnace();
|
CHUNK_LOADER = new BlockChunkLoader();
|
||||||
registerBlock(IRON_FURNACE, "iron_furnace");
|
registerBlock(CHUNK_LOADER, "chunk_loader");
|
||||||
|
|
||||||
NUKE = new BlockNuke();
|
|
||||||
registerBlock(NUKE, "nuke");
|
|
||||||
|
|
||||||
SCRAPBOXINATOR = new BlockScrapboxinator();
|
|
||||||
registerBlock(SCRAPBOXINATOR, "scrapboxinator");
|
|
||||||
|
|
||||||
COMPUTER_CUBE = new BlockComputerCube();
|
|
||||||
registerBlock(COMPUTER_CUBE, "computer_cube");
|
|
||||||
|
|
||||||
PLASMA_GENERATOR = new BlockPlasmaGenerator();
|
|
||||||
registerBlock(PLASMA_GENERATOR, "plasma_generator");
|
|
||||||
|
|
||||||
LAMP_INCANDESCENT = new BlockLamp( 14, 4, 0.625, 0.25);
|
LAMP_INCANDESCENT = new BlockLamp( 14, 4, 0.625, 0.25);
|
||||||
registerBlock(LAMP_INCANDESCENT, "lamp_incandescent");
|
registerBlock(LAMP_INCANDESCENT, "lamp_incandescent");
|
||||||
|
@ -369,11 +373,16 @@ public class ModBlocks {
|
||||||
LAMP_LED = new BlockLamp( 15, 1, 0.0625, 0.125);
|
LAMP_LED = new BlockLamp( 15, 1, 0.0625, 0.125);
|
||||||
registerBlock(LAMP_LED, "lamp_led");
|
registerBlock(LAMP_LED, "lamp_led");
|
||||||
|
|
||||||
ALARM = new BlockAlarm();
|
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber();
|
||||||
registerBlock(ALARM, "alarm");
|
registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber");
|
||||||
|
|
||||||
|
MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter();
|
||||||
|
registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter");
|
||||||
|
|
||||||
|
PLAYER_DETECTOR = new BlockPlayerDetector();
|
||||||
|
registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector");
|
||||||
|
|
||||||
|
|
||||||
FLUID_REPLICATOR = new BlockFluidReplicator();
|
|
||||||
registerBlock(FLUID_REPLICATOR, "fluid_replicator");
|
|
||||||
|
|
||||||
//TODO enable when done
|
//TODO enable when done
|
||||||
// flare = new BlockFlare();
|
// flare = new BlockFlare();
|
||||||
|
@ -384,7 +393,6 @@ public class ModBlocks {
|
||||||
// GameRegistry.register(itemBlock);
|
// GameRegistry.register(itemBlock);
|
||||||
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
|
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
|
||||||
|
|
||||||
registerOreDict();
|
|
||||||
Core.logHelper.info("TechReborns Blocks Loaded");
|
Core.logHelper.info("TechReborns Blocks Loaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -422,64 +430,4 @@ public class ModBlocks {
|
||||||
block.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
block.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
||||||
RebornRegistry.registerBlockNoItem(block, new ResourceLocation(ModInfo.MOD_ID, name));
|
RebornRegistry.registerBlockNoItem(block, new ResourceLocation(ModInfo.MOD_ID, name));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Register ores and ore blocks
|
|
||||||
*/
|
|
||||||
public static void registerOreDict() {
|
|
||||||
// TODO: Fix block
|
|
||||||
// for (String ore : BlockOre.ores) {
|
|
||||||
// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore));
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver"));
|
|
||||||
// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum"));
|
|
||||||
// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum"));
|
|
||||||
// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium"));
|
|
||||||
// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome"));
|
|
||||||
// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel"));
|
|
||||||
// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass"));
|
|
||||||
// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead"));
|
|
||||||
// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum"));
|
|
||||||
// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc"));
|
|
||||||
// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum"));
|
|
||||||
// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten"));
|
|
||||||
// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel"));
|
|
||||||
// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar"));
|
|
||||||
// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium"));
|
|
||||||
// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze"));
|
|
||||||
// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1));
|
|
||||||
// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1));
|
|
||||||
// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1));
|
|
||||||
// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1));
|
|
||||||
// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1));
|
|
||||||
// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1));
|
|
||||||
// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1));
|
|
||||||
// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1));
|
|
||||||
|
|
||||||
OreUtil.registerOre("craftingPiston", Blocks.PISTON);
|
|
||||||
OreUtil.registerOre("craftingPiston", Blocks.STICKY_PISTON);
|
|
||||||
OreUtil.registerOre("crafterWood", Blocks.CRAFTING_TABLE);
|
|
||||||
OreUtil.registerOre("machineBasic", new ItemStack(MACHINE_FRAMES, 1));
|
|
||||||
|
|
||||||
OreUtil.registerOre("treeSapling", RUBBER_SAPLING);
|
|
||||||
OreUtil.registerOre("saplingRubber", RUBBER_SAPLING);
|
|
||||||
OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
|
||||||
|
|
||||||
OreUtil.registerOre("fenceIron", REFINED_IRON_FENCE);
|
|
||||||
|
|
||||||
OreUtil.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("basic", 1));
|
|
||||||
OreUtil.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advanced", 1));
|
|
||||||
OreUtil.registerOre("machineBlockHighlyAdvanced", BlockMachineFrames.getFrameByName("highly_advanced", 1));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import reborncore.common.util.OreUtil;
|
import reborncore.common.util.OreUtil;
|
||||||
import techreborn.blocks.BlockMachineFrames;
|
|
||||||
import techreborn.blocks.cable.BlockCable;
|
import techreborn.blocks.cable.BlockCable;
|
||||||
|
|
||||||
public class OreDict {
|
public class OreDict {
|
||||||
|
@ -40,11 +39,27 @@ public class OreDict {
|
||||||
"iridium_alloy" //Iridium alloy is plate itself
|
"iridium_alloy" //Iridium alloy is plate itself
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register blocks and items
|
||||||
|
*/
|
||||||
public static void init() {
|
public static void init() {
|
||||||
// Blocks
|
// Blocks
|
||||||
OreUtil.registerOre("fenceIron", ModBlocks.REFINED_IRON_FENCE);
|
OreUtil.registerOre("fenceIron", ModBlocks.REFINED_IRON_FENCE);
|
||||||
OreUtil.registerOre("woodRubber", ModBlocks.RUBBER_LOG);
|
OreUtil.registerOre("woodRubber", ModBlocks.RUBBER_LOG);
|
||||||
OreUtil.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS);
|
OreUtil.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS);
|
||||||
|
OreUtil.registerOre("treeSapling", ModBlocks.RUBBER_SAPLING);
|
||||||
|
OreUtil.registerOre("saplingRubber", ModBlocks.RUBBER_SAPLING);
|
||||||
|
|
||||||
|
// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
// OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
// OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
// OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
// OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
// OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
// OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Parts
|
// Parts
|
||||||
OreUtil.registerOre("circuitBasic", TRIngredients.Parts.CIRCUIT_BASIC.getStack());
|
OreUtil.registerOre("circuitBasic", TRIngredients.Parts.CIRCUIT_BASIC.getStack());
|
||||||
|
@ -60,9 +75,10 @@ public class OreDict {
|
||||||
OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack());
|
OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack());
|
||||||
|
|
||||||
// Frames
|
// Frames
|
||||||
OreUtil.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("machine", 1));
|
OreUtil.registerOre("machineBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
||||||
OreUtil.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advancedMachine", 1));
|
OreUtil.registerOre("machineBlockBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
||||||
OreUtil.registerOre("machineBlockElite", BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1));
|
OreUtil.registerOre("machineBlockAdvanced", new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
|
||||||
|
OreUtil.registerOre("machineBlockElite", new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
|
||||||
|
|
||||||
// Tools&Armor
|
// Tools&Armor
|
||||||
OreUtil.registerOre("reBattery", TRItems.RE_BATTERY);
|
OreUtil.registerOre("reBattery", TRItems.RE_BATTERY);
|
||||||
|
@ -73,15 +89,48 @@ public class OreDict {
|
||||||
|
|
||||||
// Misc
|
// Misc
|
||||||
OreUtil.registerOre("industrialTnt", Blocks.TNT);
|
OreUtil.registerOre("industrialTnt", Blocks.TNT);
|
||||||
|
OreUtil.registerOre("craftingPiston", Blocks.PISTON);
|
||||||
|
OreUtil.registerOre("craftingPiston", Blocks.STICKY_PISTON);
|
||||||
|
OreUtil.registerOre("crafterWood", Blocks.CRAFTING_TABLE);
|
||||||
OreUtil.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
|
OreUtil.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
|
||||||
OreUtil.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold"));
|
|
||||||
OreUtil.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
|
OreUtil.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
|
||||||
|
OreUtil.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold"));
|
||||||
OreUtil.registerOre("pulpWood", TRIngredients.Dusts.SAW.getStack());
|
OreUtil.registerOre("pulpWood", TRIngredients.Dusts.SAW.getStack());
|
||||||
|
|
||||||
//OreUtil.registerOre("uran235", nothing);
|
//OreUtil.registerOre("uran235", nothing);
|
||||||
//OreUtil.registerOre("uran238", nothing);
|
//OreUtil.registerOre("uran238", nothing);
|
||||||
//OreUtil.registerOre("smallUran235", nothing);
|
//OreUtil.registerOre("smallUran235", nothing);
|
||||||
|
|
||||||
|
// for (String ore : BlockOre.ores) {
|
||||||
|
// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore));
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver"));
|
||||||
|
// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum"));
|
||||||
|
// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum"));
|
||||||
|
// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium"));
|
||||||
|
// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome"));
|
||||||
|
// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel"));
|
||||||
|
// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass"));
|
||||||
|
// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead"));
|
||||||
|
// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum"));
|
||||||
|
// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc"));
|
||||||
|
// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum"));
|
||||||
|
// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten"));
|
||||||
|
// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel"));
|
||||||
|
// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar"));
|
||||||
|
// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium"));
|
||||||
|
// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze"));
|
||||||
|
// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1));
|
||||||
|
// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1));
|
||||||
|
// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1));
|
||||||
|
// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1));
|
||||||
|
// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1));
|
||||||
|
// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1));
|
||||||
|
// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1));
|
||||||
|
// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1));
|
||||||
|
|
||||||
|
|
||||||
// TODO: fix recipe
|
// TODO: fix recipe
|
||||||
// for (String type : ItemGems.types) {
|
// for (String type : ItemGems.types) {
|
||||||
|
|
|
@ -26,13 +26,13 @@ package techreborn.init;
|
||||||
|
|
||||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import reborncore.RebornRegistry;
|
import reborncore.RebornRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import reborncore.common.util.BucketHandler;
|
import reborncore.common.util.BucketHandler;
|
||||||
import techreborn.Core;
|
import techreborn.Core;
|
||||||
import techreborn.api.Reference;
|
import techreborn.api.Reference;
|
||||||
import techreborn.blocks.BlockMachineFrames;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.events.TRRecipeHandler;
|
import techreborn.events.TRRecipeHandler;
|
||||||
import techreborn.items.*;
|
import techreborn.items.*;
|
||||||
|
@ -317,8 +317,9 @@ public class TRItems {
|
||||||
}
|
}
|
||||||
Core.logHelper.info("TechReborns Items Loaded");
|
Core.logHelper.info("TechReborns Items Loaded");
|
||||||
|
|
||||||
BlockMachineBase.advancedFrameStack = BlockMachineFrames.getFrameByName("advanced", 1);
|
// TODO: do we need this at all?
|
||||||
BlockMachineBase.basicFrameStack = BlockMachineFrames.getFrameByName("basic", 1);
|
BlockMachineBase.advancedFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED);
|
||||||
|
BlockMachineBase.basicFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void registerItem(Item item, String name) {
|
public static void registerItem(Item item, String name) {
|
||||||
|
|
|
@ -62,8 +62,8 @@ public abstract class RecipeMethods {
|
||||||
// return ItemParts.getPartByName(name, count);
|
// return ItemParts.getPartByName(name, count);
|
||||||
} else if (type == Type.CABLE) {
|
} else if (type == Type.CABLE) {
|
||||||
return BlockCable.getCableByName(name, count);
|
return BlockCable.getCableByName(name, count);
|
||||||
} else if (type == Type.MACHINE_FRAME) {
|
// } else if (type == Type.MACHINE_FRAME) {
|
||||||
return BlockMachineFrames.getFrameByName(name, count);
|
// return BlockMachineFrames.getFrameByName(name, count);
|
||||||
} else if (type == Type.MACHINE_CASING) {
|
} else if (type == Type.MACHINE_CASING) {
|
||||||
return BlockMachineCasing.getStackByName(name, count);
|
return BlockMachineCasing.getStackByName(name, count);
|
||||||
// } else if (type == Type.UPGRADE) {
|
// } else if (type == Type.UPGRADE) {
|
||||||
|
|
|
@ -1,38 +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.itemblocks;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import reborncore.common.itemblock.ItemBlockBase;
|
|
||||||
import techreborn.blocks.BlockMachineFrames;
|
|
||||||
import techreborn.init.ModBlocks;
|
|
||||||
|
|
||||||
public class ItemBlockMachineFrames extends ItemBlockBase {
|
|
||||||
|
|
||||||
public ItemBlockMachineFrames(Block block) {
|
|
||||||
super(ModBlocks.MACHINE_FRAMES, ModBlocks.MACHINE_FRAMES, BlockMachineFrames.types);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -119,7 +119,7 @@ public class TileChargeOMat extends TilePowerAcceptor
|
||||||
|
|
||||||
// ItemHandlerProvider
|
// ItemHandlerProvider
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileChargeOMat> getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, Ite
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileChunkLoader> getInventory() {
|
||||||
return this.inventory;
|
return this.inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
|
||||||
|
|
||||||
// ItemHandlerProvider
|
// ItemHandlerProvider
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileQuantumTank> getInventory() {
|
||||||
return this.inventory;
|
return this.inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -364,7 +364,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor
|
||||||
|
|
||||||
// ItemHandlerProvider
|
// ItemHandlerProvider
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileFusionControlComputer> getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor
|
||||||
|
|
||||||
// ItemHandlerProvider
|
// ItemHandlerProvider
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileDragonEggSyphon> getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,7 +151,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileSolidFuelGenerator> getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,10 +25,8 @@
|
||||||
package techreborn.tiles.multiblock;
|
package techreborn.tiles.multiblock;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
|
||||||
import reborncore.common.recipes.RecipeCrafter;
|
import reborncore.common.recipes.RecipeCrafter;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegistry;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
|
@ -134,6 +132,13 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TileLegacyMachineBase
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public Tank getTank() {
|
||||||
|
return tank;
|
||||||
|
}
|
||||||
|
|
||||||
// IContainerProvider
|
// IContainerProvider
|
||||||
@Override
|
@Override
|
||||||
public BuiltContainer createContainer(EntityPlayer player) {
|
public BuiltContainer createContainer(EntityPlayer player) {
|
||||||
|
@ -142,10 +147,4 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
|
||||||
.outputSlot(2, 124, 55).energySlot(3, 8, 72).syncEnergyValue().syncCrafterValue().addInventory()
|
.outputSlot(2, 124, 55).energySlot(3, 8, 72).syncEnergyValue().syncCrafterValue().addInventory()
|
||||||
.create(this);
|
.create(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public Tank getTank() {
|
|
||||||
return tank;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,6 @@ import net.minecraft.block.BlockLiquid;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
@ -49,7 +48,6 @@ import techreborn.client.container.IContainerProvider;
|
||||||
import techreborn.client.container.builder.BuiltContainer;
|
import techreborn.client.container.builder.BuiltContainer;
|
||||||
import techreborn.client.container.builder.ContainerBuilder;
|
import techreborn.client.container.builder.ContainerBuilder;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.init.TRIngredients;
|
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
import techreborn.tiles.TileGenericMachine;
|
import techreborn.tiles.TileGenericMachine;
|
||||||
|
|
||||||
|
@ -92,6 +90,15 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
|
||||||
return down && center && blade && up;
|
return down && center && blade && up;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static IInventoryAccess<TileIndustrialGrinder> getInventoryAccess(){
|
||||||
|
return (slotID, stack, face, direction, tile) -> {
|
||||||
|
if(slotID == 1){
|
||||||
|
return stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// TilePowerAcceptor
|
// TilePowerAcceptor
|
||||||
@Override
|
@Override
|
||||||
public void update() {
|
public void update() {
|
||||||
|
@ -130,13 +137,11 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
|
||||||
return tagCompound;
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IInventoryAccess<TileIndustrialGrinder> getInventoryAccess(){
|
// TileLegacyMachineBase
|
||||||
return (slotID, stack, face, direction, tile) -> {
|
@Nullable
|
||||||
if(slotID == 1){
|
@Override
|
||||||
return stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
|
public Tank getTank() {
|
||||||
}
|
return tank;
|
||||||
return true;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// IContainerProvider
|
// IContainerProvider
|
||||||
|
@ -195,10 +200,4 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public Tank getTank() {
|
|
||||||
return tank;
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -28,10 +28,8 @@ import net.minecraft.block.BlockLiquid;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.EnumFacing;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraftforge.fluids.FluidStack;
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import net.minecraftforge.fluids.IFluidBlock;
|
import net.minecraftforge.fluids.IFluidBlock;
|
||||||
|
@ -52,8 +50,6 @@ import techreborn.client.container.builder.ContainerBuilder;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
import techreborn.tiles.TileGenericMachine;
|
import techreborn.tiles.TileGenericMachine;
|
||||||
import techreborn.tiles.tier1.TileAutoCraftingTable;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegistry(modID = ModInfo.MOD_ID)
|
||||||
|
@ -118,6 +114,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
|
||||||
tank.compareAndUpdate();
|
tank.compareAndUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TilePowerAcceptor
|
||||||
@Override
|
@Override
|
||||||
public void readFromNBT(final NBTTagCompound tagCompound) {
|
public void readFromNBT(final NBTTagCompound tagCompound) {
|
||||||
super.readFromNBT(tagCompound);
|
super.readFromNBT(tagCompound);
|
||||||
|
@ -131,6 +128,13 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
|
||||||
return tagCompound;
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TileLegacyMachineBase
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public Tank getTank() {
|
||||||
|
return tank;
|
||||||
|
}
|
||||||
|
|
||||||
private static IInventoryAccess<TileIndustrialSawmill> getInventoryAccess(){
|
private static IInventoryAccess<TileIndustrialSawmill> getInventoryAccess(){
|
||||||
return (slotID, stack, face, direction, tile) -> {
|
return (slotID, stack, face, direction, tile) -> {
|
||||||
if(direction == IInventoryAccess.AccessDirection.INSERT){
|
if(direction == IInventoryAccess.AccessDirection.INSERT){
|
||||||
|
@ -195,10 +199,4 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public Tank getTank() {
|
|
||||||
return tank;
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -44,7 +44,7 @@ import techreborn.blocks.storage.BlockEnergyStorage;
|
||||||
public class TileEnergyStorage extends TilePowerAcceptor
|
public class TileEnergyStorage extends TilePowerAcceptor
|
||||||
implements IToolDrop, ItemHandlerProvider {
|
implements IToolDrop, ItemHandlerProvider {
|
||||||
|
|
||||||
public Inventory inventory;
|
public Inventory<TileEnergyStorage> inventory;
|
||||||
public String name;
|
public String name;
|
||||||
public Block wrenchDrop;
|
public Block wrenchDrop;
|
||||||
public EnumPowerTier tier;
|
public EnumPowerTier tier;
|
||||||
|
@ -141,7 +141,7 @@ public class TileEnergyStorage extends TilePowerAcceptor
|
||||||
|
|
||||||
// ItemHandlerProvider
|
// ItemHandlerProvider
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileEnergyStorage> getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -305,7 +305,7 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileIronAlloyFurnace> getInventory() {
|
||||||
return this.inventory;
|
return this.inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||||
import net.minecraft.tileentity.TileEntityFurnace;
|
import net.minecraft.tileentity.TileEntityFurnace;
|
||||||
import net.minecraft.util.EnumFacing;
|
|
||||||
import reborncore.api.tile.ItemHandlerProvider;
|
import reborncore.api.tile.ItemHandlerProvider;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import reborncore.common.tile.TileLegacyMachineBase;
|
import reborncore.common.tile.TileLegacyMachineBase;
|
||||||
|
@ -166,7 +165,7 @@ public class TileIronFurnace extends TileLegacyMachineBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileIronFurnace> getInventory() {
|
||||||
return this.inventory;
|
return this.inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,6 @@ import reborncore.api.tile.ItemHandlerProvider;
|
||||||
import reborncore.common.powerSystem.TilePowerAcceptor;
|
import reborncore.common.powerSystem.TilePowerAcceptor;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegistry;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import reborncore.common.tile.TileLegacyMachineBase;
|
|
||||||
import reborncore.common.util.IInventoryAccess;
|
import reborncore.common.util.IInventoryAccess;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
|
|
|
@ -209,7 +209,7 @@ public class TileElectricFurnace extends TilePowerAcceptor
|
||||||
|
|
||||||
// ItemHandlerProvider
|
// ItemHandlerProvider
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileElectricFurnace> getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class TileRecycler extends TilePowerAcceptor
|
||||||
@ConfigRegistry(config = "machines", category = "recycler", key = "RecyclerMaxEnergy", comment = "Recycler Max Energy (Value in EU)")
|
@ConfigRegistry(config = "machines", category = "recycler", key = "RecyclerMaxEnergy", comment = "Recycler Max Energy (Value in EU)")
|
||||||
public static int maxEnergy = 1000;
|
public static int maxEnergy = 1000;
|
||||||
|
|
||||||
private final Inventory inventory = new Inventory<>(3, "TileRecycler", 64, this).withConfiguredAccess();
|
private final Inventory<TileRecycler> inventory = new Inventory<>(3, "TileRecycler", 64, this).withConfiguredAccess();
|
||||||
private final int cost = 2;
|
private final int cost = 2;
|
||||||
private final int time = 15;
|
private final int time = 15;
|
||||||
private final int chance = 6;
|
private final int chance = 6;
|
||||||
|
@ -193,7 +193,7 @@ public class TileRecycler extends TilePowerAcceptor
|
||||||
|
|
||||||
// ItemHandlerProvider
|
// ItemHandlerProvider
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileRecycler> getInventory() {
|
||||||
return this.inventory;
|
return this.inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -295,7 +295,7 @@ public class TileRollingMachine extends TilePowerAcceptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Inventory getInventory() {
|
public Inventory<TileRollingMachine> getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"display": {
|
"display": {
|
||||||
"icon": {
|
"icon": {
|
||||||
"item": "techreborn:ore"
|
"item": "techreborn:orecopper"
|
||||||
},
|
},
|
||||||
"title": {
|
"title": {
|
||||||
"translate": "itemGroup.techreborn"
|
"translate": "itemGroup.techreborn"
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
"conditions": {
|
"conditions": {
|
||||||
"items": [
|
"items": [
|
||||||
{
|
{
|
||||||
"item": "techreborn:ore2"
|
"item": "techreborn:orecopper"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
"conditions": {
|
"conditions": {
|
||||||
"items": [
|
"items": [
|
||||||
{
|
{
|
||||||
"item": "techreborn:ore2"
|
"item": "techreborn:orelead"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"forge_marker": 1,
|
||||||
|
"defaults": {
|
||||||
|
"transform": "forge:default-block",
|
||||||
|
"model": "cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "techreborn:blocks/machines/structure/tier2_machine_block"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"variants": {
|
||||||
|
"inventory": [
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"normal": [
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"forge_marker": 1,
|
||||||
|
"defaults": {
|
||||||
|
"transform": "forge:default-block",
|
||||||
|
"model": "cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "techreborn:blocks/machines/structure/tier1_machine_block"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"variants": {
|
||||||
|
"inventory": [
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"normal": [
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"forge_marker": 1,
|
||||||
|
"defaults": {
|
||||||
|
"transform": "forge:default-block",
|
||||||
|
"model": "cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "techreborn:blocks/machines/structure/tier3_machine_block"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"variants": {
|
||||||
|
"inventory": [
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"normal": [
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -53,9 +53,9 @@ tile.techreborn.extractor.name=Extractor
|
||||||
tile.techreborn.grinder.name=Grinder
|
tile.techreborn.grinder.name=Grinder
|
||||||
tile.techreborn.compressor.name=Compressor
|
tile.techreborn.compressor.name=Compressor
|
||||||
tile.techreborn.electric_furnace.name=Electric Furnace
|
tile.techreborn.electric_furnace.name=Electric Furnace
|
||||||
tile.techreborn.machine_frame.highly_advanced.name=Highly Advanced Machine Frame
|
tile.techreborn.machineblockelite.name=Highly Advanced Machine Frame
|
||||||
tile.techreborn.machine_frame.advanced.name=Advanced Machine Frame
|
tile.techreborn.machineblockadvanced.name=Advanced Machine Frame
|
||||||
tile.techreborn.machine_frame.basic.name=Basic Machine Frame
|
tile.techreborn.machineblockbasic.name=Basic Machine Frame
|
||||||
tile.techreborn.solar_panel.basic.name=Basic Solar Panel
|
tile.techreborn.solar_panel.basic.name=Basic Solar Panel
|
||||||
tile.techreborn.solar_panel.hybrid.name=Hybrid Solar Panel
|
tile.techreborn.solar_panel.hybrid.name=Hybrid Solar Panel
|
||||||
tile.techreborn.solar_panel.advanced.name=Advanced Solar Panel
|
tile.techreborn.solar_panel.advanced.name=Advanced Solar Panel
|
||||||
|
|
|
@ -126,15 +126,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockbasic",
|
||||||
"entryName": "basic_frame",
|
"entryName": "basic_frame",
|
||||||
"weight": 5,
|
"weight": 5
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -126,15 +126,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockbasic",
|
||||||
"entryName": "basic_frame",
|
"entryName": "basic_frame",
|
||||||
"weight": 5,
|
"weight": 5
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -99,15 +99,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockelite",
|
||||||
"entryName": "advanced_frame",
|
"entryName": "highly_advanced_frame",
|
||||||
"weight": 30,
|
"weight": 30
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 2
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -126,15 +126,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockbasic",
|
||||||
"entryName": "basic_frame",
|
"entryName": "basic_frame",
|
||||||
"weight": 5,
|
"weight": 5
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -126,15 +126,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockbasic",
|
||||||
"entryName": "basic_frame",
|
"entryName": "basic_frame",
|
||||||
"weight": 5,
|
"weight": 5
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -114,15 +114,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockadvanced",
|
||||||
"entryName": "reinforced_frame",
|
"entryName": "reinforced_frame",
|
||||||
"weight": 30,
|
"weight": 30
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 1
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -126,15 +126,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockbasic",
|
||||||
"entryName": "basic_frame",
|
"entryName": "basic_frame",
|
||||||
"weight": 5,
|
"weight": 5
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -114,15 +114,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockadvanced",
|
||||||
"entryName": "reinforced_frame",
|
"entryName": "reinforced_frame",
|
||||||
"weight": 30,
|
"weight": 30
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 1
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -114,15 +114,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockadvanced",
|
||||||
"entryName": "reinforced_frame",
|
"entryName": "reinforced_frame",
|
||||||
"weight": 30,
|
"weight": 30
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 1
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -114,15 +114,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockadvanced",
|
||||||
"entryName": "reinforced_frame",
|
"entryName": "reinforced_frame",
|
||||||
"weight": 30,
|
"weight": 30
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 1
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -126,15 +126,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockbasic",
|
||||||
"entryName": "basic_frame",
|
"entryName": "basic_frame",
|
||||||
"weight": 5,
|
"weight": 5
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
|
@ -99,15 +99,9 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
"name": "techreborn:machine_frame",
|
"name": "techreborn:machineblockelite",
|
||||||
"entryName": "advanced_frame",
|
"entryName": "advanced_frame",
|
||||||
"weight": 30,
|
"weight": 30
|
||||||
"functions": [
|
|
||||||
{
|
|
||||||
"function": "set_data",
|
|
||||||
"data": 2
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "item",
|
||||||
|
|
Loading…
Add table
Reference in a new issue