Blocks moved to TRContent
This commit is contained in:
parent
9f9595f955
commit
dd94ff31c9
69 changed files with 614 additions and 603 deletions
|
@ -47,11 +47,11 @@ public class OreDict {
|
|||
*/
|
||||
public static void init() {
|
||||
// Blocks
|
||||
OreUtil.registerOre("fenceIron", TRBlocks.REFINED_IRON_FENCE);
|
||||
OreUtil.registerOre("woodRubber", TRBlocks.RUBBER_LOG);
|
||||
OreUtil.registerOre("glassReinforced", TRBlocks.REINFORCED_GLASS);
|
||||
OreUtil.registerOre("treeSapling", TRBlocks.RUBBER_SAPLING);
|
||||
OreUtil.registerOre("saplingRubber", TRBlocks.RUBBER_SAPLING);
|
||||
OreUtil.registerOre("fenceIron", TRContent.REFINED_IRON_FENCE);
|
||||
OreUtil.registerOre("woodRubber", TRContent.RUBBER_LOG);
|
||||
OreUtil.registerOre("glassReinforced", TRContent.REINFORCED_GLASS);
|
||||
OreUtil.registerOre("treeSapling", TRContent.RUBBER_SAPLING);
|
||||
OreUtil.registerOre("saplingRubber", TRContent.RUBBER_SAPLING);
|
||||
|
||||
// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
||||
// OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
}
|
|
@ -1,12 +1,15 @@
|
|||
package techreborn.init;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
|
||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemSlab;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IItemProvider;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
@ -24,14 +27,86 @@ import reborncore.common.registration.impl.ConfigRegistry;
|
|||
import reborncore.common.util.BucketHandler;
|
||||
import techreborn.TechReborn;
|
||||
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.BlockMachineFrame;
|
||||
import techreborn.blocks.BlockNuke;
|
||||
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.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.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.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.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.ItemFrequencyTransmitter;
|
||||
import techreborn.items.ItemManual;
|
||||
|
@ -78,6 +153,88 @@ import com.google.common.collect.Maps;
|
|||
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||
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
|
||||
public static Item CLOAKING_DEVICE;
|
||||
public static Item LAPOTRONIC_ORBPACK;
|
||||
|
@ -645,6 +802,230 @@ public class TRContent {
|
|||
});
|
||||
Arrays.stream(SolarPanels.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() {
|
||||
|
@ -748,6 +1129,8 @@ public class TRContent {
|
|||
// TODO: do we need this at all?
|
||||
BlockMachineBase.advancedFrameStack = new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame());
|
||||
BlockMachineBase.basicFrameStack = new ItemStack(TRContent.MachineBlocks.BASIC.getFrame());
|
||||
|
||||
TechReborn.LOGGER.debug("TechReborns Items Loaded");
|
||||
}
|
||||
|
||||
@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));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -32,7 +32,6 @@ import net.minecraftforge.oredict.OreDictionary;
|
|||
import reborncore.common.util.RebornCraftingHelper;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
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_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium");
|
||||
// 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(getStack(TRBlocks.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron");
|
||||
registerShaped(getStack(TRBlocks.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.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron");
|
||||
registerShaped(getStack(TRContent.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", '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");
|
||||
|
||||
// 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));
|
||||
|
||||
//Machines
|
||||
registerShapeless(getStack(TRBlocks.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(TRBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateAluminum", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRBlocks.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(TRBlocks.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(TRBlocks.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic");
|
||||
registerShaped(getStack(TRBlocks.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRBlocks.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRBlocks.WATER_MILL), "SWS", "WGW", "SWS", 'S', "stickWood", 'W', "plankWood", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR));
|
||||
registerShapeless(getStack(TRContent.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE));
|
||||
registerShaped(getStack(TRContent.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRContent.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(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRContent.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(TRContent.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(TRContent.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic");
|
||||
registerShaped(getStack(TRContent.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR));
|
||||
registerShaped(getStack(TRContent.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(TRContent.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(TRBlocks.IRON_ALLOY_FURNACE), "III", "F F", "III", 'I', "ingotRefinedIron", 'F', getStack(TRBlocks.IRON_FURNACE));
|
||||
registerShaped(getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), "RER", "CFC", "RER", 'R', "plateIron", 'E', getStack(TRBlocks.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(TRBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "plateAluminum", 'E', getStack(TRBlocks.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(TRBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(TRBlocks.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.IRON_ALLOY_FURNACE), "III", "F F", "III", 'I', "ingotRefinedIron", 'F', getStack(TRContent.IRON_FURNACE));
|
||||
registerShaped(getStack(TRContent.INDUSTRIAL_ELECTROLYZER), "RER", "CFC", "RER", 'R', "plateIron", 'E', getStack(TRContent.EXTRACTOR), 'C', "circuitAdvanced", 'F', "machineBlockAdvanced");
|
||||
registerShaped(getStack(TRContent.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron", 'E', getStack(TRContent.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(TRContent.INDUSTRIAL_SAWMILL), "PAP", "SSS", "ACA", 'P', "ingotRefinedIron", 'A', "circuitAdvanced", 'S', TRContent.Parts.DIAMOND_SAW_BLADE.getStack(), 'C', "machineBlockAdvanced");
|
||||
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(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(TRBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(TRBlocks.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(TRBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(TRBlocks.EXTRACTOR), 'P', getStack(TRBlocks.COMPRESSOR), 'E', getStack(TRBlocks.EXTRACTOR));
|
||||
registerShaped(getStack(TRBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(TRBlocks.COMPRESSOR), 'B', "machineBlockBasic");
|
||||
registerShaped(getStack(TRBlocks.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(TRBlocks.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(TRBlocks.ELECTRIC_FURNACE), 'M', "machineBlockBasic");
|
||||
registerShaped(getStack(TRBlocks.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRBlocks.ADJUSTABLE_SU));
|
||||
registerShaped(getStack(TRBlocks.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(TRBlocks.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(TRBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(TRBlocks.FUSION_COIL), 'C', "circuitMaster");
|
||||
registerShaped(getStack(TRContent.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(TRContent.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(TRContent.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(TRContent.EXTRACTOR), 'P', getStack(TRContent.COMPRESSOR), 'E', getStack(TRContent.EXTRACTOR));
|
||||
registerShaped(getStack(TRContent.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(TRContent.COMPRESSOR), 'B', "machineBlockBasic");
|
||||
registerShaped(getStack(TRContent.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron");
|
||||
registerShaped(getStack(TRContent.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced");
|
||||
registerShaped(getStack(TRContent.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(TRContent.ELECTRIC_FURNACE), 'M', "machineBlockBasic");
|
||||
registerShaped(getStack(TRContent.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRContent.ADJUSTABLE_SU));
|
||||
registerShaped(getStack(TRContent.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRContent.LAPOTRONIC_ORB), 'C', "energyCrystal");
|
||||
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(TRContent.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic");
|
||||
registerShaped(getStack(TRContent.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRContent.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt");
|
||||
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(TRBlocks.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(TRBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRBlocks.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(TRBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(TRBlocks.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(TRBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(TRBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR));
|
||||
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(TRContent.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack());
|
||||
registerShaped(getStack(TRContent.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRContent.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRContent.LAPOTRONIC_ORB));
|
||||
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(TRContent.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(TRContent.COMPUTER_CUBE));
|
||||
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(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, 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");
|
||||
|
@ -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', "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(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.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.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.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(TRBlocks.ELECTRIC_FURNACE), " C ", "RFR", " ", 'C', "circuitBasic", 'F', getStack(TRBlocks.IRON_FURNACE), 'R', "dustRedstone");
|
||||
registerShaped(getStack(TRBlocks.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(TRBlocks.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic");
|
||||
registerShaped(getStack(TRBlocks.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(TRBlocks.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(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(TRBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(TRBlocks.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(TRBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone");
|
||||
registerShaped(getStack(TRContent.COMPRESSOR), "S S", "SCS", "SMS", 'C', "circuitBasic", 'M', "machineBlockBasic", 'S', "stone");
|
||||
registerShaped(getStack(TRContent.ELECTRIC_FURNACE), " C ", "RFR", " ", 'C', "circuitBasic", 'F', getStack(TRContent.IRON_FURNACE), 'R', "dustRedstone");
|
||||
registerShaped(getStack(TRContent.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(TRContent.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic");
|
||||
registerShaped(getStack(TRContent.IRON_FURNACE), "III", "I I", "III", 'I', "ingotIron");
|
||||
registerShaped(getStack(TRContent.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE));
|
||||
registerShaped(getStack(TRContent.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRContent.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic");
|
||||
registerShaped(getStack(TRContent.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic");
|
||||
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(TRContent.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(TRContent.QUANTUM_CHEST));
|
||||
registerShaped(getStack(TRContent.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', TRContent.Parts.CARBON_FIBER.getStack());
|
||||
registerShaped(getStack(TRContent.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone");
|
||||
|
||||
|
||||
// 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(TRBlocks.RUBBER_LOG_STAIR), "W ", "WW ", "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(TRContent.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(TRContent.RUBBER_PLANKS));
|
||||
|
||||
RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRContent.MANUAL), "ingotRefinedIron",
|
||||
Items.BOOK);
|
||||
|
|
|
@ -32,7 +32,7 @@ import net.minecraft.item.ItemStack;
|
|||
import reborncore.api.recipe.RecipeHandler;
|
||||
import techreborn.api.Reference;
|
||||
import techreborn.api.recipe.machines.ScrapboxRecipe;
|
||||
import techreborn.init.TRBlocks;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.items.DynamicCell;
|
||||
import techreborn.utils.StackWIPHandler;
|
||||
|
||||
|
@ -185,7 +185,7 @@ public class ScrapboxRecipes extends RecipeMethods {
|
|||
register(getStack(Blocks.LEAVES2, 1, 0));
|
||||
register(getStack(Blocks.LEAVES2, 1, 1));
|
||||
|
||||
register(getStack(TRBlocks.RUBBER_SAPLING));
|
||||
register(getStack(TRContent.RUBBER_SAPLING));
|
||||
|
||||
// for (String i : ItemDusts.types) {
|
||||
// register(ItemDusts.getDustByName(i));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue