Blocks moved to TRContent

This commit is contained in:
drcrazy 2018-09-24 15:45:48 +03:00
parent 9f9595f955
commit dd94ff31c9
69 changed files with 614 additions and 603 deletions

View file

@ -121,7 +121,7 @@ public class TechReborn {
CommonProxy.isChiselAround = Loader.isModLoaded("ctm"); CommonProxy.isChiselAround = Loader.isModLoaded("ctm");
TechRebornAPI.subItemRetriever = new SubItemRetriever(); TechRebornAPI.subItemRetriever = new SubItemRetriever();
// Registration // Registration
TRBlocks.init(); TRContent.registerBlocks();
TRTileEntities.init(); TRTileEntities.init();
ModFluids.init(); ModFluids.init();
TRContent.registerItems(); TRContent.registerItems();

View file

@ -52,7 +52,7 @@ public class FluidReplicatorRecipeCrafter extends RecipeCrafter {
* @param inputSlots This is the list of the slots that the crafting logic should look for the input UU-Matter. * @param inputSlots This is the list of the slots that the crafting logic should look for the input UU-Matter.
* @param outputSlots This is the list of slots that the crafting logic should look for output fluid * @param outputSlots This is the list of slots that the crafting logic should look for output fluid
*/ */
public FluidReplicatorRecipeCrafter(TileEntity parentTile, Inventory inventory, int[] inputSlots, int[] outputSlots) { public FluidReplicatorRecipeCrafter(TileEntity parentTile, Inventory<?> inventory, int[] inputSlots, int[] outputSlots) {
super(Reference.FLUID_REPLICATOR_RECIPE, parentTile, 1, 1, inventory, inputSlots, outputSlots); super(Reference.FLUID_REPLICATOR_RECIPE, parentTile, 1, 1, inventory, inputSlots, outputSlots);
} }

View file

@ -39,8 +39,8 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.TechRebornCreativeTab;
public class BlockComputerCube extends BlockMachineBase { public class BlockComputerCube extends BlockMachineBase {
@ -65,7 +65,7 @@ public class BlockComputerCube extends BlockMachineBase {
if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) { if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) {
if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) { if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) {
if (playerIn.isSneaking()) { if (playerIn.isSneaking()) {
ItemStack drop = new ItemStack(TRBlocks.COMPUTER_CUBE, 1); ItemStack drop = new ItemStack(TRContent.COMPUTER_CUBE, 1);
spawnAsEntity(worldIn, pos, drop); spawnAsEntity(worldIn, pos, drop);
worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE, worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE,
SoundCategory.BLOCKS, 0.6F, 1F); SoundCategory.BLOCKS, 0.6F, 1F);

View file

@ -43,8 +43,8 @@ import reborncore.api.ToolManager;
import reborncore.client.models.ModelCompound; import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -68,7 +68,7 @@ public class BlockFusionCoil extends Block {
if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) { if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) {
if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) { if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) {
if (playerIn.isSneaking()) { if (playerIn.isSneaking()) {
ItemStack drop = new ItemStack(TRBlocks.FUSION_COIL, 1); ItemStack drop = new ItemStack(TRContent.FUSION_COIL, 1);
spawnAsEntity(worldIn, pos, drop); spawnAsEntity(worldIn, pos, drop);
worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE, worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE,
SoundCategory.BLOCKS, 0.6F, 1F); SoundCategory.BLOCKS, 0.6F, 1F);

View file

@ -40,7 +40,7 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.Torus; import reborncore.common.util.Torus;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.TechRebornCreativeTab;
import techreborn.utils.damageSources.FusionDamageSource; import techreborn.utils.damageSources.FusionDamageSource;
@ -60,7 +60,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
final EntityPlayer player, final EnumHand hand, final EnumFacing side, final EntityPlayer player, final EnumHand hand, final EnumFacing side,
final float hitX, final float hitY, final float hitZ) { final float hitX, final float hitY, final float hitZ) {
final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world.getTileEntity(pos); final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world.getTileEntity(pos);
if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(TRBlocks.FUSION_COIL)){ if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(TRContent.FUSION_COIL)){
List<BlockPos> coils = Torus.generate(tileFusionControlComputer.getPos(), tileFusionControlComputer.size); List<BlockPos> coils = Torus.generate(tileFusionControlComputer.getPos(), tileFusionControlComputer.size);
boolean placed = false; boolean placed = false;
for(BlockPos coil : coils){ for(BlockPos coil : coils){
@ -68,7 +68,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
return true; return true;
} }
if(world.isAirBlock(coil) && !tileFusionControlComputer.isCoil(coil)){ if(world.isAirBlock(coil) && !tileFusionControlComputer.isCoil(coil)){
world.setBlockState(coil, TRBlocks.FUSION_COIL.getDefaultState()); world.setBlockState(coil, TRContent.FUSION_COIL.getDefaultState());
if(!player.isCreative()){ if(!player.isCreative()){
player.getHeldItem(hand).shrink(1); player.getHeldItem(hand).shrink(1);
} }

View file

@ -41,7 +41,7 @@ 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 techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
@ -126,7 +126,7 @@ public class BlockRubberLeaves extends BlockLeaves {
@Override @Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) { public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(TRBlocks.RUBBER_SAPLING); return Item.getItemFromBlock(TRContent.RUBBER_SAPLING);
} }
@Override @Override

View file

@ -57,7 +57,7 @@ import reborncore.common.util.ArrayUtils;
import reborncore.common.util.ChatUtils; import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils; import reborncore.common.util.StringUtils;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.utils.MessageIDs; import techreborn.utils.MessageIDs;
import techreborn.tiles.machine.tier1.TilePlayerDectector; import techreborn.tiles.machine.tier1.TilePlayerDectector;
import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.TechRebornCreativeTab;
@ -176,7 +176,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
// Block // Block
@Override @Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(TRBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE))); return new ItemStack(TRContent.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE)));
} }
@Override @Override

View file

@ -31,7 +31,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoader;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent; import techreborn.init.TRContent;
public class RegisterItemJsons { public class RegisterItemJsons {
@ -119,11 +118,11 @@ public class RegisterItemJsons {
registerBlockstateMultiItem(TRContent.BRONZE_HOE, "bronze_hoe", "items/tool"); registerBlockstateMultiItem(TRContent.BRONZE_HOE, "bronze_hoe", "items/tool");
} }
register(TRBlocks.RUBBER_SAPLING, "misc/rubber_sapling"); register(TRContent.RUBBER_SAPLING, "misc/rubber_sapling");
} }
private static void registerBlocks() { private static void registerBlocks() {
register(TRBlocks.REFINED_IRON_FENCE, "iron_fence"); register(TRContent.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) {

View file

@ -37,7 +37,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.Torus; import reborncore.common.util.Torus;
import techreborn.client.gui.widget.GuiButtonHologram; import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.client.gui.widget.GuiButtonUpDown; import techreborn.client.gui.widget.GuiButtonUpDown;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.packets.PacketFusionControlSize; import techreborn.packets.PacketFusionControlSize;
import techreborn.proxies.ClientProxy; import techreborn.proxies.ClientProxy;
import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.tiles.fusionReactor.TileFusionControlComputer;
@ -150,7 +150,7 @@ public class GuiFusionReactor extends GuiBase {
private void updateMultiBlockRender(){ private void updateMultiBlockRender(){
final Multiblock multiblock = new Multiblock(); final Multiblock multiblock = new Multiblock();
IBlockState coil = TRBlocks.FUSION_COIL.getDefaultState(); IBlockState coil = TRContent.FUSION_COIL.getDefaultState();
List<BlockPos> coils = Torus.generate(new BlockPos(0, 0, 0), tile.size); List<BlockPos> coils = Torus.generate(new BlockPos(0, 0, 0), tile.size);
coils.forEach(pos -> addComponent(pos.getX(), pos.getY(), pos.getZ(), coil, multiblock)); coils.forEach(pos -> addComponent(pos.getX(), pos.getY(), pos.getZ(), coil, multiblock));

View file

@ -34,7 +34,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import techreborn.blocks.BlockNuke; import techreborn.blocks.BlockNuke;
import techreborn.entities.EntityNukePrimed; import techreborn.entities.EntityNukePrimed;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by Mark on 13/03/2016. * Created by Mark on 13/03/2016.
@ -61,7 +61,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
} }
this.bindEntityTexture(entity); this.bindEntityTexture(entity);
GlStateManager.translate(-0.5F, -0.5F, 0.5F); GlStateManager.translate(-0.5F, -0.5F, 0.5F);
blockrendererdispatcher.renderBlockBrightness(TRBlocks.NUKE.getDefaultState(), blockrendererdispatcher.renderBlockBrightness(TRContent.NUKE.getDefaultState(),
entity.getBrightness()); entity.getBrightness());
GlStateManager.translate(0.0F, 0.0F, 1.0F); GlStateManager.translate(0.0F, 0.0F, 1.0F);
if (entity.getFuse() / 5 % 2 == 0) { if (entity.getFuse() / 5 % 2 == 0) {
@ -72,7 +72,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
GlStateManager.doPolygonOffset(-3.0F, -3.0F); GlStateManager.doPolygonOffset(-3.0F, -3.0F);
GlStateManager.enablePolygonOffset(); GlStateManager.enablePolygonOffset();
blockrendererdispatcher.renderBlockBrightness( blockrendererdispatcher.renderBlockBrightness(
TRBlocks.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F); TRContent.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
GlStateManager.doPolygonOffset(0.0F, 0.0F); GlStateManager.doPolygonOffset(0.0F, 0.0F);
GlStateManager.disablePolygonOffset(); GlStateManager.disablePolygonOffset();
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);

View file

@ -47,11 +47,11 @@ public class OreDict {
*/ */
public static void init() { public static void init() {
// Blocks // Blocks
OreUtil.registerOre("fenceIron", TRBlocks.REFINED_IRON_FENCE); OreUtil.registerOre("fenceIron", TRContent.REFINED_IRON_FENCE);
OreUtil.registerOre("woodRubber", TRBlocks.RUBBER_LOG); OreUtil.registerOre("woodRubber", TRContent.RUBBER_LOG);
OreUtil.registerOre("glassReinforced", TRBlocks.REINFORCED_GLASS); OreUtil.registerOre("glassReinforced", TRContent.REINFORCED_GLASS);
OreUtil.registerOre("treeSapling", TRBlocks.RUBBER_SAPLING); OreUtil.registerOre("treeSapling", TRContent.RUBBER_SAPLING);
OreUtil.registerOre("saplingRubber", TRBlocks.RUBBER_SAPLING); OreUtil.registerOre("saplingRubber", TRContent.RUBBER_SAPLING);
// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); // OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); // OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));

View file

@ -1,402 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.init;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemSlab;
import net.minecraft.util.ResourceLocation;
import reborncore.RebornRegistry;
import techreborn.TechReborn;
import techreborn.blocks.*;
import techreborn.blocks.generator.*;
import techreborn.blocks.lighting.BlockLamp;
import techreborn.blocks.storage.*;
import techreborn.blocks.tier0.BlockIronAlloyFurnace;
import techreborn.blocks.tier0.BlockIronFurnace;
import techreborn.blocks.tier1.*;
import techreborn.blocks.tier2.*;
import techreborn.blocks.tier3.*;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.itemblocks.*;
/**
* Registers all TR blocks
*/
public class TRBlocks {
// Misc Blocks
public static Block COMPUTER_CUBE;
public static Block FLARE;
public static Block NUKE;
public static Block REFINED_IRON_FENCE;
public static Block REINFORCED_GLASS;
public static Block RUBBER_LEAVES;
public static Block RUBBER_LOG;
public static Block RUBBER_LOG_SLAB_HALF;
public static Block RUBBER_LOG_SLAB_DOUBLE;
public static Block RUBBER_LOG_STAIR;
public static Block RUBBER_PLANKS;
public static Block RUBBER_SAPLING;
// Machines - machines
public static Block ALLOY_SMELTER;
public static Block ASSEMBLY_MACHINE;
public static Block AUTO_CRAFTING_TABLE;
public static Block CHEMICAL_REACTOR;
public static Block COMPRESSOR;
public static Block DISTILLATION_TOWER;
public static Block ELECTRIC_FURNACE;
public static Block EXTRACTOR;
public static Block FLUID_REPLICATOR;
public static Block GRINDER;
public static Block IMPLOSION_COMPRESSOR;
public static Block INDUSTRIAL_BLAST_FURNACE;
public static Block INDUSTRIAL_CENTRIFUGE;
public static Block INDUSTRIAL_ELECTROLYZER;
public static Block INDUSTRIAL_GRINDER;
public static Block INDUSTRIAL_SAWMILL;
public static Block IRON_ALLOY_FURNACE;
public static Block IRON_FURNACE;
public static Block MATTER_FABRICATOR;
public static Block RECYCLER;
public static Block ROLLING_MACHINE;
public static Block SCRAPBOXINATOR;
public static Block VACUUM_FREEZER;
// Machines - generators
public static Block DIESEL_GENERATOR;
public static Block DRAGON_EGG_SYPHON;
public static Block FUSION_COIL;
public static Block FUSION_CONTROL_COMPUTER;
public static Block GAS_TURBINE;
public static Block LIGHTNING_ROD;
public static Block PLASMA_GENERATOR;
public static Block SEMI_FLUID_GENERATOR;
public static Block SOLID_FUEL_GENEREATOR;
public static Block THERMAL_GENERATOR;
public static Block WATER_MILL;
public static Block WIND_MILL;
// Machines - storage
public static Block CREATIVE_QUANTUM_CHEST;
public static Block CREATIVE_QUANTUM_TANK;
public static Block DIGITAL_CHEST;
public static Block QUANTUM_CHEST;
public static Block QUANTUM_TANK;
// Machines - energy storage & transformers
public static Block ADJUSTABLE_SU;
public static Block CHARGE_O_MAT;
public static Block INTERDIMENSIONAL_SU;
public static Block LAPOTRONIC_SU;
public static Block LSU_STORAGE;
public static Block LOW_VOLTAGE_SU;
public static Block MEDIUM_VOLTAGE_SU;
public static Block HIGH_VOLTAGE_SU;
public static Block LV_TRANSFORMER;
public static Block MV_TRANSFORMER;
public static Block HV_TRANSFORMER;
// Machines - misc
public static Block ALARM;
public static Block CHUNK_LOADER;
public static Block LAMP_INCANDESCENT;
public static Block LAMP_LED;
public static Block MAGICAL_ABSORBER;
public static Block MAGIC_ENERGY_CONVERTER;
public static Block PLAYER_DETECTOR;
/**
* Register blocks
*/
public static void init() {
TRContent.registerBlocks();
// Misc. blocks
COMPUTER_CUBE = new BlockComputerCube();
registerBlock(COMPUTER_CUBE, "computer_cube");
NUKE = new BlockNuke();
registerBlock(NUKE, "nuke");
REFINED_IRON_FENCE = new BlockRefinedIronFence();
registerBlock(REFINED_IRON_FENCE, "refined_iron_fence");
REINFORCED_GLASS = new BlockReinforcedGlass();
registerBlock(REINFORCED_GLASS, "reinforced_glass");
RUBBER_LEAVES = new BlockRubberLeaves();
registerBlock(RUBBER_LEAVES, "rubber_leaves");
RUBBER_LOG = new BlockRubberLog();
registerBlock(RUBBER_LOG, "rubber_log");
RUBBER_LOG_SLAB_HALF = new BlockRubberPlankSlab.BlockHalf("rubber_plank");
registerBlockNoItem(RUBBER_LOG_SLAB_HALF, "rubber_plank_slab");
RUBBER_LOG_SLAB_DOUBLE = new BlockRubberPlankSlab.BlockDouble("rubber_plank", RUBBER_LOG_SLAB_HALF);
registerBlock(RUBBER_LOG_SLAB_DOUBLE, new ItemSlab(RUBBER_LOG_SLAB_HALF, (BlockSlab) RUBBER_LOG_SLAB_HALF, (BlockSlab) RUBBER_LOG_SLAB_DOUBLE) , "rubber_plank_double_slab");
RUBBER_LOG_STAIR = new BlockRubberPlankStair(RUBBER_LOG.getDefaultState(), "rubber_plank");
registerBlock(RUBBER_LOG_STAIR, "rubber_plank_stair");
RUBBER_PLANKS = new BlockRubberPlank();
registerBlock(RUBBER_PLANKS, "rubber_planks");
RUBBER_SAPLING = new BlockRubberSapling();
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling");
// Machines - machines
ALLOY_SMELTER = new BlockAlloySmelter();
registerBlock(ALLOY_SMELTER, "alloy_smelter");
ASSEMBLY_MACHINE = new BlockAssemblingMachine();
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();
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
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");
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();
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
MEDIUM_VOLTAGE_SU = new BlockMediumVoltageSU();
registerBlock(MEDIUM_VOLTAGE_SU, "medium_voltage_su");
HIGH_VOLTAGE_SU = new BlockHighVoltageSU();
registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su");
LV_TRANSFORMER = new BlockLVTransformer();
registerBlock(LV_TRANSFORMER, "lv_transformer");
MV_TRANSFORMER = new BlockMVTransformer();
registerBlock(MV_TRANSFORMER, "mv_transformer");
HV_TRANSFORMER = new BlockHVTransformer();
registerBlock(HV_TRANSFORMER, "hv_transformer");
// Machines - misc
ALARM = new BlockAlarm();
registerBlock(ALARM, "alarm");
CHUNK_LOADER = new BlockChunkLoader();
registerBlock(CHUNK_LOADER, "chunk_loader");
LAMP_INCANDESCENT = new BlockLamp( 14, 4, 0.625, 0.25);
registerBlock(LAMP_INCANDESCENT, "lamp_incandescent");
LAMP_LED = new BlockLamp( 15, 1, 0.0625, 0.125);
registerBlock(LAMP_LED, "lamp_led");
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber();
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");
//TODO enable when done
// flare = new BlockFlare();
// registerBlock(flare, "flare");
// ItemBlock itemBlock = new ItemColored(flare, true);
// itemBlock.setRegistryName("flareItemBlock");
// itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance);
// GameRegistry.register(itemBlock);
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
TechReborn.LOGGER.info("TechReborns Blocks Loaded");
}
/**
* Wrapper method for RebornRegistry
* @param block Block to register
* @param name Name of block to register
*/
public static void registerBlock(Block block, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, new ResourceLocation(TechReborn.MOD_ID, name));
}
/**
* Wrapper method for RebornRegistry
* @param block Block to Register
* @param itemclass Itemblock of block to register
* @param name Name of block to register
*/
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, itemclass, new ResourceLocation(TechReborn.MOD_ID, name));
}
public static void registerBlock(Block block, ItemBlock itemBlock, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, itemBlock, new ResourceLocation(TechReborn.MOD_ID, name));
}
public static void registerBlockNoItem(Block block, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlockNoItem(block, new ResourceLocation(TechReborn.MOD_ID, name));
}
}

View file

@ -1,12 +1,15 @@
package techreborn.init; package techreborn.init;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemSlab;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.IItemProvider; import net.minecraft.util.IItemProvider;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -24,14 +27,86 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.BucketHandler; import reborncore.common.util.BucketHandler;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.blocks.BlockAlarm;
import techreborn.blocks.BlockComputerCube;
import techreborn.blocks.BlockFusionCoil;
import techreborn.blocks.BlockFusionControlComputer;
import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockNuke;
import techreborn.blocks.BlockOre; import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockRefinedIronFence;
import techreborn.blocks.BlockReinforcedGlass;
import techreborn.blocks.BlockRubberLeaves;
import techreborn.blocks.BlockRubberLog;
import techreborn.blocks.BlockRubberPlank;
import techreborn.blocks.BlockRubberPlankSlab;
import techreborn.blocks.BlockRubberPlankStair;
import techreborn.blocks.BlockRubberSapling;
import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockStorage;
import techreborn.blocks.cable.BlockCable; import techreborn.blocks.cable.BlockCable;
import techreborn.blocks.generator.BlockDieselGenerator;
import techreborn.blocks.generator.BlockDragonEggSyphon;
import techreborn.blocks.generator.BlockGasTurbine;
import techreborn.blocks.generator.BlockLightningRod;
import techreborn.blocks.generator.BlockMagicEnergyAbsorber;
import techreborn.blocks.generator.BlockMagicEnergyConverter;
import techreborn.blocks.generator.BlockPlasmaGenerator;
import techreborn.blocks.generator.BlockSemiFluidGenerator;
import techreborn.blocks.generator.BlockSolarPanel; import techreborn.blocks.generator.BlockSolarPanel;
import techreborn.blocks.generator.BlockSolidFuelGenerator;
import techreborn.blocks.generator.BlockThermalGenerator;
import techreborn.blocks.generator.BlockWaterMill;
import techreborn.blocks.generator.BlockWindMill;
import techreborn.blocks.lighting.BlockLamp;
import techreborn.blocks.storage.BlockAdjustableSU;
import techreborn.blocks.storage.BlockHighVoltageSU;
import techreborn.blocks.storage.BlockInterdimensionalSU;
import techreborn.blocks.storage.BlockLSUStorage;
import techreborn.blocks.storage.BlockLapotronicSU;
import techreborn.blocks.storage.BlockLowVoltageSU;
import techreborn.blocks.storage.BlockMediumVoltageSU;
import techreborn.blocks.tier0.BlockIronAlloyFurnace;
import techreborn.blocks.tier0.BlockIronFurnace;
import techreborn.blocks.tier1.BlockAlloySmelter;
import techreborn.blocks.tier1.BlockAssemblingMachine;
import techreborn.blocks.tier1.BlockAutoCraftingTable;
import techreborn.blocks.tier1.BlockCompressor;
import techreborn.blocks.tier1.BlockElectricFurnace; import techreborn.blocks.tier1.BlockElectricFurnace;
import techreborn.blocks.tier1.BlockExtractor;
import techreborn.blocks.tier1.BlockGrinder;
import techreborn.blocks.tier1.BlockPlayerDetector;
import techreborn.blocks.tier1.BlockRecycler;
import techreborn.blocks.tier1.BlockRollingMachine;
import techreborn.blocks.tier1.BlockScrapboxinator;
import techreborn.blocks.tier2.BlockChargeOMat;
import techreborn.blocks.tier2.BlockChemicalReactor;
import techreborn.blocks.tier2.BlockDigitalChest;
import techreborn.blocks.tier2.BlockDistillationTower;
import techreborn.blocks.tier2.BlockImplosionCompressor;
import techreborn.blocks.tier2.BlockIndustrialBlastFurnace;
import techreborn.blocks.tier2.BlockIndustrialCentrifuge;
import techreborn.blocks.tier2.BlockIndustrialElectrolyzer;
import techreborn.blocks.tier2.BlockIndustrialGrinder;
import techreborn.blocks.tier2.BlockIndustrialSawmill;
import techreborn.blocks.tier2.BlockVacuumFreezer;
import techreborn.blocks.tier3.BlockChunkLoader;
import techreborn.blocks.tier3.BlockCreativeQuantumChest;
import techreborn.blocks.tier3.BlockCreativeQuantumTank;
import techreborn.blocks.tier3.BlockFluidReplicator;
import techreborn.blocks.tier3.BlockMatterFabricator;
import techreborn.blocks.tier3.BlockQuantumChest;
import techreborn.blocks.tier3.BlockQuantumTank;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.itemblocks.ItemBlockAdjustableSU;
import techreborn.itemblocks.ItemBlockDigitalChest;
import techreborn.itemblocks.ItemBlockPlayerDetector;
import techreborn.itemblocks.ItemBlockQuantumChest;
import techreborn.itemblocks.ItemBlockQuantumTank;
import techreborn.itemblocks.ItemBlockRubberSapling;
import techreborn.items.DynamicCell; import techreborn.items.DynamicCell;
import techreborn.items.ItemFrequencyTransmitter; import techreborn.items.ItemFrequencyTransmitter;
import techreborn.items.ItemManual; import techreborn.items.ItemManual;
@ -78,6 +153,88 @@ import com.google.common.collect.Maps;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TRContent { public class TRContent {
// Misc Blocks
public static Block COMPUTER_CUBE;
public static Block FLARE;
public static Block NUKE;
public static Block REFINED_IRON_FENCE;
public static Block REINFORCED_GLASS;
public static Block RUBBER_LEAVES;
public static Block RUBBER_LOG;
public static Block RUBBER_LOG_SLAB_HALF;
public static Block RUBBER_LOG_SLAB_DOUBLE;
public static Block RUBBER_LOG_STAIR;
public static Block RUBBER_PLANKS;
public static Block RUBBER_SAPLING;
// Machines - machines
public static Block ALLOY_SMELTER;
public static Block ASSEMBLY_MACHINE;
public static Block AUTO_CRAFTING_TABLE;
public static Block CHEMICAL_REACTOR;
public static Block COMPRESSOR;
public static Block DISTILLATION_TOWER;
public static Block ELECTRIC_FURNACE;
public static Block EXTRACTOR;
public static Block FLUID_REPLICATOR;
public static Block GRINDER;
public static Block IMPLOSION_COMPRESSOR;
public static Block INDUSTRIAL_BLAST_FURNACE;
public static Block INDUSTRIAL_CENTRIFUGE;
public static Block INDUSTRIAL_ELECTROLYZER;
public static Block INDUSTRIAL_GRINDER;
public static Block INDUSTRIAL_SAWMILL;
public static Block IRON_ALLOY_FURNACE;
public static Block IRON_FURNACE;
public static Block MATTER_FABRICATOR;
public static Block RECYCLER;
public static Block ROLLING_MACHINE;
public static Block SCRAPBOXINATOR;
public static Block VACUUM_FREEZER;
// Machines - generators
public static Block DIESEL_GENERATOR;
public static Block DRAGON_EGG_SYPHON;
public static Block FUSION_COIL;
public static Block FUSION_CONTROL_COMPUTER;
public static Block GAS_TURBINE;
public static Block LIGHTNING_ROD;
public static Block PLASMA_GENERATOR;
public static Block SEMI_FLUID_GENERATOR;
public static Block SOLID_FUEL_GENEREATOR;
public static Block THERMAL_GENERATOR;
public static Block WATER_MILL;
public static Block WIND_MILL;
// Machines - storage
public static Block CREATIVE_QUANTUM_CHEST;
public static Block CREATIVE_QUANTUM_TANK;
public static Block DIGITAL_CHEST;
public static Block QUANTUM_CHEST;
public static Block QUANTUM_TANK;
// Machines - energy storage & transformers
public static Block ADJUSTABLE_SU;
public static Block CHARGE_O_MAT;
public static Block INTERDIMENSIONAL_SU;
public static Block LAPOTRONIC_SU;
public static Block LSU_STORAGE;
public static Block LOW_VOLTAGE_SU;
public static Block MEDIUM_VOLTAGE_SU;
public static Block HIGH_VOLTAGE_SU;
public static Block LV_TRANSFORMER;
public static Block MV_TRANSFORMER;
public static Block HV_TRANSFORMER;
// Machines - misc
public static Block ALARM;
public static Block CHUNK_LOADER;
public static Block LAMP_INCANDESCENT;
public static Block LAMP_LED;
public static Block MAGICAL_ABSORBER;
public static Block MAGIC_ENERGY_CONVERTER;
public static Block PLAYER_DETECTOR;
// Armor // Armor
public static Item CLOAKING_DEVICE; public static Item CLOAKING_DEVICE;
public static Item LAPOTRONIC_ORBPACK; public static Item LAPOTRONIC_ORBPACK;
@ -645,6 +802,230 @@ public class TRContent {
}); });
Arrays.stream(SolarPanels.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); Arrays.stream(SolarPanels.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
Arrays.stream(Cables.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); Arrays.stream(Cables.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
// Misc. blocks
COMPUTER_CUBE = new BlockComputerCube();
registerBlock(COMPUTER_CUBE, "computer_cube");
NUKE = new BlockNuke();
registerBlock(NUKE, "nuke");
REFINED_IRON_FENCE = new BlockRefinedIronFence();
registerBlock(REFINED_IRON_FENCE, "refined_iron_fence");
REINFORCED_GLASS = new BlockReinforcedGlass();
registerBlock(REINFORCED_GLASS, "reinforced_glass");
RUBBER_LEAVES = new BlockRubberLeaves();
registerBlock(RUBBER_LEAVES, "rubber_leaves");
RUBBER_LOG = new BlockRubberLog();
registerBlock(RUBBER_LOG, "rubber_log");
RUBBER_LOG_SLAB_HALF = new BlockRubberPlankSlab.BlockHalf("rubber_plank");
registerBlockNoItem(RUBBER_LOG_SLAB_HALF, "rubber_plank_slab");
RUBBER_LOG_SLAB_DOUBLE = new BlockRubberPlankSlab.BlockDouble("rubber_plank", RUBBER_LOG_SLAB_HALF);
registerBlock(RUBBER_LOG_SLAB_DOUBLE, new ItemSlab(RUBBER_LOG_SLAB_HALF, (BlockSlab) RUBBER_LOG_SLAB_HALF, (BlockSlab) RUBBER_LOG_SLAB_DOUBLE) , "rubber_plank_double_slab");
RUBBER_LOG_STAIR = new BlockRubberPlankStair(TRContent.RUBBER_LOG.getDefaultState(), "rubber_plank");
registerBlock(RUBBER_LOG_STAIR, "rubber_plank_stair");
RUBBER_PLANKS = new BlockRubberPlank();
registerBlock(RUBBER_PLANKS, "rubber_planks");
RUBBER_SAPLING = new BlockRubberSapling();
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling");
// Machines - machines
ALLOY_SMELTER = new BlockAlloySmelter();
registerBlock(ALLOY_SMELTER, "alloy_smelter");
ASSEMBLY_MACHINE = new BlockAssemblingMachine();
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();
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
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");
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();
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
MEDIUM_VOLTAGE_SU = new BlockMediumVoltageSU();
registerBlock(MEDIUM_VOLTAGE_SU, "medium_voltage_su");
HIGH_VOLTAGE_SU = new BlockHighVoltageSU();
registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su");
LV_TRANSFORMER = new BlockLVTransformer();
registerBlock(LV_TRANSFORMER, "lv_transformer");
MV_TRANSFORMER = new BlockMVTransformer();
registerBlock(MV_TRANSFORMER, "mv_transformer");
HV_TRANSFORMER = new BlockHVTransformer();
registerBlock(HV_TRANSFORMER, "hv_transformer");
// Machines - misc
ALARM = new BlockAlarm();
registerBlock(ALARM, "alarm");
CHUNK_LOADER = new BlockChunkLoader();
registerBlock(CHUNK_LOADER, "chunk_loader");
LAMP_INCANDESCENT = new BlockLamp( 14, 4, 0.625, 0.25);
registerBlock(LAMP_INCANDESCENT, "lamp_incandescent");
LAMP_LED = new BlockLamp( 15, 1, 0.0625, 0.125);
registerBlock(LAMP_LED, "lamp_led");
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber();
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");
//TODO enable when done
// flare = new BlockFlare();
// registerBlock(flare, "flare");
// ItemBlock itemBlock = new ItemColored(flare, true);
// itemBlock.setRegistryName("flareItemBlock");
// itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance);
// GameRegistry.register(itemBlock);
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
TechReborn.LOGGER.debug("TechReborns Blocks Loaded");
} }
public static void registerItems() { public static void registerItems() {
@ -748,6 +1129,8 @@ public class TRContent {
// TODO: do we need this at all? // TODO: do we need this at all?
BlockMachineBase.advancedFrameStack = new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()); BlockMachineBase.advancedFrameStack = new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame());
BlockMachineBase.basicFrameStack = new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()); BlockMachineBase.basicFrameStack = new ItemStack(TRContent.MachineBlocks.BASIC.getFrame());
TechReborn.LOGGER.debug("TechReborns Items Loaded");
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@ -841,4 +1224,40 @@ public class TRContent {
} }
} }
/**
* Wrapper method for RebornRegistry
* @param block Block to register
* @param name Name of block to register
*/
public static void registerBlock(Block block, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, new ResourceLocation(TechReborn.MOD_ID, name));
}
/**
* Wrapper method for RebornRegistry
* @param block Block to Register
* @param itemclass Itemblock of block to register
* @param name Name of block to register
*/
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, itemclass, new ResourceLocation(TechReborn.MOD_ID, name));
}
public static void registerBlock(Block block, ItemBlock itemBlock, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, itemBlock, new ResourceLocation(TechReborn.MOD_ID, name));
}
public static void registerBlockNoItem(Block block, String name) {
name = name.toLowerCase();
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
RebornRegistry.registerBlockNoItem(block, new ResourceLocation(TechReborn.MOD_ID, name));
}
} }

View file

@ -32,7 +32,6 @@ import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.RebornCraftingHelper; import reborncore.common.util.RebornCraftingHelper;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.items.*; import techreborn.items.*;
@ -48,11 +47,11 @@ public class CraftingTableRecipes extends RecipeMethods {
// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "stone", "plateIridiumAlloy"); // registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "stone", "plateIridiumAlloy");
// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium"); // registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium");
// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "ingotTungstensteel"); // registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "ingotTungstensteel");
registerShapeless(getStack(TRBlocks.RUBBER_PLANKS, 4), getStack(TRBlocks.RUBBER_LOG)); registerShapeless(getStack(TRContent.RUBBER_PLANKS, 4), getStack(TRContent.RUBBER_LOG));
registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin"); registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin");
registerShaped(getStack(TRBlocks.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron"); registerShaped(getStack(TRContent.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron");
registerShaped(getStack(TRBlocks.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); registerShaped(getStack(TRContent.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", 'A', "plateAdvancedAlloy", 'G', "blockGlass");
registerShaped(getStack(TRBlocks.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); registerShaped(getStack(TRContent.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass");
// registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy"); // registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy");
// Tools and devices // Tools and devices
@ -98,47 +97,47 @@ public class CraftingTableRecipes extends RecipeMethods {
// registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER)); // registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER));
//Machines //Machines
registerShapeless(getStack(TRBlocks.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE)); registerShapeless(getStack(TRContent.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE));
registerShaped(getStack(TRBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
registerShaped(getStack(TRBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateAluminum", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateAluminum", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
registerShaped(getStack(TRBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
registerShaped(getStack(TRBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
registerShaped(getStack(TRBlocks.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(TRBlocks.WIND_MILL), 'G', "glassReinforced"); registerShaped(getStack(TRContent.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(TRContent.WIND_MILL), 'G', "glassReinforced");
registerShaped(getStack(TRBlocks.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateAluminum", 'A', "circuitAdvanced", 'W', getStack(TRBlocks.WIND_MILL), 'G', "glassReinforced"); registerShaped(getStack(TRContent.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateAluminum", 'A', "circuitAdvanced", 'W', getStack(TRContent.WIND_MILL), 'G', "glassReinforced");
registerShaped(getStack(TRBlocks.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); registerShaped(getStack(TRContent.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic");
registerShaped(getStack(TRBlocks.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
registerShaped(getStack(TRBlocks.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
registerShaped(getStack(TRBlocks.WATER_MILL), "SWS", "WGW", "SWS", 'S', "stickWood", 'W', "plankWood", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.WATER_MILL), "SWS", "WGW", "SWS", 'S', "stickWood", 'W', "plankWood", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
// registerShaped(getStack(ModBlocks.LIGHTNING_ROD), "CAC", "ACA", "CAC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'C', "circuitMaster"); // registerShaped(getStack(ModBlocks.LIGHTNING_ROD), "CAC", "ACA", "CAC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'C', "circuitMaster");
registerShaped(getStack(TRBlocks.IRON_ALLOY_FURNACE), "III", "F F", "III", 'I', "ingotRefinedIron", 'F', getStack(TRBlocks.IRON_FURNACE)); registerShaped(getStack(TRContent.IRON_ALLOY_FURNACE), "III", "F F", "III", 'I', "ingotRefinedIron", 'F', getStack(TRContent.IRON_FURNACE));
registerShaped(getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), "RER", "CFC", "RER", 'R', "plateIron", 'E', getStack(TRBlocks.EXTRACTOR), 'C', "circuitAdvanced", 'F', "machineBlockAdvanced"); registerShaped(getStack(TRContent.INDUSTRIAL_ELECTROLYZER), "RER", "CFC", "RER", 'R', "plateIron", 'E', getStack(TRContent.EXTRACTOR), 'C', "circuitAdvanced", 'F', "machineBlockAdvanced");
registerShaped(getStack(TRBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron", 'E', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); registerShaped(getStack(TRContent.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron", 'E', getStack(TRContent.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced");
registerShaped(getStack(TRBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "plateAluminum", 'E', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); registerShaped(getStack(TRContent.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "plateAluminum", 'E', getStack(TRContent.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced");
registerShaped(getStack(TRBlocks.INDUSTRIAL_SAWMILL), "PAP", "SSS", "ACA", 'P', "ingotRefinedIron", 'A', "circuitAdvanced", 'S', TRContent.Parts.DIAMOND_SAW_BLADE.getStack(), 'C', "machineBlockAdvanced"); registerShaped(getStack(TRContent.INDUSTRIAL_SAWMILL), "PAP", "SSS", "ACA", 'P', "ingotRefinedIron", 'A', "circuitAdvanced", 'S', TRContent.Parts.DIAMOND_SAW_BLADE.getStack(), 'C', "machineBlockAdvanced");
registerShaped(getStack(TRBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(TRBlocks.ELECTRIC_FURNACE)); registerShaped(getStack(TRContent.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(TRContent.ELECTRIC_FURNACE));
registerShaped(getStack(TRBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), 'H', "craftingDiamondGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', getStack(TRBlocks.GRINDER)); registerShaped(getStack(TRContent.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', getStack(TRContent.INDUSTRIAL_ELECTROLYZER), 'H', "craftingDiamondGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', getStack(TRContent.GRINDER));
// registerShaped(getStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', getMaterialObject("advancedAlloy", Type.INGOT), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'P', getStack(ModBlocks.COMPRESSOR)); // registerShaped(getStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', getMaterialObject("advancedAlloy", Type.INGOT), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'P', getStack(ModBlocks.COMPRESSOR));
registerShaped(getStack(TRBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(TRBlocks.EXTRACTOR)); registerShaped(getStack(TRContent.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(TRContent.EXTRACTOR));
registerShaped(getStack(TRBlocks.DISTILLATION_TOWER), "CMC", "PBP", "EME", 'E', getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), 'M', "circuitMaster", 'B', "machineBlockElite", 'C', getStack(TRBlocks.INDUSTRIAL_CENTRIFUGE), 'P', getStack(TRBlocks.EXTRACTOR)); registerShaped(getStack(TRContent.DISTILLATION_TOWER), "CMC", "PBP", "EME", 'E', getStack(TRContent.INDUSTRIAL_ELECTROLYZER), 'M', "circuitMaster", 'B', "machineBlockElite", 'C', getStack(TRContent.INDUSTRIAL_CENTRIFUGE), 'P', getStack(TRContent.EXTRACTOR));
registerShaped(getStack(TRBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(TRBlocks.EXTRACTOR), 'P', getStack(TRBlocks.COMPRESSOR), 'E', getStack(TRBlocks.EXTRACTOR)); registerShaped(getStack(TRContent.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(TRContent.EXTRACTOR), 'P', getStack(TRContent.COMPRESSOR), 'E', getStack(TRContent.EXTRACTOR));
registerShaped(getStack(TRBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(TRBlocks.COMPRESSOR), 'B', "machineBlockBasic"); registerShaped(getStack(TRContent.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(TRContent.COMPRESSOR), 'B', "machineBlockBasic");
registerShaped(getStack(TRBlocks.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron"); registerShaped(getStack(TRContent.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron");
registerShaped(getStack(TRBlocks.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced"); registerShaped(getStack(TRContent.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced");
registerShaped(getStack(TRBlocks.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(TRBlocks.ELECTRIC_FURNACE), 'M', "machineBlockBasic"); registerShaped(getStack(TRContent.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(TRContent.ELECTRIC_FURNACE), 'M', "machineBlockBasic");
registerShaped(getStack(TRBlocks.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRBlocks.ADJUSTABLE_SU)); registerShaped(getStack(TRContent.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRContent.ADJUSTABLE_SU));
registerShaped(getStack(TRBlocks.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRContent.LAPOTRONIC_ORB), 'C', "energyCrystal"); registerShaped(getStack(TRContent.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRContent.LAPOTRONIC_ORB), 'C', "energyCrystal");
registerShaped(getStack(TRBlocks.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', getStack(TRBlocks.LV_TRANSFORMER), 'C', "circuitAdvanced", 'M', getStack(TRBlocks.MV_TRANSFORMER), 'B', getStack(TRBlocks.LSU_STORAGE)); registerShaped(getStack(TRContent.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', getStack(TRContent.LV_TRANSFORMER), 'C', "circuitAdvanced", 'M', getStack(TRContent.MV_TRANSFORMER), 'B', getStack(TRContent.LSU_STORAGE));
registerShaped(getStack(TRBlocks.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic"); registerShaped(getStack(TRContent.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic");
registerShaped(getStack(TRBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRContent.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); registerShaped(getStack(TRContent.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRContent.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt");
registerShaped(getStack(TRBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(TRBlocks.FUSION_COIL), 'C', "circuitMaster"); registerShaped(getStack(TRContent.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(TRContent.FUSION_COIL), 'C', "circuitMaster");
// registerShaped(getStack(ModBlocks.FUSION_COIL), "CSC", "NAN", "CRC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'N', getMaterial("nichromeHeatingCoil", Type.PART), 'C', "circuitMaster", 'S', "craftingSuperconductor", 'R', getMaterial("iridiumNeutronReflector", Type.PART)); // registerShaped(getStack(ModBlocks.FUSION_COIL), "CSC", "NAN", "CRC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'N', getMaterial("nichromeHeatingCoil", Type.PART), 'C', "circuitMaster", 'S', "craftingSuperconductor", 'R', getMaterial("iridiumNeutronReflector", Type.PART));
registerShaped(getStack(TRBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); registerShaped(getStack(TRContent.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack());
registerShaped(getStack(TRBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); registerShaped(getStack(TRContent.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack());
registerShaped(getStack(TRBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRContent.LAPOTRONIC_ORB)); registerShaped(getStack(TRContent.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRContent.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRContent.LAPOTRONIC_ORB));
registerShaped(getStack(TRBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); registerShaped(getStack(TRContent.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced");
registerShaped(getStack(TRBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(TRBlocks.COMPUTER_CUBE)); registerShaped(getStack(TRContent.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(TRContent.COMPUTER_CUBE));
registerShaped(getStack(TRBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(TRBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRContent.LAPOTRONIC_ORB)); registerShaped(getStack(TRContent.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(TRContent.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRContent.LAPOTRONIC_ORB));
registerShaped(getStack(TRBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(TRBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); registerShaped(getStack(TRContent.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(TRContent.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
// registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 0), "DLD", "LDL", "CGC", 'D', "dustCoal", 'L', "paneGlass", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 0), "DLD", "LDL", "CGC", 'D', "dustCoal", 'L', "paneGlass", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic");
// registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', getStack(ModBlocks.SOLAR_PANEL, 1, 0)); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', getStack(ModBlocks.SOLAR_PANEL, 1, 0));
// registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', "machineBlockBasic"); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', "machineBlockBasic");
@ -149,24 +148,24 @@ public class CraftingTableRecipes extends RecipeMethods {
// registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 4), "DLD", "LDL", "CPC", 'D', "dustDiamond", 'L', "glassReinforced", 'C', "circuitMaster", 'P', getStack(ModBlocks.SOLAR_PANEL, 1, 3)); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 4), "DLD", "LDL", "CPC", 'D', "dustDiamond", 'L', "glassReinforced", 'C', "circuitMaster", 'P', getStack(ModBlocks.SOLAR_PANEL, 1, 3));
// registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 4), "DLD", "LDL", "CPC", 'D', "dustDiamond", 'L', "glassReinforced", 'C', "circuitMaster", 'P', "machineBlockElite"); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 4), "DLD", "LDL", "CPC", 'D', "dustDiamond", 'L', "glassReinforced", 'C', "circuitMaster", 'P', "machineBlockElite");
// registerShaped(getStack(ModBlocks.ALARM, 1, 0), "ICI", "SRS", "ICI", 'I', "ingotIron", 'C', getMaterial("copper", Type.CABLE), 'S', getMaterial("insulatedcopper", Type.CABLE), 'R', "blockRedstone" ); // registerShaped(getStack(ModBlocks.ALARM, 1, 0), "ICI", "SRS", "ICI", 'I', "ingotIron", 'C', getMaterial("copper", Type.CABLE), 'S', getMaterial("insulatedcopper", Type.CABLE), 'R', "blockRedstone" );
registerShaped(getStack(TRBlocks.FLUID_REPLICATOR), "PCP", "CFC", "ESR", 'P', "plateTungstensteel", 'F', "machineBlockElite", 'C', "circuitMaster", 'E', getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), 'S', "craftingSuperconductor",'R', getStack(TRBlocks.CHEMICAL_REACTOR)); registerShaped(getStack(TRContent.FLUID_REPLICATOR), "PCP", "CFC", "ESR", 'P', "plateTungstensteel", 'F', "machineBlockElite", 'C', "circuitMaster", 'E', getStack(TRContent.INDUSTRIAL_ELECTROLYZER), 'S', "craftingSuperconductor",'R', getStack(TRContent.CHEMICAL_REACTOR));
// registerShaped(getStack(ModBlocks.HV_TRANSFORMER), " H ", " M ", " H ", 'M', getStack(ModBlocks.MV_TRANSFORMER), 'H', EnumCableType.IHV.getStack()); // registerShaped(getStack(ModBlocks.HV_TRANSFORMER), " H ", " M ", " H ", 'M', getStack(ModBlocks.MV_TRANSFORMER), 'H', EnumCableType.IHV.getStack());
// registerShaped(getStack(ModBlocks.MV_TRANSFORMER), " G ", " M ", " G ", 'M', "machineBlockBasic", 'G', EnumCableType.IGOLD.getStack()); // registerShaped(getStack(ModBlocks.MV_TRANSFORMER), " G ", " M ", " G ", 'M', "machineBlockBasic", 'G', EnumCableType.IGOLD.getStack());
// registerShaped(getStack(ModBlocks.LV_TRANSFORMER), "PWP", "CCC", "PPP", 'P', "plankWood", 'C', "ingotCopper", 'W', EnumCableType.ICOPPER.getStack()); // registerShaped(getStack(ModBlocks.LV_TRANSFORMER), "PWP", "CCC", "PPP", 'P', "plankWood", 'C', "ingotCopper", 'W', EnumCableType.ICOPPER.getStack());
// registerShaped(getStack(ModBlocks.LOW_VOLTAGE_SU), "WCW", "BBB", "WWW", 'W', "plankWood", 'B', "reBattery", 'C', EnumCableType.ICOPPER.getStack()); // registerShaped(getStack(ModBlocks.LOW_VOLTAGE_SU), "WCW", "BBB", "WWW", 'W', "plankWood", 'B', "reBattery", 'C', EnumCableType.ICOPPER.getStack());
// registerShaped(getStack(ModBlocks.MEDIUM_VOLTAGE_SU), "GEG", "EME", "GEG", 'M', "machineBlockBasic", 'E', "energyCrystal", 'G', EnumCableType.IGOLD.getStack()); // registerShaped(getStack(ModBlocks.MEDIUM_VOLTAGE_SU), "GEG", "EME", "GEG", 'M', "machineBlockBasic", 'E', "energyCrystal", 'G', EnumCableType.IGOLD.getStack());
// registerShaped(getStack(ModBlocks.HIGH_VOLTAGE_SU), "LAL", "LML", "LOL", 'A', "circuitAdvanced", 'L', "lapotronCrystal", 'M', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'O', "machineBlockAdvanced"); // registerShaped(getStack(ModBlocks.HIGH_VOLTAGE_SU), "LAL", "LML", "LOL", 'A', "circuitAdvanced", 'L', "lapotronCrystal", 'M', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'O', "machineBlockAdvanced");
registerShaped(getStack(TRBlocks.COMPRESSOR), "S S", "SCS", "SMS", 'C', "circuitBasic", 'M', "machineBlockBasic", 'S', "stone"); registerShaped(getStack(TRContent.COMPRESSOR), "S S", "SCS", "SMS", 'C', "circuitBasic", 'M', "machineBlockBasic", 'S', "stone");
registerShaped(getStack(TRBlocks.ELECTRIC_FURNACE), " C ", "RFR", " ", 'C', "circuitBasic", 'F', getStack(TRBlocks.IRON_FURNACE), 'R', "dustRedstone"); registerShaped(getStack(TRContent.ELECTRIC_FURNACE), " C ", "RFR", " ", 'C', "circuitBasic", 'F', getStack(TRContent.IRON_FURNACE), 'R', "dustRedstone");
registerShaped(getStack(TRBlocks.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(TRBlocks.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic"); registerShaped(getStack(TRContent.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(TRContent.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic");
registerShaped(getStack(TRBlocks.IRON_FURNACE), "III", "I I", "III", 'I', "ingotIron"); registerShaped(getStack(TRContent.IRON_FURNACE), "III", "I I", "III", 'I', "ingotIron");
registerShaped(getStack(TRBlocks.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE)); registerShaped(getStack(TRContent.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE));
registerShaped(getStack(TRBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRContent.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); registerShaped(getStack(TRContent.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRContent.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic");
registerShaped(getStack(TRBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic"); registerShaped(getStack(TRContent.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic");
registerShaped(getStack(TRBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'A', "machineBlockElite", 'Q', getStack(TRBlocks.DIGITAL_CHEST), 'T', getStack(TRBlocks.COMPRESSOR)); registerShaped(getStack(TRContent.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'A', "machineBlockElite", 'Q', getStack(TRContent.DIGITAL_CHEST), 'T', getStack(TRContent.COMPRESSOR));
registerShaped(getStack(TRBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(TRBlocks.QUANTUM_CHEST)); registerShaped(getStack(TRContent.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(TRContent.QUANTUM_CHEST));
registerShaped(getStack(TRBlocks.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', TRContent.Parts.CARBON_FIBER.getStack()); registerShaped(getStack(TRContent.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', TRContent.Parts.CARBON_FIBER.getStack());
registerShaped(getStack(TRBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone"); registerShaped(getStack(TRContent.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone");
// Machine Frames // Machine Frames
@ -279,8 +278,8 @@ public class CraftingTableRecipes extends RecipeMethods {
// } // }
// } // }
registerShaped(new ItemStack(TRBlocks.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(TRBlocks.RUBBER_PLANKS)); registerShaped(new ItemStack(TRContent.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(TRContent.RUBBER_PLANKS));
registerShaped(new ItemStack(TRBlocks.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(TRBlocks.RUBBER_PLANKS)); registerShaped(new ItemStack(TRContent.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(TRContent.RUBBER_PLANKS));
RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRContent.MANUAL), "ingotRefinedIron", RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRContent.MANUAL), "ingotRefinedIron",
Items.BOOK); Items.BOOK);

View file

@ -32,7 +32,7 @@ import net.minecraft.item.ItemStack;
import reborncore.api.recipe.RecipeHandler; import reborncore.api.recipe.RecipeHandler;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.api.recipe.machines.ScrapboxRecipe; import techreborn.api.recipe.machines.ScrapboxRecipe;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.items.DynamicCell; import techreborn.items.DynamicCell;
import techreborn.utils.StackWIPHandler; import techreborn.utils.StackWIPHandler;
@ -185,7 +185,7 @@ public class ScrapboxRecipes extends RecipeMethods {
register(getStack(Blocks.LEAVES2, 1, 0)); register(getStack(Blocks.LEAVES2, 1, 0));
register(getStack(Blocks.LEAVES2, 1, 1)); register(getStack(Blocks.LEAVES2, 1, 1));
register(getStack(TRBlocks.RUBBER_SAPLING)); register(getStack(TRContent.RUBBER_SAPLING));
// for (String i : ItemDusts.types) { // for (String i : ItemDusts.types) {
// register(ItemDusts.getDustByName(i)); // register(ItemDusts.getDustByName(i));

View file

@ -40,7 +40,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileAdjustableSU;
import java.util.List; import java.util.List;
@ -85,7 +85,7 @@ public class ItemBlockAdjustableSU extends ItemBlock {
public ItemStack getDropWithNBT(double energy) { public ItemStack getDropWithNBT(double energy) {
NBTTagCompound tileEntity = new NBTTagCompound(); NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(TRBlocks.ADJUSTABLE_SU, 1); ItemStack dropStack = new ItemStack(TRContent.ADJUSTABLE_SU, 1);
writeToNBTWithoutCoords(tileEntity, energy); writeToNBTWithoutCoords(tileEntity, energy);
dropStack.setTagCompound(new NBTTagCompound()); dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity); dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -27,10 +27,10 @@ package techreborn.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import reborncore.common.itemblock.ItemBlockBase; import reborncore.common.itemblock.ItemBlockBase;
import techreborn.blocks.tier1.BlockPlayerDetector; import techreborn.blocks.tier1.BlockPlayerDetector;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
public class ItemBlockPlayerDetector extends ItemBlockBase { public class ItemBlockPlayerDetector extends ItemBlockBase {
public ItemBlockPlayerDetector(Block block) { public ItemBlockPlayerDetector(Block block) {
super(TRBlocks.PLAYER_DETECTOR, TRBlocks.PLAYER_DETECTOR, BlockPlayerDetector.types); super(TRContent.PLAYER_DETECTOR, TRContent.PLAYER_DETECTOR, BlockPlayerDetector.types);
} }
} }

View file

@ -55,7 +55,7 @@ import techreborn.client.render.entitys.RenderNukePrimed;
import techreborn.entities.EntityNukePrimed; import techreborn.entities.EntityNukePrimed;
import techreborn.events.FluidBlockModelHandler; import techreborn.events.FluidBlockModelHandler;
import techreborn.events.StackToolTipEvent; import techreborn.events.StackToolTipEvent;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.items.ItemFrequencyTransmitter; import techreborn.items.ItemFrequencyTransmitter;
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {
@ -86,7 +86,7 @@ public class ClientProxy extends CommonProxy {
// TODO FIX ME // TODO FIX ME
ClientRegistry.registerKeyBinding(KeyBindings.config); ClientRegistry.registerKeyBinding(KeyBindings.config);
StateMap rubberLeavesStateMap = new StateMap.Builder().ignore(BlockRubberLeaves.CHECK_DECAY, BlockRubberLeaves.DECAYABLE).build(); StateMap rubberLeavesStateMap = new StateMap.Builder().ignore(BlockRubberLeaves.CHECK_DECAY, BlockRubberLeaves.DECAYABLE).build();
ModelLoader.setCustomStateMapper(TRBlocks.RUBBER_LEAVES, rubberLeavesStateMap); ModelLoader.setCustomStateMapper(TRContent.RUBBER_LEAVES, rubberLeavesStateMap);
} }
@Override @Override

View file

@ -39,8 +39,8 @@ import net.minecraft.world.World;
import reborncore.api.IToolDrop; import reborncore.api.IToolDrop;
import reborncore.common.util.ChatUtils; import reborncore.common.util.ChatUtils;
import techreborn.blocks.BlockAlarm; import techreborn.blocks.BlockAlarm;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.utils.MessageIDs; import techreborn.utils.MessageIDs;
public class TileAlarm extends TileEntity public class TileAlarm extends TileEntity
@ -106,6 +106,6 @@ public class TileAlarm extends TileEntity
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.ALARM, 1); return new ItemStack(TRContent.ALARM, 1);
} }
} }

View file

@ -40,7 +40,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileChargeOMat extends TilePowerAcceptor public class TileChargeOMat extends TilePowerAcceptor
@ -114,7 +114,7 @@ public class TileChargeOMat extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.CHARGE_O_MAT, 1); return new ItemStack(TRContent.CHARGE_O_MAT, 1);
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -37,7 +37,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider { public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider {
@ -60,7 +60,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, Ite
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.CHUNK_LOADER, 1); return new ItemStack(TRContent.CHUNK_LOADER, 1);
} }
public boolean isComplete() { public boolean isComplete() {

View file

@ -36,7 +36,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.items.DynamicCell; import techreborn.items.DynamicCell;
import java.util.List; import java.util.List;
@ -50,7 +50,7 @@ public class TileIndustrialCentrifuge extends TileGenericMachine implements ICon
public static int maxEnergy = 10_000; public static int maxEnergy = 10_000;
public TileIndustrialCentrifuge() { public TileIndustrialCentrifuge() {
super("IndustrialCentrifuge", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_CENTRIFUGE, 6); super("IndustrialCentrifuge", maxInput, maxEnergy, TRContent.INDUSTRIAL_CENTRIFUGE, 6);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4, 5 }; final int[] outputs = new int[] { 2, 3, 4, 5 };
this.inventory = new Inventory<>(7, "TileIndustrialCentrifuge", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(7, "TileIndustrialCentrifuge", 64, this).withConfiguredAccess();

View file

@ -38,7 +38,6 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks;
import techreborn.init.TRContent; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -197,7 +196,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.MATTER_FABRICATOR, 1); return new ItemStack(TRContent.MATTER_FABRICATOR, 1);
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -42,7 +42,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@ -68,7 +68,7 @@ public class TileQuantumTank extends TileMachineBase
public ItemStack getDropWithNBT() { public ItemStack getDropWithNBT() {
final NBTTagCompound tileEntity = new NBTTagCompound(); final NBTTagCompound tileEntity = new NBTTagCompound();
final ItemStack dropStack = new ItemStack(TRBlocks.QUANTUM_TANK, 1); final ItemStack dropStack = new ItemStack(TRContent.QUANTUM_TANK, 1);
this.writeToNBTWithoutCoords(tileEntity); this.writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound()); dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity); dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -44,7 +44,7 @@ import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import java.util.List; import java.util.List;
@ -105,7 +105,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor
* @return boolean Returns true if block is fusion coil * @return boolean Returns true if block is fusion coil
*/ */
public boolean isCoil(BlockPos pos) { public boolean isCoil(BlockPos pos) {
return world.getBlockState(pos).getBlock() == TRBlocks.FUSION_COIL; return world.getBlockState(pos).getBlock() == TRContent.FUSION_COIL;
} }
/** /**
@ -359,7 +359,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.FUSION_CONTROL_COMPUTER, 1); return new ItemStack(TRContent.FUSION_CONTROL_COMPUTER, 1);
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -37,7 +37,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegister; import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileLightningRod extends TilePowerAcceptor implements IToolDrop { public class TileLightningRod extends TilePowerAcceptor implements IToolDrop {
@ -145,6 +145,6 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop {
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.LIGHTNING_ROD); return new ItemStack(TRContent.LIGHTNING_ROD);
} }
} }

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TilePlasmaGenerator extends TileBaseFluidGenerator implements IContainerProvider { public class TilePlasmaGenerator extends TileBaseFluidGenerator implements IContainerProvider {
@ -53,7 +53,7 @@ public class TilePlasmaGenerator extends TileBaseFluidGenerator implements ICont
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.PLASMA_GENERATOR, 1); return new ItemStack(TRContent.PLASMA_GENERATOR, 1);
} }
@Override @Override

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.generator.TileBaseFluidGenerator; import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.DIESEL_GENERATOR, 1); return new ItemStack(TRContent.DIESEL_GENERATOR, 1);
} }
@Override @Override

View file

@ -37,7 +37,7 @@ import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileDragonEggSyphon extends TilePowerAcceptor public class TileDragonEggSyphon extends TilePowerAcceptor
@ -116,7 +116,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.DRAGON_EGG_SYPHON, 1); return new ItemStack(TRContent.DRAGON_EGG_SYPHON, 1);
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.generator.TileBaseFluidGenerator; import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.GAS_TURBINE, 1); return new ItemStack(TRContent.GAS_TURBINE, 1);
} }
@Override @Override

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.generator.TileBaseFluidGenerator; import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.SEMI_FLUID_GENERATOR, 1); return new ItemStack(TRContent.SEMI_FLUID_GENERATOR, 1);
} }
@Override @Override

View file

@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.generator.TileBaseFluidGenerator; import techreborn.tiles.generator.TileBaseFluidGenerator;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -54,7 +54,7 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.THERMAL_GENERATOR, 1); return new ItemStack(TRContent.THERMAL_GENERATOR, 1);
} }
@Override @Override

View file

@ -42,7 +42,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider { public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider {
@ -147,7 +147,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.SOLID_FUEL_GENEREATOR); return new ItemStack(TRContent.SOLID_FUEL_GENEREATOR);
} }
@Override @Override

View file

@ -34,7 +34,7 @@ import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.blocks.generator.BlockWindMill; import techreborn.blocks.generator.BlockWindMill;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
@ -107,6 +107,6 @@ public class TileWaterMill extends TilePowerAcceptor implements IToolDrop {
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.WATER_MILL); return new ItemStack(TRContent.WATER_MILL);
} }
} }

View file

@ -32,7 +32,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegister; import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
@ -95,6 +95,6 @@ public class TileWindMill extends TilePowerAcceptor implements IToolDrop {
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.WIND_MILL); return new ItemStack(TRContent.WIND_MILL);
} }
} }

View file

@ -46,7 +46,7 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileIronAlloyFurnace extends TileMachineBase public class TileIronAlloyFurnace extends TileMachineBase
@ -297,7 +297,7 @@ public class TileIronAlloyFurnace extends TileMachineBase
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.IRON_ALLOY_FURNACE, 1); return new ItemStack(TRContent.IRON_ALLOY_FURNACE, 1);
} }
public boolean isComplete() { public boolean isComplete() {

View file

@ -36,7 +36,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -50,7 +50,7 @@ public class TileDistillationTower extends TileGenericMachine implements IContai
public MultiblockChecker multiblockChecker; public MultiblockChecker multiblockChecker;
public TileDistillationTower() { public TileDistillationTower() {
super("DistillationTower", maxInput, maxEnergy, TRBlocks.DISTILLATION_TOWER, 6); super("DistillationTower", maxInput, maxEnergy, TRContent.DISTILLATION_TOWER, 6);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4, 5 }; final int[] outputs = new int[] { 2, 3, 4, 5 };
this.inventory = new Inventory<>(7, "TileDistillationTower", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(7, "TileDistillationTower", 64, this).withConfiguredAccess();

View file

@ -39,7 +39,6 @@ import techreborn.api.fluidreplicator.FluidReplicatorRecipeCrafter;
import techreborn.client.container.IContainerProvider; 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.TRBlocks;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@ -64,7 +63,7 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
int ticksSinceLastChange; int ticksSinceLastChange;
public TileFluidReplicator() { public TileFluidReplicator() {
super("FluidReplicator", maxInput, maxEnergy, TRBlocks.FLUID_REPLICATOR, 3); super("FluidReplicator", maxInput, maxEnergy, TRContent.FLUID_REPLICATOR, 3);
final int[] inputs = new int[] { 0 }; final int[] inputs = new int[] { 0 };
this.inventory = new Inventory<>(4, "TileFluidReplicator", 64, this, getInventoryAccess()); this.inventory = new Inventory<>(4, "TileFluidReplicator", 64, this, getInventoryAccess());
this.crafter = new FluidReplicatorRecipeCrafter(this, this.inventory, inputs, null); this.crafter = new FluidReplicatorRecipeCrafter(this, this.inventory, inputs, null);

View file

@ -35,7 +35,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -49,7 +49,7 @@ public class TileImplosionCompressor extends TileGenericMachine implements ICont
public MultiblockChecker multiblockChecker; public MultiblockChecker multiblockChecker;
public TileImplosionCompressor() { public TileImplosionCompressor() {
super("ImplosionCompressor", maxInput, maxEnergy, TRBlocks.IMPLOSION_COMPRESSOR, 4); super("ImplosionCompressor", maxInput, maxEnergy, TRContent.IMPLOSION_COMPRESSOR, 4);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3 }; final int[] outputs = new int[] { 2, 3 };
this.inventory = new Inventory<>(5, "TileImplosionCompressor", 64, this); this.inventory = new Inventory<>(5, "TileImplosionCompressor", 64, this);

View file

@ -44,7 +44,7 @@ import techreborn.blocks.BlockMachineCasing;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.multiblocks.MultiBlockCasing; import techreborn.multiblocks.MultiBlockCasing;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
import techreborn.tiles.TileMachineCasing; import techreborn.tiles.TileMachineCasing;
@ -61,7 +61,7 @@ public class TileIndustrialBlastFurnace extends TileGenericMachine implements IC
private int cachedHeat; private int cachedHeat;
public TileIndustrialBlastFurnace() { public TileIndustrialBlastFurnace() {
super("IndustrialBlastFurnace", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_BLAST_FURNACE, 4); super("IndustrialBlastFurnace", maxInput, maxEnergy, TRContent.INDUSTRIAL_BLAST_FURNACE, 4);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3 }; final int[] outputs = new int[] { 2, 3 };
this.inventory = new Inventory<>(5, "TileIndustrialBlastFurnace", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(5, "TileIndustrialBlastFurnace", 64, this).withConfiguredAccess();

View file

@ -48,7 +48,7 @@ import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -67,7 +67,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
int ticksSinceLastChange; int ticksSinceLastChange;
public TileIndustrialGrinder() { public TileIndustrialGrinder() {
super("IndustrialGrinder", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_GRINDER, 7); super("IndustrialGrinder", maxInput, maxEnergy, TRContent.INDUSTRIAL_GRINDER, 7);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] {2, 3, 4, 5}; final int[] outputs = new int[] {2, 3, 4, 5};
this.inventory = new Inventory<>(8, "TileIndustrialGrinder", 64, this, getInventoryAccess()); this.inventory = new Inventory<>(8, "TileIndustrialGrinder", 64, this, getInventoryAccess());

View file

@ -48,7 +48,7 @@ import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -66,7 +66,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
int ticksSinceLastChange; int ticksSinceLastChange;
public TileIndustrialSawmill() { public TileIndustrialSawmill() {
super("IndustrialSawmill", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_SAWMILL, 6); super("IndustrialSawmill", maxInput, maxEnergy, TRContent.INDUSTRIAL_SAWMILL, 6);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4 }; final int[] outputs = new int[] { 2, 3, 4 };
this.inventory = new Inventory<>(7, "TileSawmill", 64, this, getInventoryAccess()); this.inventory = new Inventory<>(7, "TileSawmill", 64, this, getInventoryAccess());

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -48,7 +48,7 @@ public class TileVacuumFreezer extends TileGenericMachine implements IContainerP
public MultiblockChecker multiblockChecker; public MultiblockChecker multiblockChecker;
public TileVacuumFreezer() { public TileVacuumFreezer() {
super("VacuumFreezer", maxInput, maxEnergy, TRBlocks.VACUUM_FREEZER, 2); super("VacuumFreezer", maxInput, maxEnergy, TRContent.VACUUM_FREEZER, 2);
final int[] inputs = new int[] { 0 }; final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 }; final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileVacuumFreezer", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(3, "TileVacuumFreezer", 64, this).withConfiguredAccess();

View file

@ -37,7 +37,7 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -49,7 +49,7 @@ public class TileAlloySmelter extends TileGenericMachine implements IContainerPr
public static int maxEnergy = 1_000; public static int maxEnergy = 1_000;
public TileAlloySmelter() { public TileAlloySmelter() {
super("AlloySmelter", maxInput, maxEnergy, TRBlocks.ALLOY_SMELTER, 3); super("AlloySmelter", maxInput, maxEnergy, TRContent.ALLOY_SMELTER, 3);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2 }; final int[] outputs = new int[] { 2 };
this.inventory = new Inventory<>(4, "TileAlloySmelter", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(4, "TileAlloySmelter", 64, this).withConfiguredAccess();

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileAssemblingMachine extends TileGenericMachine implements IContai
public static int maxEnergy = 10_000; public static int maxEnergy = 10_000;
public TileAssemblingMachine() { public TileAssemblingMachine() {
super("AssemblingMachine", maxInput, maxEnergy, TRBlocks.ASSEMBLY_MACHINE, 3); super("AssemblingMachine", maxInput, maxEnergy, TRContent.ASSEMBLY_MACHINE, 3);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2 }; final int[] outputs = new int[] { 2 };
this.inventory = new Inventory<>(4, "TileAssemblingMachine", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(4, "TileAssemblingMachine", 64, this).withConfiguredAccess();

View file

@ -48,8 +48,8 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
@ -425,7 +425,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRBlocks.AUTO_CRAFTING_TABLE, 1); return new ItemStack(TRContent.AUTO_CRAFTING_TABLE, 1);
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileChemicalReactor extends TileGenericMachine implements IContaine
public static int maxEnergy = 10_000; public static int maxEnergy = 10_000;
public TileChemicalReactor() { public TileChemicalReactor() {
super("ChemicalReactor", maxInput, maxEnergy, TRBlocks.CHEMICAL_REACTOR, 3); super("ChemicalReactor", maxInput, maxEnergy, TRContent.CHEMICAL_REACTOR, 3);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2 }; final int[] outputs = new int[] { 2 };
this.inventory = new Inventory<>(4, "TileChemicalReactor", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(4, "TileChemicalReactor", 64, this).withConfiguredAccess();

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileCompressor extends TileGenericMachine implements IContainerProv
public static int maxEnergy = 1000; public static int maxEnergy = 1000;
public TileCompressor() { public TileCompressor() {
super("Compressor", maxInput, maxEnergy, TRBlocks.COMPRESSOR, 2); super("Compressor", maxInput, maxEnergy, TRContent.COMPRESSOR, 2);
final int[] inputs = new int[] { 0 }; final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 }; final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileCompressor", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(3, "TileCompressor", 64, this).withConfiguredAccess();

View file

@ -40,7 +40,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileElectricFurnace extends TilePowerAcceptor public class TileElectricFurnace extends TilePowerAcceptor
@ -204,7 +204,7 @@ public class TileElectricFurnace extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.ELECTRIC_FURNACE, 1); return new ItemStack(TRContent.ELECTRIC_FURNACE, 1);
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileExtractor extends TileGenericMachine implements IContainerProvi
public static int maxEnergy = 1_000; public static int maxEnergy = 1_000;
public TileExtractor() { public TileExtractor() {
super("Extractor", maxInput, maxEnergy, TRBlocks.EXTRACTOR, 2); super("Extractor", maxInput, maxEnergy, TRContent.EXTRACTOR, 2);
final int[] inputs = new int[] { 0 }; final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 }; final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileExtractor", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(3, "TileExtractor", 64, this).withConfiguredAccess();

View file

@ -34,7 +34,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -46,7 +46,7 @@ public class TileGrinder extends TileGenericMachine implements IContainerProvide
public static int maxEnergy = 1_000; public static int maxEnergy = 1_000;
public TileGrinder() { public TileGrinder() {
super("Grinder", maxInput, maxEnergy, TRBlocks.GRINDER, 2); super("Grinder", maxInput, maxEnergy, TRContent.GRINDER, 2);
final int[] inputs = new int[] { 0 }; final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 }; final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileGrinder", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(3, "TileGrinder", 64, this).withConfiguredAccess();

View file

@ -35,7 +35,7 @@ import techreborn.api.Reference;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.items.DynamicCell; import techreborn.items.DynamicCell;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@ -48,7 +48,7 @@ public class TileIndustrialElectrolyzer extends TileGenericMachine implements IC
public static int maxEnergy = 10_000; public static int maxEnergy = 10_000;
public TileIndustrialElectrolyzer() { public TileIndustrialElectrolyzer() {
super("IndustrialElectrolyzer", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_ELECTROLYZER, 6); super("IndustrialElectrolyzer", maxInput, maxEnergy, TRContent.INDUSTRIAL_ELECTROLYZER, 6);
final int[] inputs = new int[] { 0, 1 }; final int[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2, 3, 4, 5 }; final int[] outputs = new int[] { 2, 3, 4, 5 };
this.inventory = new Inventory<>(7, "TileIndustrialElectrolyzer", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(7, "TileIndustrialElectrolyzer", 64, this).withConfiguredAccess();

View file

@ -35,7 +35,7 @@ import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.WorldUtils; import reborncore.common.util.WorldUtils;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import java.util.Iterator; import java.util.Iterator;
@ -138,6 +138,6 @@ public class TilePlayerDectector extends TilePowerAcceptor implements IToolDrop
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer p0) { public ItemStack getToolDrop(EntityPlayer p0) {
return new ItemStack(TRBlocks.PLAYER_DETECTOR, 1, 0); return new ItemStack(TRContent.PLAYER_DETECTOR, 1, 0);
} }
} }

View file

@ -39,7 +39,6 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks;
import techreborn.init.TRContent; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -188,7 +187,7 @@ public class TileRecycler extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.RECYCLER, 1); return new ItemStack(TRContent.RECYCLER, 1);
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -45,7 +45,7 @@ import techreborn.api.RollingMachineRecipe;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.ArrayList; import java.util.ArrayList;
@ -274,7 +274,7 @@ public class TileRollingMachine extends TilePowerAcceptor
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.ROLLING_MACHINE, 1); return new ItemStack(TRContent.ROLLING_MACHINE, 1);
} }
@Override @Override

View file

@ -33,7 +33,6 @@ import techreborn.api.recipe.ScrapboxRecipeCrafter;
import techreborn.client.container.IContainerProvider; 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.TRBlocks;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
@ -46,7 +45,7 @@ public class TileScrapboxinator extends TileGenericMachine implements IContainer
public static int maxEnergy = 1_000; public static int maxEnergy = 1_000;
public TileScrapboxinator() { public TileScrapboxinator() {
super("Scrapboxinator", maxInput, maxEnergy, TRBlocks.SCRAPBOXINATOR, 2); super("Scrapboxinator", maxInput, maxEnergy, TRContent.SCRAPBOXINATOR, 2);
final int[] inputs = new int[] { 0 }; final int[] inputs = new int[] { 0 };
final int[] outputs = new int[] { 1 }; final int[] outputs = new int[] { 1 };
this.inventory = new Inventory<>(3, "TileScrapboxinator", 64, this).withConfiguredAccess(); this.inventory = new Inventory<>(3, "TileScrapboxinator", 64, this).withConfiguredAccess();

View file

@ -35,7 +35,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
public class TileAdjustableSU extends TileEnergyStorage implements IContainerProvider { public class TileAdjustableSU extends TileEnergyStorage implements IContainerProvider {
@ -51,7 +51,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro
private int OUTPUT = 64; // The current output private int OUTPUT = 64; // The current output
public TileAdjustableSU() { public TileAdjustableSU() {
super("ADJUSTABLE_SU", 4, TRBlocks.ADJUSTABLE_SU, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy); super("ADJUSTABLE_SU", 4, TRContent.ADJUSTABLE_SU, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy);
} }
public void handleGuiInputFromClient(int id) { public void handleGuiInputFromClient(int id) {
@ -77,7 +77,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro
public ItemStack getDropWithNBT() { public ItemStack getDropWithNBT() {
NBTTagCompound tileEntity = new NBTTagCompound(); NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(TRBlocks.ADJUSTABLE_SU, 1); ItemStack dropStack = new ItemStack(TRContent.ADJUSTABLE_SU, 1);
writeToNBTWithoutCoords(tileEntity); writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound()); dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity); dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 14/03/2016. * Created by modmuss50 on 14/03/2016.
@ -41,7 +41,7 @@ public class TileHighVoltageSU extends TileEnergyStorage implements IContainerPr
* MFSU should store 40M FE with 2048 FE/t I/O * MFSU should store 40M FE with 2048 FE/t I/O
*/ */
public TileHighVoltageSU() { public TileHighVoltageSU() {
super("HIGH_VOLTAGE_SU", 2, TRBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10_000_000); super("HIGH_VOLTAGE_SU", 2, TRContent.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10_000_000);
} }
@Override @Override

View file

@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 14/03/2016. * Created by modmuss50 on 14/03/2016.
@ -37,7 +37,7 @@ import techreborn.init.TRBlocks;
public class TileLowVoltageSU extends TileEnergyStorage implements IContainerProvider { public class TileLowVoltageSU extends TileEnergyStorage implements IContainerProvider {
public TileLowVoltageSU() { public TileLowVoltageSU() {
super("BatBox", 2, TRBlocks.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000); super("BatBox", 2, TRContent.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000);
} }
@Override @Override

View file

@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 14/03/2016. * Created by modmuss50 on 14/03/2016.
@ -41,7 +41,7 @@ public class TileMediumVoltageSU extends TileEnergyStorage implements IContainer
* MFE should store 1.2M FE with 512 FE/t I/O * MFE should store 1.2M FE with 512 FE/t I/O
*/ */
public TileMediumVoltageSU() { public TileMediumVoltageSU() {
super("MEDIUM_VOLTAGE_SU", 2, TRBlocks.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 128, 128, 300000); super("MEDIUM_VOLTAGE_SU", 2, TRContent.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 128, 128, 300000);
} }
@Override @Override

View file

@ -34,7 +34,7 @@ import techreborn.TechReborn;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.storage.TileEnergyStorage; import techreborn.tiles.storage.TileEnergyStorage;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -50,7 +50,7 @@ public class TileInterdimensionalSU extends TileEnergyStorage implements IContai
public String ownerUdid; public String ownerUdid;
public TileInterdimensionalSU() { public TileInterdimensionalSU() {
super("IDSU", 2, TRBlocks.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy); super("IDSU", 2, TRContent.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy);
} }
@Override @Override

View file

@ -31,7 +31,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.api.IToolDrop; import reborncore.api.IToolDrop;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
public class TileLSUStorage extends TileMachineBase public class TileLSUStorage extends TileMachineBase
implements IToolDrop { implements IToolDrop {
@ -95,6 +95,6 @@ public class TileLSUStorage extends TileMachineBase
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRBlocks.LSU_STORAGE, 1); return new ItemStack(TRContent.LSU_STORAGE, 1);
} }
} }

View file

@ -38,7 +38,7 @@ import techreborn.blocks.storage.BlockLapotronicSU;
import techreborn.client.container.IContainerProvider; 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.TRBlocks; import techreborn.init.TRContent;
import techreborn.tiles.storage.TileEnergyStorage; import techreborn.tiles.storage.TileEnergyStorage;
import java.util.ArrayList; import java.util.ArrayList;
@ -59,7 +59,7 @@ public class TileLapotronicSU extends TileEnergyStorage implements IContainerPro
private ArrayList<LesuNetwork> countedNetworks = new ArrayList<>(); private ArrayList<LesuNetwork> countedNetworks = new ArrayList<>();
public TileLapotronicSU() { public TileLapotronicSU() {
super("LESU", 2, TRBlocks.LAPOTRONIC_SU, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000); super("LESU", 2, TRContent.LAPOTRONIC_SU, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000);
checkOverfill = false; checkOverfill = false;
} }

View file

@ -25,7 +25,7 @@
package techreborn.tiles.transformers; package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 16/03/2016. * Created by modmuss50 on 16/03/2016.
@ -33,7 +33,7 @@ import techreborn.init.TRBlocks;
public class TileHVTransformer extends TileTransformer { public class TileHVTransformer extends TileTransformer {
public TileHVTransformer() { public TileHVTransformer() {
super("HVTransformer", TRBlocks.HV_TRANSFORMER, EnumPowerTier.EXTREME); super("HVTransformer", TRContent.HV_TRANSFORMER, EnumPowerTier.EXTREME);
} }
} }

View file

@ -25,7 +25,7 @@
package techreborn.tiles.transformers; package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 16/03/2016. * Created by modmuss50 on 16/03/2016.
@ -33,7 +33,7 @@ import techreborn.init.TRBlocks;
public class TileLVTransformer extends TileTransformer { public class TileLVTransformer extends TileTransformer {
public TileLVTransformer() { public TileLVTransformer() {
super("LVTransformer", TRBlocks.LV_TRANSFORMER, EnumPowerTier.MEDIUM); super("LVTransformer", TRContent.LV_TRANSFORMER, EnumPowerTier.MEDIUM);
} }
} }

View file

@ -25,7 +25,7 @@
package techreborn.tiles.transformers; package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
/** /**
* Created by modmuss50 on 16/03/2016. * Created by modmuss50 on 16/03/2016.
@ -33,6 +33,6 @@ import techreborn.init.TRBlocks;
public class TileMVTransformer extends TileTransformer { public class TileMVTransformer extends TileTransformer {
public TileMVTransformer() { public TileMVTransformer() {
super("MVTransformer", TRBlocks.MV_TRANSFORMER, EnumPowerTier.HIGH); super("MVTransformer", TRContent.MV_TRANSFORMER, EnumPowerTier.HIGH);
} }
} }

View file

@ -34,7 +34,7 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import java.util.ArrayList; import java.util.ArrayList;
@ -46,9 +46,9 @@ public class StackWIPHandler {
public static ArrayList<ItemStack> devHeads = new ArrayList<>(); public static ArrayList<ItemStack> devHeads = new ArrayList<>();
public StackWIPHandler() { public StackWIPHandler() {
wipBlocks.add(TRBlocks.MAGICAL_ABSORBER); wipBlocks.add(TRContent.MAGICAL_ABSORBER);
wipBlocks.add(TRBlocks.CHUNK_LOADER); wipBlocks.add(TRContent.CHUNK_LOADER);
wipBlocks.add(TRBlocks.MAGIC_ENERGY_CONVERTER); wipBlocks.add(TRContent.MAGIC_ENERGY_CONVERTER);
addHead("modmuss50"); addHead("modmuss50");
addHead("Gigabit101"); addHead("Gigabit101");

View file

@ -34,7 +34,7 @@ import net.minecraftforge.common.IPlantable;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.blocks.BlockRubberLeaves; import techreborn.blocks.BlockRubberLeaves;
import techreborn.blocks.BlockRubberLog; import techreborn.blocks.BlockRubberLog;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import java.util.Random; import java.util.Random;
@ -80,7 +80,7 @@ public class RubberTreeGenerator extends WorldGenerator {
Block baseBlock = baseSate.getBlock(); Block baseBlock = baseSate.getBlock();
boolean hasPlacedBlock = false; boolean hasPlacedBlock = false;
if (baseBlock != null && baseBlock.canSustainPlant(baseSate, world, new BlockPos(x, y - 1, z), if (baseBlock != null && baseBlock.canSustainPlant(baseSate, world, new BlockPos(x, y - 1, z),
EnumFacing.UP, (IPlantable) TRBlocks.RUBBER_SAPLING) && y < worldHeight - treeHeight - 1) { EnumFacing.UP, (IPlantable) TRContent.RUBBER_SAPLING) && y < worldHeight - treeHeight - 1) {
for (yOffset = y; yOffset <= y + 1 + treeHeight; ++yOffset) { for (yOffset = y; yOffset <= y + 1 + treeHeight; ++yOffset) {
byte radius = 1; byte radius = 1;
if (yOffset == y) { if (yOffset == y) {
@ -130,7 +130,7 @@ public class RubberTreeGenerator extends WorldGenerator {
|| block.canBeReplacedByLeaves(state1, world, || block.canBeReplacedByLeaves(state1, world,
new BlockPos(xOffset, yOffset, zOffset)))) { new BlockPos(xOffset, yOffset, zOffset)))) {
this.setBlockAndNotifyAdequately(world, new BlockPos(xOffset, yOffset, zOffset), this.setBlockAndNotifyAdequately(world, new BlockPos(xOffset, yOffset, zOffset),
TRBlocks.RUBBER_LEAVES.getDefaultState().withProperty(BlockRubberLeaves.DECAYABLE, true).withProperty(BlockRubberLeaves.CHECK_DECAY, false)); TRContent.RUBBER_LEAVES.getDefaultState().withProperty(BlockRubberLeaves.DECAYABLE, true).withProperty(BlockRubberLeaves.CHECK_DECAY, false));
hasPlacedBlock = true; hasPlacedBlock = true;
} }
} }
@ -144,7 +144,7 @@ public class RubberTreeGenerator extends WorldGenerator {
Block block = state1.getBlock(); Block block = state1.getBlock();
if (block == null || block.isAir(state1, world, blockpos) || block.isLeaves(state1, world, blockpos) if (block == null || block.isAir(state1, world, blockpos) || block.isLeaves(state1, world, blockpos)
|| block.isReplaceable(world, blockpos)) { || block.isReplaceable(world, blockpos)) {
IBlockState newState = TRBlocks.RUBBER_LOG.getDefaultState(); IBlockState newState = TRContent.RUBBER_LOG.getDefaultState();
boolean isAddingSap = false; boolean isAddingSap = false;
if (rand.nextInt(TechReborn.worldGen.config.rubberTreeConfig.sapRarity) == 0) { if (rand.nextInt(TechReborn.worldGen.config.rubberTreeConfig.sapRarity) == 0) {
newState = newState.withProperty(BlockRubberLog.HAS_SAP, true) newState = newState.withProperty(BlockRubberLog.HAS_SAP, true)
@ -163,7 +163,7 @@ public class RubberTreeGenerator extends WorldGenerator {
if (topLogPos != null) { if (topLogPos != null) {
for (int i = 0; i < TechReborn.worldGen.config.rubberTreeConfig.spireHeight; i++) { for (int i = 0; i < TechReborn.worldGen.config.rubberTreeConfig.spireHeight; i++) {
BlockPos spikePos = topLogPos.up(i); BlockPos spikePos = topLogPos.up(i);
this.setBlockAndNotifyAdequately(world, spikePos, TRBlocks.RUBBER_LEAVES.getDefaultState() this.setBlockAndNotifyAdequately(world, spikePos, TRContent.RUBBER_LEAVES.getDefaultState()
.withProperty(BlockRubberLeaves.DECAYABLE, true).withProperty(BlockRubberLeaves.CHECK_DECAY, false)); .withProperty(BlockRubberLeaves.DECAYABLE, true).withProperty(BlockRubberLeaves.CHECK_DECAY, false));
} }
} }

View file

@ -33,7 +33,7 @@ import net.minecraft.world.World;
import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureBoundingBox;
import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureComponent;
import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraft.world.gen.structure.StructureVillagePieces;
import techreborn.init.TRBlocks; import techreborn.init.TRContent;
import techreborn.world.RubberTreeGenerator; import techreborn.world.RubberTreeGenerator;
import java.util.List; import java.util.List;
@ -71,7 +71,7 @@ public class VillageComponentRubberPlantaion extends StructureVillagePieces.Fiel
@Override @Override
protected void setBlockState(World worldIn, IBlockState blockstateIn, int x, int y, int z, StructureBoundingBox boundingboxIn) { protected void setBlockState(World worldIn, IBlockState blockstateIn, int x, int y, int z, StructureBoundingBox boundingboxIn) {
if (isCrop(blockstateIn)) { if (isCrop(blockstateIn)) {
blockstateIn = TRBlocks.RUBBER_SAPLING.getDefaultState(); blockstateIn = TRContent.RUBBER_SAPLING.getDefaultState();
} }
super.setBlockState(worldIn, blockstateIn, x, y, z, boundingboxIn); super.setBlockState(worldIn, blockstateIn, x, y, z, boundingboxIn);
} }
@ -99,7 +99,7 @@ public class VillageComponentRubberPlantaion extends StructureVillagePieces.Fiel
BlockPos pos = new BlockPos(this.getXWithOffset(row, coloum), this.getYWithOffset(1), this.getZWithOffset(row, coloum)); BlockPos pos = new BlockPos(this.getXWithOffset(row, coloum), this.getYWithOffset(1), this.getZWithOffset(row, coloum));
if (!new RubberTreeGenerator(true).growTree(world, random, pos.getX(), pos.getY(), pos.getZ())) { if (!new RubberTreeGenerator(true).growTree(world, random, pos.getX(), pos.getY(), pos.getZ())) {
//Puts the sapling back if the tree did not grow //Puts the sapling back if the tree did not grow
setBlockState(world, TRBlocks.RUBBER_SAPLING.getDefaultState(), row, 1, coloum, structureBoundingBox); setBlockState(world, TRContent.RUBBER_SAPLING.getDefaultState(), row, 1, coloum, structureBoundingBox);
} }
} }
} }