Move machine casings over and temp gen localization

This commit is contained in:
ProfessorProspector 2018-09-17 17:07:11 -07:00
parent c77dc683a1
commit b4ca82a97b
20 changed files with 987 additions and 570 deletions

View file

@ -24,8 +24,10 @@
package techreborn;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
@ -41,6 +43,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.registry.EntityRegistry;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.VillagerRegistry;
import net.minecraftforge.fml.relauncher.Side;
@ -51,12 +54,12 @@ import reborncore.api.recipe.RecipeHandler;
import reborncore.common.multiblock.MultiblockEventHandler;
import reborncore.common.multiblock.MultiblockServerTickHandler;
import reborncore.common.network.RegisterPacketEvent;
import reborncore.common.util.StringUtils;
import reborncore.common.util.Torus;
import techreborn.api.TechRebornAPI;
import techreborn.blocks.cable.EnumCableType;
import techreborn.client.GuiHandler;
import techreborn.command.TechRebornDevCommand;
import techreborn.utils.BehaviorDispenseScrapbox;
import techreborn.entities.EntityNukePrimed;
import techreborn.events.BlockBreakHandler;
import techreborn.events.TRRecipeHandler;
@ -65,6 +68,7 @@ import techreborn.init.*;
import techreborn.packets.*;
import techreborn.proxies.CommonProxy;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.utils.BehaviorDispenseScrapbox;
import techreborn.utils.StackWIPHandler;
import techreborn.world.OilLakeGenerator;
import techreborn.world.TechRebornWorldGen;
@ -182,6 +186,39 @@ public class TechReborn {
// RecipeHandler.scanForDupeRecipes();
// RecipeConfigManager.save();
//recipeCompact.saveMissingItems(configDir);
//todo: remove, gens localization
for (Item item : ForgeRegistries.ITEMS.getValues()) {
if (item.getRegistryName().getNamespace().equals("techreborn")) {
StringBuilder localName = new StringBuilder();
String[] words = item.getRegistryName().getPath().split("_|\\.");
for (String word : words) {
if (!word.contains("techreborn")) {
if (localName.length() > 0) {
localName.append(" ");
}
localName.append(StringUtils.toFirstCapital(word));
}
}
System.out.println("item.techreborn." + item.getRegistryName().getPath() + ".name=" + localName);
}
}
for (Block item : ForgeRegistries.BLOCKS.getValues()) {
if (item.getRegistryName().getNamespace().equals("techreborn")) {
StringBuilder localName = new StringBuilder();
String[] words = item.getRegistryName().getPath().split("_|\\.");
for (String word : words) {
if (!word.contains("techreborn")) {
if (localName.length() > 0) {
localName.append(" ");
}
localName.append(StringUtils.toFirstCapital(word));
}
}
System.out.println("tile.techreborn." + item.getRegistryName().getPath() + ".name=" + localName);
}
}
}
@Mod.EventHandler

View file

@ -27,146 +27,29 @@ package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.RebornCoreConfig;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper;
import reborncore.common.multiblock.BlockMultiblockBase;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.tiles.TileMachineCasing;
import techreborn.utils.TechRebornCreativeTab;
public class BlockMachineCasing extends BlockMultiblockBase {
// public static final String[] types = new String[] { "standard", "reinforced", "advanced" };
// public static final PropertyString TYPE = new PropertyString("type", types);
// private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public final int heatCapacity;
public BlockMachineCasing() {
public BlockMachineCasing(int heatCapacity) {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
this.heatCapacity = heatCapacity;
setHardness(2F);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/structure"));
BlockWrenchEventHandler.wrenableBlocks.add(this);
}
// public static ItemStack getStackByName(String name, int count) {
// name = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name);
// for (int i = 0; i < types.length; i++) {
// if (types[i].equalsIgnoreCase(name)) {
// return new ItemStack(ModBlocks.MACHINE_CASINGS, count, i);
// }
// }
// throw new InvalidParameterException("The machine casing " + name + " could not be found.");
// }
//
// public static ItemStack getStackByName(String name) {
// return getStackByName(name, 1);
// }
/**
* Provides heat info per casing for Industrial Blast Furnace
* @param state IBlockstate Blockstate with Machine casing
* @return Integer Heat value for casing
*/
public int getHeatFromState(IBlockState state) {
Block casing = state.getBlock();
if (casing == null ) {
public static int getHeatFromState(IBlockState state) {
Block block = state.getBlock();
if (!(block instanceof BlockMachineCasing)) {
return 0;
}
if (casing == ModBlocks.MACHINE_CASINGS_STANDARD) {
return 1020 / 25;
}
else if (casing == ModBlocks.MACHINE_CASINGS_REINFORCED) {
return 1700 / 25;
}
else if (casing == ModBlocks.MACHINE_CASINGS_ADVANCED) {
return 2380 / 25;
}
return 0;
BlockMachineCasing casing = (BlockMachineCasing) block;
return casing.heatCapacity;
}
@Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
if (RebornCoreConfig.wrenchRequired){
Block casing = state.getBlock();
if (casing == ModBlocks.MACHINE_CASINGS_REINFORCED) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
}
else if (casing == ModBlocks.MACHINE_CASINGS_ADVANCED) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
}
else {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
}
}
else {
super.getDrops(drops, world, pos, state, fortune);
}
}
@Override
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand,
EnumFacing side, float hitX, float hitY, float hitZ) {
ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND);
TileEntity tileEntity = worldIn.getTileEntity(pos);
// We extended BaseTileBlock. Thus we should always have tile entity. I hope.
if (tileEntity == null) {
return false;
}
if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) {
if (WrenchHelper.handleWrench(stack, worldIn, pos, playerIn, side)) {
return true;
}
}
return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ);
}
// @Override
// public IBlockState getStateFromMeta(int meta) {
// if (meta > types.length) {
// meta = 0;
// }
// return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
// }
//
// @Override
// public int getMetaFromState(IBlockState state) {
// return typesList.indexOf(state.getValue(TYPE));
// }
//
// @Override
// protected BlockStateContainer createBlockState() {
// return new BlockStateContainer(this, TYPE);
// }
//
// @Override
// public Item getItemDropped(IBlockState state, Random rand, int fortune) {
// return Item.getItemFromBlock(this);
// }
//
// @Override
// public int damageDropped(IBlockState state) {
// return getMetaFromState(state);
// }
@Override
public TileEntity createNewTileEntity(final World world, final int meta) {

View file

@ -0,0 +1,38 @@
/*
* 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.blocks;
import net.minecraft.block.material.Material;
import reborncore.common.BaseBlock;
import techreborn.utils.TechRebornCreativeTab;
public class BlockMachineFrame extends BaseBlock {
public BlockMachineFrame() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(1f);
}
}

View file

@ -1,94 +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.blocks;
import net.minecraft.block.material.Material;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.BaseBlock;
import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
public class BlockMachineFrames extends BaseBlock {
// public static final String[] types = new String[] { "basic", "advanced", "highly_advanced" };
// public static final PropertyString TYPE = new PropertyString("type", types);
// private static final List<String> typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types));
public BlockMachineFrames() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(1f);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/structure"));
}
// public static ItemStack getFrameByName(String name, int count) {
// name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
// if (name.equals("machine")) {
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 0);
// }
// if (name.equals("advanced_machine")) {
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 1);
// }
// if (name.equals("highly_advanced_machine")) {
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 2);
// }
//
// for (int i = 0; i < types.length; i++) {
// if (types[i].equalsIgnoreCase(name)) {
// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i);
// }
// }
// throw new InvalidParameterException("The part " + name + " could not be found.");
// }
//
// public static ItemStack getFrameByName(String name) {
// return getFrameByName(name, 1);
// }
// @Override
// public int damageDropped(IBlockState state) {
// return getMetaFromState(state);
// }
//
// @Override
// public IBlockState getStateFromMeta(int meta) {
// if (meta > types.length) {
// meta = 0;
// }
// return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta));
// }
//
// @Override
// public int getMetaFromState(IBlockState state) {
// return typesList.indexOf(state.getValue(TYPE));
// }
// @Override
// protected BlockStateContainer createBlockState() {
// return new BlockStateContainer(this, TYPE);
// }
}

View file

@ -51,7 +51,7 @@ import techreborn.itemblocks.*;
* Registers all TR blocks
*/
public class ModBlocks {
// Misc Blocks
public static Block CABLE;
public static Block COMPUTER_CUBE;
@ -74,8 +74,8 @@ public class ModBlocks {
public static Block RUBBER_SAPLING;
// Machines - machines
public static Block ALLOY_SMELTER;
public static Block ASSEMBLY_MACHINE;
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;
@ -97,7 +97,7 @@ public class ModBlocks {
public static Block ROLLING_MACHINE;
public static Block SCRAPBOXINATOR;
public static Block VACUUM_FREEZER;
// Machines - generators
public static Block CREATIVE_SOLAR_PANEL;
public static Block DIESEL_GENERATOR;
@ -110,10 +110,10 @@ public class ModBlocks {
public static Block SEMI_FLUID_GENERATOR;
public static Block SOLAR_PANEL;
public static Block SOLID_FUEL_GENEREATOR;
public static Block THERMAL_GENERATOR;
public static Block THERMAL_GENERATOR;
public static Block WATER_MILL;
public static Block WIND_MILL;
public static Block WIND_MILL;
// Machines - storage
public static Block CREATIVE_QUANTUM_CHEST;
public static Block CREATIVE_QUANTUM_TANK;
@ -133,7 +133,7 @@ public class ModBlocks {
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;
@ -148,41 +148,23 @@ public class ModBlocks {
*/
public static void init() {
TRContent.registerBlocks();
// Misc. blocks
COMPUTER_CUBE = new BlockComputerCube();
registerBlock(COMPUTER_CUBE, "computer_cube");
CABLE = new BlockCable();
registerBlock(CABLE, ItemBlockCable.class, "cable");
MACHINE_BLOCK_ADVANCED = new BlockMachineFrames();
registerBlock(MACHINE_BLOCK_ADVANCED, "machineBlockAdvanced");
MACHINE_BLOCK_BASIC = new BlockMachineFrames();
registerBlock(MACHINE_BLOCK_BASIC, "machineBlockBasic");
MACHINE_BLOCK_ELITE = new BlockMachineFrames();
registerBlock(MACHINE_BLOCK_ELITE, "machineBlockElite");
MACHINE_CASINGS_ADVANCED = new BlockMachineCasing();
registerBlock(MACHINE_CASINGS_ADVANCED, "machineCasingAdvanced");
MACHINE_CASINGS_REINFORCED = new BlockMachineCasing();
registerBlock(MACHINE_CASINGS_REINFORCED, "machineCasingReinforced");
MACHINE_CASINGS_STANDARD = new BlockMachineCasing();
registerBlock(MACHINE_CASINGS_STANDARD, "machineCasingStandard");
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");
@ -197,120 +179,120 @@ public class ModBlocks {
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
CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel();
registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel");
DIESEL_GENERATOR = new BlockDieselGenerator();
registerBlock(DIESEL_GENERATOR, "diesel_generator");
DRAGON_EGG_SYPHON = new BlockDragonEggSyphon();
registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon");
FUSION_COIL = new BlockFusionCoil();
registerBlock(FUSION_COIL, "fusion_coil");
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer();
registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer");
GAS_TURBINE = new BlockGasTurbine();
registerBlock(GAS_TURBINE, "gas_turbine");
LIGHTNING_ROD = new BlockLightningRod();
registerBlock(LIGHTNING_ROD, "lightning_rod");
PLASMA_GENERATOR = new BlockPlasmaGenerator();
registerBlock(PLASMA_GENERATOR, "plasma_generator");
SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator();
registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator");
SOLAR_PANEL = new BlockSolarPanel();
registerBlock(SOLAR_PANEL, ItemBlockSolarPanel.class, "solar_panel");
SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator();
registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator");
THERMAL_GENERATOR = new BlockThermalGenerator();
registerBlock(THERMAL_GENERATOR, "thermal_generator");
WATER_MILL = new BlockWaterMill();
registerBlock(WATER_MILL, "water_mill");
@ -320,26 +302,26 @@ public class ModBlocks {
// 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");
@ -348,7 +330,7 @@ public class ModBlocks {
LSU_STORAGE = new BlockLSUStorage();
registerBlock(LSU_STORAGE, "lsu_storage");
LOW_VOLTAGE_SU = new BlockLowVoltageSU();
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
@ -357,7 +339,7 @@ public class ModBlocks {
HIGH_VOLTAGE_SU = new BlockHighVoltageSU();
registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su");
LV_TRANSFORMER = new BlockLVTransformer();
registerBlock(LV_TRANSFORMER, "lv_transformer");
@ -365,30 +347,30 @@ public class ModBlocks {
registerBlock(MV_TRANSFORMER, "mv_transformer");
HV_TRANSFORMER = new BlockHVTransformer();
registerBlock(HV_TRANSFORMER, "hv_transformer");
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");
registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector");
//TODO enable when done

View file

@ -6,6 +6,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IItemProvider;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
@ -16,8 +17,11 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.TechReborn;
import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockStorage;
import techreborn.blocks.tier1.BlockElectricFurnace;
import techreborn.items.ItemUpgrade;
import techreborn.utils.InitUtils;
@ -29,16 +33,20 @@ public class TRContent {
public static void registerBlocks() {
Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
Arrays.stream(MachineBlocks.values()).forEach(value -> {
RebornRegistry.registerBlock(value.frame);
RebornRegistry.registerBlock(value.casing);
});
}
public static void registerItems() {
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Upgrades.values()).forEach(value -> RebornRegistry.registerItem(value.item));
}
@ -94,12 +102,30 @@ public class TRContent {
});
}
ResourceLocation machineBlockRL = new ResourceLocation(TechReborn.MOD_ID, "machine_block");
for (MachineBlocks value : MachineBlocks.values()) {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.frame), 0, new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_frame"));
ModelLoader.setCustomStateMapper(value.frame, new DefaultStateMapper() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_frame");
}
});
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.casing), 0, new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_casing"));
ModelLoader.setCustomStateMapper(value.casing, new DefaultStateMapper() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_casing");
}
});
}
ResourceLocation upgradeRL = new ResourceLocation(TechReborn.MOD_ID, "items/misc/upgrades");
Arrays.stream(Upgrades.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(upgradeRL, "type=" + value.name)));
}
public static enum Ores {
public static enum Ores implements IItemProvider {
BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE,
SPHALERITE, TIN, TUNGSTEN;
@ -109,11 +135,16 @@ public class TRContent {
private Ores() {
name = this.toString().toLowerCase();
block = new BlockOre();
InitUtils.setupIngredient(block, name, "ore");
InitUtils.setup(block, name + "_ore");
}
@Override
public Item asItem() {
return Item.getItemFromBlock(block);
}
}
public static enum StorageBlocks {
public static enum StorageBlocks implements IItemProvider {
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE,
IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY,
SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC;
@ -124,11 +155,55 @@ public class TRContent {
private StorageBlocks() {
name = this.toString().toLowerCase();
block = new BlockStorage();
InitUtils.setupIngredient(block, name, "storage_block");
InitUtils.setup(block, name + "_storage_block");
}
@Override
public Item asItem() {
return Item.getItemFromBlock(block);
}
}
public static enum Dusts {
public static enum MachineBlocks {
BASIC(1020 / 25),
ADVANCED(1700 / 25),
INDUSTRIAL(2380 / 25);
public final String name;
public final Block frame;
public final Block casing;
private MachineBlocks(int casingHeatCapacity) {
name = this.toString().toLowerCase();
frame = new BlockMachineFrame();
InitUtils.setup(frame, name + "_machine_frame");
casing = new BlockMachineCasing(casingHeatCapacity);
InitUtils.setup(casing, name + "_machine_casing");
}
public Block getFrame() {
return frame;
}
public Block getCasing() {
return casing;
}
}
public static enum Machine {
ELECTRIC_FURNACE(new BlockElectricFurnace());
public final String name;
public final Block block;
private <B extends Block> Machine(B block) {
this.name = this.toString().toLowerCase();
this.block = block;
InitUtils.setup(block, name);
}
}
public static enum Dusts implements IItemProvider {
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
FLINT, GALENA, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK,
@ -142,7 +217,7 @@ public class TRContent {
private Dusts() {
name = this.toString().toLowerCase();
item = new Item();
InitUtils.setupIngredient(item, name, "dust");
InitUtils.setup(item, name + "_dust");
}
public ItemStack getStack() {
@ -152,9 +227,14 @@ public class TRContent {
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@Override
public Item asItem() {
return item;
}
}
public static enum SmallDusts {
public static enum SmallDusts implements IItemProvider {
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
FLINT, GALENA, GLOWSTONE, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE,
@ -168,8 +248,7 @@ public class TRContent {
private SmallDusts() {
name = this.toString().toLowerCase();
item = new Item();
item.setRegistryName(new ResourceLocation(TechReborn.MOD_ID, name));
item.setTranslationKey(TechReborn.MOD_ID + ".small_dust." + this.toString().toLowerCase());
InitUtils.setup(item, name + "_small_dust");
}
public ItemStack getStack() {
@ -179,9 +258,14 @@ public class TRContent {
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@Override
public Item asItem() {
return item;
}
}
public static enum Gems {
public static enum Gems implements IItemProvider {
PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET;
public final String name;
@ -190,7 +274,7 @@ public class TRContent {
private Gems() {
name = this.toString().toLowerCase();
item = new Item();
InitUtils.setupIngredient(item, name, "gem");
InitUtils.setup(item, name + "_gem");
}
public ItemStack getStack() {
@ -200,9 +284,14 @@ public class TRContent {
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@Override
public Item asItem() {
return item;
}
}
public static enum Ingots {
public static enum Ingots implements IItemProvider {
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM,
LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
@ -212,7 +301,7 @@ public class TRContent {
private Ingots() {
name = this.toString().toLowerCase();
item = new Item();
InitUtils.setupIngredient(item, name, "ingot");
InitUtils.setup(item, name + "_ingot");
}
public ItemStack getStack() {
@ -222,9 +311,14 @@ public class TRContent {
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@Override
public Item asItem() {
return item;
}
}
public static enum Nuggets {
public static enum Nuggets implements IItemProvider {
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL,
PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
@ -234,7 +328,7 @@ public class TRContent {
private Nuggets() {
name = this.toString().toLowerCase();
item = new Item();
InitUtils.setupIngredient(item, name, "nugget");
InitUtils.setup(item, name + "_nugget");
}
public ItemStack getStack() {
@ -244,9 +338,14 @@ public class TRContent {
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@Override
public Item asItem() {
return item;
}
}
public static enum Parts {
public static enum Parts implements IItemProvider {
CARBON_FIBER,
CARBON_MESH,
@ -306,9 +405,14 @@ public class TRContent {
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@Override
public Item asItem() {
return item;
}
}
public static enum Plates {
public static enum Plates implements IItemProvider {
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CARBON, COAL, COPPER, DIAMOND, ELECTRUM, EMERALD, GOLD, INVAR,
IRIDIUM_ALLOY, IRIDIUM, IRON, LAPIS, LAZURITE, LEAD, MAGNALIUM, NICKEL, OBSIDIAN, PERIDOT, PLATINUM, RED_GARNET,
REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD,
@ -320,7 +424,7 @@ public class TRContent {
private Plates() {
name = this.toString().toLowerCase();
item = new Item();
InitUtils.setupIngredient(item, name, "plate");
InitUtils.setup(item, name + "_plate");
}
public ItemStack getStack() {
@ -330,6 +434,11 @@ public class TRContent {
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@Override
public Item asItem() {
return item;
}
}
@ConfigRegistry(config = "items", category = "upgrades", key = "overclcoker_speed", comment = "Overclocker behavior speed multipiler")
@ -341,7 +450,7 @@ public class TRContent {
@ConfigRegistry(config = "items", category = "upgrades", key = "energy_storage", comment = "Energy storage behavior extra power")
public static double energyStoragePower = 40_000;
public static enum Upgrades {
public static enum Upgrades implements IItemProvider {
OVERCLOCKER((tile, handler, stack) -> {
TilePowerAcceptor powerAcceptor = null;
if (tile instanceof TilePowerAcceptor) {
@ -379,7 +488,12 @@ public class TRContent {
Upgrades(IUpgrade upgrade) {
name = this.toString().toLowerCase();
item = new ItemUpgrade(name, upgrade);
InitUtils.setupIngredient(item, name, "upgrade");
InitUtils.setup(item, name + "_upgrade");
}
@Override
public Item asItem() {
return item;
}
}
}

View file

@ -77,28 +77,33 @@ public class TRItems {
public static Item RED_CELL_BATTERY;
// Tools
public static Item ADVANCED_CHAINSAW;
public static Item ADVANCED_DRILL;
public static Item ADVANCED_JACKHAMMER;
public static Item TREE_TAP;
public static Item WRENCH;
public static Item BASIC_CHAINSAW;
public static Item BASIC_DRILL;
public static Item BASIC_JACKHAMMER;
public static Item DEBUG_TOOL;
public static Item ELECTRIC_TREE_TAP;
public static Item ADVANCED_CHAINSAW;
public static Item ADVANCED_DRILL;
public static Item ADVANCED_JACKHAMMER;
public static Item ROCK_CUTTER;
public static Item INDUSTRIAL_CHAINSAW;
public static Item INDUSTRIAL_DRILL;
public static Item INDUSTRIAL_JACKHAMMER;
public static Item NANOSABER;
public static Item OMNI_TOOL;
public static Item ROCK_CUTTER;
public static Item TREE_TAP;
public static Item WRENCH;
public static Item DEBUG_TOOL;
// Other
public static DynamicCell CELL;
public static Item FREQUENCY_TRANSMITTER;
public static Item MANUAL;
public static Item SCRAP_BOX;
public static Item MANUAL;
public static DynamicCell CELL;
// Gem armor & tools
@Nullable
@ -178,44 +183,6 @@ public class TRItems {
TRContent.registerItems();
// Battery
registerItem(ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal"));
registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crystal"));
registerItem(LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb"));
registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery"));
registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery"));
// Tools
registerItem(ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill"));
registerItem(ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw"));
registerItem(ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer"));
registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill"));
registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw"));
registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer"));
registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool"));
registerItem(ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap"));
registerItem(INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill"));
registerItem(INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw"));
registerItem(INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer"));
registerItem(NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber"));
registerItem(OMNI_TOOL = InitUtils.setup(new ItemOmniTool(), "omni_tool"));
registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter"));
registerItem(TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap"));
registerItem(WRENCH = InitUtils.setup(new ItemWrench(), "wrench"));
// Armor
registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device"));
registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack"));
registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack"));
// Other
registerItem(CELL = InitUtils.setup(new DynamicCell(), "cell"));
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
registerItem(FREQUENCY_TRANSMITTER = InitUtils.setup(new ItemFrequencyTransmitter(), "frequency_transmitter"));
registerItem(MANUAL = InitUtils.setup(new ItemManual(), "manual"));
registerItem(SCRAP_BOX = InitUtils.setup(new ItemScrapBox(), "scrap_box"));
// Gem armor & tools
if (ConfigTechReborn.enableGemArmorAndTools) {
//Todo: repair with tags
@ -264,6 +231,47 @@ public class TRItems {
registerItem(PERIDOT_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET, "gemPeridot"), "peridot_boots"));
}
// Battery
registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery"));
registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery"));
registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack"));
registerItem(ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal"));
registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crystal"));
registerItem(LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb"));
registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack"));
// Tools
registerItem(TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap"));
registerItem(WRENCH = InitUtils.setup(new ItemWrench(), "wrench"));
registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill"));
registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw"));
registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer"));
registerItem(ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap"));
registerItem(ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill"));
registerItem(ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw"));
registerItem(ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer"));
registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter"));
registerItem(INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill"));
registerItem(INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw"));
registerItem(INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer"));
registerItem(NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber"));
registerItem(OMNI_TOOL = InitUtils.setup(new ItemOmniTool(), "omni_tool"));
// Armor
registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device"));
// Other
registerItem(FREQUENCY_TRANSMITTER = InitUtils.setup(new ItemFrequencyTransmitter(), "frequency_transmitter"));
registerItem(SCRAP_BOX = InitUtils.setup(new ItemScrapBox(), "scrap_box"));
registerItem(MANUAL = InitUtils.setup(new ItemManual(), "manual"));
registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool"));
registerItem(CELL = InitUtils.setup(new DynamicCell(), "cell"));
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
// TODO: do we need this at all?
BlockMachineBase.advancedFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED);
BlockMachineBase.basicFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC);

View file

@ -31,9 +31,6 @@ import net.minecraft.item.crafting.Ingredient;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.OreUtil;
import reborncore.common.util.StringUtils;
import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrames;
import techreborn.blocks.BlockOre;
import techreborn.blocks.cable.BlockCable;
import techreborn.items.*;

View file

@ -34,7 +34,7 @@ import reborncore.common.multiblock.MultiblockControllerBase;
import reborncore.common.multiblock.MultiblockValidationException;
import reborncore.common.multiblock.rectangular.RectangularMultiblockControllerBase;
import reborncore.common.multiblock.rectangular.RectangularMultiblockTileEntityBase;
import techreborn.init.ModBlocks;
import techreborn.blocks.BlockMachineCasing;
public class MultiBlockCasing extends RectangularMultiblockControllerBase {
@ -335,7 +335,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
@Override
protected void isBlockGoodForFrame(World world, int x, int y, int z) throws MultiblockValidationException {
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
if (block == ModBlocks.MACHINE_CASINGS_STANDARD || block == ModBlocks.MACHINE_CASINGS_REINFORCED || block == ModBlocks.MACHINE_CASINGS_ADVANCED) {
if (block instanceof BlockMachineCasing) {
} else {
super.isBlockGoodForFrame(world, x, y, z);

View file

@ -24,17 +24,12 @@
package techreborn.tiles;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import reborncore.api.IToolDrop;
import reborncore.common.multiblock.MultiblockControllerBase;
import reborncore.common.multiblock.rectangular.RectangularMultiblockTileEntityBase;
import techreborn.multiblocks.MultiBlockCasing;
public class TileMachineCasing extends RectangularMultiblockTileEntityBase
implements IToolDrop {
public class TileMachineCasing extends RectangularMultiblockTileEntityBase {
@Override
public void onMachineActivated() {
@ -89,10 +84,4 @@ public class TileMachineCasing extends RectangularMultiblockTileEntityBase
public void update() {
}
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(Item.getItemFromBlock(world.getBlockState(pos).getBlock()));
}
}

View file

@ -13,24 +13,10 @@ public class InitUtils {
return item;
}
public static <I extends Item> I setupIngredient(I item, String name, String type) {
item.setRegistryName(new ResourceLocation(TechReborn.MOD_ID, name + "_" + type));
item.setTranslationKey(TechReborn.MOD_ID + "." + type + "." + name);
item.setCreativeTab(TechReborn.TAB);
return item;
}
public static <B extends Block> B setup(B block, String name) {
block.setRegistryName(new ResourceLocation(TechReborn.MOD_ID, name));
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
block.setCreativeTab(TechReborn.TAB);
return block;
}
public static <B extends Block> B setupIngredient(B block, String name, String type) {
block.setRegistryName(new ResourceLocation(TechReborn.MOD_ID, name + "_" + type));
block.setTranslationKey(TechReborn.MOD_ID + "." + type + "." + name);
block.setCreativeTab(TechReborn.TAB);
return block;
}
}

View file

@ -10,20 +10,35 @@
{}
],
"type": {
"basic": {
"basic_machine_frame": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier1_machine_block"
}
},
"advanced": {
"advanced_machine_frame": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier2_machine_block"
}
},
"highly_advanced": {
"industrial_machine_frame": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier3_machine_block"
}
},
"basic_machine_casing": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier1_casing"
}
},
"advanced_machine_casing": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier2_casing"
}
},
"industrial_machine_casing": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier3_casing"
}
}
}
}

View file

@ -1,30 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"textures": {},
"transform": "forge:default-block",
"model": "cube_all"
},
"variants": {
"inventory": [
{}
],
"type": {
"standard": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier1_casing"
}
},
"reinforced": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier2_casing"
}
},
"advanced": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier3_casing"
}
}
}
}
}

View file

@ -1,22 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"all": "techreborn:blocks/machines/structure/tier2_machine_block"
}
},
"variants": {
"inventory": [
{
}
],
"normal": [
{
}
]
}
}

View file

@ -1,22 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"all": "techreborn:blocks/machines/structure/tier1_machine_block"
}
},
"variants": {
"inventory": [
{
}
],
"normal": [
{
}
]
}
}

View file

@ -1,22 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"all": "techreborn:blocks/machines/structure/tier3_machine_block"
}
},
"variants": {
"inventory": [
{
}
],
"normal": [
{
}
]
}
}

View file

@ -1,22 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"all": "techreborn:blocks/machines/structure/tier3_casing"
}
},
"variants": {
"inventory": [
{
}
],
"normal": [
{
}
]
}
}

View file

@ -1,22 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"all": "techreborn:blocks/machines/structure/tier2_casing"
}
},
"variants": {
"inventory": [
{
}
],
"normal": [
{
}
]
}
}

View file

@ -1,22 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"all": "techreborn:blocks/machines/structure/tier1_casing"
}
},
"variants": {
"inventory": [
{
}
],
"normal": [
{
}
]
}
}

View file

@ -639,3 +639,627 @@ advancements.techreborn.treetap=TreeTap
advancements.techreborn.treetap.desc=Now that you have crafted a tree tap you will want to use it on a sap spot on a rubber tree.
advancements.techreborn.sap=Rubber Sap
advancements.techreborn.sap.desc=Well done, you now have rubber sap. You will want to smelt it in a furnace to create rubber next.
#TEMPORARY AUTO-GENERATED LOCALIZATION! THIS IS PURELY TO MAKE DEV WORK A BIT EASIER WITHOUT A FUCKTON OF UNLOCALIZED NAMES
item.techreborn.bauxite_ore.name=Bauxite Ore
item.techreborn.cinnabar_ore.name=Cinnabar Ore
item.techreborn.copper_ore.name=Copper Ore
item.techreborn.galena_ore.name=Galena Ore
item.techreborn.iridium_ore.name=Iridium Ore
item.techreborn.lead_ore.name=Lead Ore
item.techreborn.peridot_ore.name=Peridot Ore
item.techreborn.pyrite_ore.name=Pyrite Ore
item.techreborn.ruby_ore.name=Ruby Ore
item.techreborn.sapphire_ore.name=Sapphire Ore
item.techreborn.sheldonite_ore.name=Sheldonite Ore
item.techreborn.silver_ore.name=Silver Ore
item.techreborn.sodalite_ore.name=Sodalite Ore
item.techreborn.sphalerite_ore.name=Sphalerite Ore
item.techreborn.tin_ore.name=Tin Ore
item.techreborn.tungsten_ore.name=Tungsten Ore
item.techreborn.aluminum_storage_block.name=Aluminum Storage Block
item.techreborn.brass_storage_block.name=Brass Storage Block
item.techreborn.bronze_storage_block.name=Bronze Storage Block
item.techreborn.chrome_storage_block.name=Chrome Storage Block
item.techreborn.copper_storage_block.name=Copper Storage Block
item.techreborn.electrum_storage_block.name=Electrum Storage Block
item.techreborn.invar_storage_block.name=Invar Storage Block
item.techreborn.iridium_storage_block.name=Iridium Storage Block
item.techreborn.iridium_reinforced_stone_storage_block.name=Iridium Reinforced Stone Storage Block
item.techreborn.iridium_reinforced_tungstensteel_storage_block.name=Iridium Reinforced Tungstensteel Storage Block
item.techreborn.lead_storage_block.name=Lead Storage Block
item.techreborn.nickel_storage_block.name=Nickel Storage Block
item.techreborn.osmium_storage_block.name=Osmium Storage Block
item.techreborn.peridot_storage_block.name=Peridot Storage Block
item.techreborn.platinum_storage_block.name=Platinum Storage Block
item.techreborn.red_garnet_storage_block.name=Red Garnet Storage Block
item.techreborn.refined_iron_storage_block.name=Refined Iron Storage Block
item.techreborn.ruby_storage_block.name=Ruby Storage Block
item.techreborn.sapphire_storage_block.name=Sapphire Storage Block
item.techreborn.silver_storage_block.name=Silver Storage Block
item.techreborn.steel_storage_block.name=Steel Storage Block
item.techreborn.tin_storage_block.name=Tin Storage Block
item.techreborn.titanium_storage_block.name=Titanium Storage Block
item.techreborn.tungsten_storage_block.name=Tungsten Storage Block
item.techreborn.tungstensteel_storage_block.name=Tungstensteel Storage Block
item.techreborn.yellow_garnet_storage_block.name=Yellow Garnet Storage Block
item.techreborn.zinc_storage_block.name=Zinc Storage Block
item.techreborn.basic_machine_frame.name=Basic Machine Frame
item.techreborn.basic_machine_casing.name=Basic Machine Casing
item.techreborn.advanced_machine_frame.name=Advanced Machine Frame
item.techreborn.advanced_machine_casing.name=Advanced Machine Casing
item.techreborn.industrial_machine_frame.name=Industrial Machine Frame
item.techreborn.industrial_machine_casing.name=Industrial Machine Casing
item.techreborn.computer_cube.name=Computer Cube
item.techreborn.cable.name=Cable
item.techreborn.nuke.name=Nuke
item.techreborn.refined_iron_fence.name=Refined Iron Fence
item.techreborn.reinforced_glass.name=Reinforced Glass
item.techreborn.rubber_leaves.name=Rubber Leaves
item.techreborn.rubber_log.name=Rubber Log
item.techreborn.rubber_plank_double_slab.name=Rubber Plank Double Slab
item.techreborn.rubber_plank_stair.name=Rubber Plank Stair
item.techreborn.rubber_planks.name=Rubber Planks
item.techreborn.rubber_sapling.name=Rubber Sapling
item.techreborn.alloy_smelter.name=Alloy Smelter
item.techreborn.assembly_machine.name=Assembly Machine
item.techreborn.auto_crafting_table.name=Auto Crafting Table
item.techreborn.compressor.name=Compressor
item.techreborn.chemical_reactor.name=Chemical Reactor
item.techreborn.distillation_tower.name=Distillation Tower
item.techreborn.electric_furnace.name=Electric Furnace
item.techreborn.extractor.name=Extractor
item.techreborn.fluid_replicator.name=Fluid Replicator
item.techreborn.grinder.name=Grinder
item.techreborn.implosion_compressor.name=Implosion Compressor
item.techreborn.industrial_blast_furnace.name=Industrial Blast Furnace
item.techreborn.industrial_centrifuge.name=Industrial Centrifuge
item.techreborn.industrial_electrolyzer.name=Industrial Electrolyzer
item.techreborn.industrial_grinder.name=Industrial Grinder
item.techreborn.industrial_sawmill.name=Industrial Sawmill
item.techreborn.iron_alloy_furnace.name=Iron Alloy Furnace
item.techreborn.iron_furnace.name=Iron Furnace
item.techreborn.matter_fabricator.name=Matter Fabricator
item.techreborn.recycler.name=Recycler
item.techreborn.rolling_machine.name=Rolling Machine
item.techreborn.scrapboxinator.name=Scrapboxinator
item.techreborn.vacuum_freezer.name=Vacuum Freezer
item.techreborn.creative_solar_panel.name=Creative Solar Panel
item.techreborn.diesel_generator.name=Diesel Generator
item.techreborn.dragon_egg_syphon.name=Dragon Egg Syphon
item.techreborn.fusion_coil.name=Fusion Coil
item.techreborn.fusion_control_computer.name=Fusion Control Computer
item.techreborn.gas_turbine.name=Gas Turbine
item.techreborn.lightning_rod.name=Lightning Rod
item.techreborn.plasma_generator.name=Plasma Generator
item.techreborn.semi_fluid_generator.name=Semi Fluid Generator
item.techreborn.solar_panel.name=Solar Panel
item.techreborn.solid_fuel_generator.name=Solid Fuel Generator
item.techreborn.thermal_generator.name=Thermal Generator
item.techreborn.water_mill.name=Water Mill
item.techreborn.wind_mill.name=Wind Mill
item.techreborn.creative_quantum_chest.name=Creative Quantum Chest
item.techreborn.creative_quantum_tank.name=Creative Quantum Tank
item.techreborn.digital_chest.name=Digital Chest
item.techreborn.quantum_chest.name=Quantum Chest
item.techreborn.quantum_tank.name=Quantum Tank
item.techreborn.adjustable_su.name=Adjustable Su
item.techreborn.charge_o_mat.name=Charge O Mat
item.techreborn.interdimensional_su.name=Interdimensional Su
item.techreborn.lapotronic_su.name=Lapotronic Su
item.techreborn.lsu_storage.name=Lsu Storage
item.techreborn.low_voltage_su.name=Low Voltage Su
item.techreborn.medium_voltage_su.name=Medium Voltage Su
item.techreborn.high_voltage_su.name=High Voltage Su
item.techreborn.lv_transformer.name=Lv Transformer
item.techreborn.mv_transformer.name=Mv Transformer
item.techreborn.hv_transformer.name=Hv Transformer
item.techreborn.alarm.name=Alarm
item.techreborn.chunk_loader.name=Chunk Loader
item.techreborn.lamp_incandescent.name=Lamp Incandescent
item.techreborn.lamp_led.name=Lamp Led
item.techreborn.magic_energy_absorber.name=Magic Energy Absorber
item.techreborn.magic_energy_converter.name=Magic Energy Converter
item.techreborn.player_detector.name=Player Detector
item.techreborn.techreborn_techreborn.berylium.name=Berylium
item.techreborn.techreborn_techreborn.calcium.name=Calcium
item.techreborn.techreborn_techreborn.calciumcarbonate.name=Calciumcarbonate
item.techreborn.techreborn_techreborn.chlorite.name=Chlorite
item.techreborn.techreborn_techreborn.deuterium.name=Deuterium
item.techreborn.techreborn_techreborn.glyceryl.name=Glyceryl
item.techreborn.techreborn_techreborn.helium.name=Helium
item.techreborn.techreborn_techreborn.helium3.name=Helium3
item.techreborn.techreborn_techreborn.heliumplasma.name=Heliumplasma
item.techreborn.techreborn_techreborn.hydrogen.name=Hydrogen
item.techreborn.techreborn_techreborn.lithium.name=Lithium
item.techreborn.techreborn_techreborn.mercury.name=Mercury
item.techreborn.techreborn_techreborn.methane.name=Methane
item.techreborn.techreborn_techreborn.nitrocoalfuel.name=Nitrocoalfuel
item.techreborn.techreborn_techreborn.nitrofuel.name=Nitrofuel
item.techreborn.techreborn_techreborn.nitrogen.name=Nitrogen
item.techreborn.techreborn_techreborn.nitrogendioxide.name=Nitrogendioxide
item.techreborn.techreborn_techreborn.potassium.name=Potassium
item.techreborn.techreborn_techreborn.silicon.name=Silicon
item.techreborn.techreborn_techreborn.sodium.name=Sodium
item.techreborn.techreborn_techreborn.sodiumpersulfate.name=Sodiumpersulfate
item.techreborn.techreborn_techreborn.tritium.name=Tritium
item.techreborn.techreborn_techreborn.wolframium.name=Wolframium
item.techreborn.techreborn_techreborn.carbon.name=Carbon
item.techreborn.techreborn_techreborn.carbonfiber.name=Carbonfiber
item.techreborn.techreborn_techreborn.nitrocarbon.name=Nitrocarbon
item.techreborn.techreborn_techreborn.sulfur.name=Sulfur
item.techreborn.techreborn_techreborn.sodiumsulfide.name=Sodiumsulfide
item.techreborn.techreborn_techreborn.diesel.name=Diesel
item.techreborn.techreborn_techreborn.nitrodiesel.name=Nitrodiesel
item.techreborn.techreborn_techreborn.oil.name=Oil
item.techreborn.techreborn_techreborn.sulfuricacid.name=Sulfuricacid
item.techreborn.techreborn_techreborn.compressedair.name=Compressedair
item.techreborn.techreborn_techreborn.electrolyzedwater.name=Electrolyzedwater
item.techreborn.advanced_alloy_ingot.name=Advanced Alloy Ingot
item.techreborn.aluminum_ingot.name=Aluminum Ingot
item.techreborn.brass_ingot.name=Brass Ingot
item.techreborn.bronze_ingot.name=Bronze Ingot
item.techreborn.chrome_ingot.name=Chrome Ingot
item.techreborn.copper_ingot.name=Copper Ingot
item.techreborn.electrum_ingot.name=Electrum Ingot
item.techreborn.hot_tungstensteel_ingot.name=Hot Tungstensteel Ingot
item.techreborn.invar_ingot.name=Invar Ingot
item.techreborn.iridium_alloy_ingot.name=Iridium Alloy Ingot
item.techreborn.iridium_ingot.name=Iridium Ingot
item.techreborn.lead_ingot.name=Lead Ingot
item.techreborn.mixed_metal_ingot.name=Mixed Metal Ingot
item.techreborn.nickel_ingot.name=Nickel Ingot
item.techreborn.platinum_ingot.name=Platinum Ingot
item.techreborn.refined_iron_ingot.name=Refined Iron Ingot
item.techreborn.silver_ingot.name=Silver Ingot
item.techreborn.steel_ingot.name=Steel Ingot
item.techreborn.tin_ingot.name=Tin Ingot
item.techreborn.titanium_ingot.name=Titanium Ingot
item.techreborn.tungsten_ingot.name=Tungsten Ingot
item.techreborn.tungstensteel_ingot.name=Tungstensteel Ingot
item.techreborn.zinc_ingot.name=Zinc Ingot
item.techreborn.aluminum_nugget.name=Aluminum Nugget
item.techreborn.brass_nugget.name=Brass Nugget
item.techreborn.bronze_nugget.name=Bronze Nugget
item.techreborn.chrome_nugget.name=Chrome Nugget
item.techreborn.copper_nugget.name=Copper Nugget
item.techreborn.diamond_nugget.name=Diamond Nugget
item.techreborn.electrum_nugget.name=Electrum Nugget
item.techreborn.hot_tungstensteel_nugget.name=Hot Tungstensteel Nugget
item.techreborn.invar_nugget.name=Invar Nugget
item.techreborn.iridium_nugget.name=Iridium Nugget
item.techreborn.lead_nugget.name=Lead Nugget
item.techreborn.nickel_nugget.name=Nickel Nugget
item.techreborn.platinum_nugget.name=Platinum Nugget
item.techreborn.refined_iron_nugget.name=Refined Iron Nugget
item.techreborn.silver_nugget.name=Silver Nugget
item.techreborn.steel_nugget.name=Steel Nugget
item.techreborn.tin_nugget.name=Tin Nugget
item.techreborn.titanium_nugget.name=Titanium Nugget
item.techreborn.tungsten_nugget.name=Tungsten Nugget
item.techreborn.tungstensteel_nugget.name=Tungstensteel Nugget
item.techreborn.zinc_nugget.name=Zinc Nugget
item.techreborn.peridot_gem.name=Peridot Gem
item.techreborn.red_garnet_gem.name=Red Garnet Gem
item.techreborn.ruby_gem.name=Ruby Gem
item.techreborn.sapphire_gem.name=Sapphire Gem
item.techreborn.yellow_garnet_gem.name=Yellow Garnet Gem
item.techreborn.almandine_dust.name=Almandine Dust
item.techreborn.aluminum_dust.name=Aluminum Dust
item.techreborn.andesite_dust.name=Andesite Dust
item.techreborn.andradite_dust.name=Andradite Dust
item.techreborn.ashes_dust.name=Ashes Dust
item.techreborn.basalt_dust.name=Basalt Dust
item.techreborn.bauxite_dust.name=Bauxite Dust
item.techreborn.brass_dust.name=Brass Dust
item.techreborn.bronze_dust.name=Bronze Dust
item.techreborn.calcite_dust.name=Calcite Dust
item.techreborn.charcoal_dust.name=Charcoal Dust
item.techreborn.chrome_dust.name=Chrome Dust
item.techreborn.cinnabar_dust.name=Cinnabar Dust
item.techreborn.clay_dust.name=Clay Dust
item.techreborn.coal_dust.name=Coal Dust
item.techreborn.copper_dust.name=Copper Dust
item.techreborn.dark_ashes_dust.name=Dark Ashes Dust
item.techreborn.diamond_dust.name=Diamond Dust
item.techreborn.diorite_dust.name=Diorite Dust
item.techreborn.electrum_dust.name=Electrum Dust
item.techreborn.emerald_dust.name=Emerald Dust
item.techreborn.ender_eye_dust.name=Ender Eye Dust
item.techreborn.ender_pearl_dust.name=Ender Pearl Dust
item.techreborn.endstone_dust.name=Endstone Dust
item.techreborn.flint_dust.name=Flint Dust
item.techreborn.galena_dust.name=Galena Dust
item.techreborn.gold_dust.name=Gold Dust
item.techreborn.granite_dust.name=Granite Dust
item.techreborn.grossular_dust.name=Grossular Dust
item.techreborn.invar_dust.name=Invar Dust
item.techreborn.iron_dust.name=Iron Dust
item.techreborn.lazurite_dust.name=Lazurite Dust
item.techreborn.lead_dust.name=Lead Dust
item.techreborn.magnesium_dust.name=Magnesium Dust
item.techreborn.manganese_dust.name=Manganese Dust
item.techreborn.marble_dust.name=Marble Dust
item.techreborn.netherrack_dust.name=Netherrack Dust
item.techreborn.nickel_dust.name=Nickel Dust
item.techreborn.obsidian_dust.name=Obsidian Dust
item.techreborn.olivine_dust.name=Olivine Dust
item.techreborn.peridot_dust.name=Peridot Dust
item.techreborn.phosphorous_dust.name=Phosphorous Dust
item.techreborn.platinum_dust.name=Platinum Dust
item.techreborn.pyrite_dust.name=Pyrite Dust
item.techreborn.pyrope_dust.name=Pyrope Dust
item.techreborn.red_garnet_dust.name=Red Garnet Dust
item.techreborn.ruby_dust.name=Ruby Dust
item.techreborn.saltpeter_dust.name=Saltpeter Dust
item.techreborn.sapphire_dust.name=Sapphire Dust
item.techreborn.saw_dust.name=Saw Dust
item.techreborn.silver_dust.name=Silver Dust
item.techreborn.sodalite_dust.name=Sodalite Dust
item.techreborn.spessartine_dust.name=Spessartine Dust
item.techreborn.sphalerite_dust.name=Sphalerite Dust
item.techreborn.steel_dust.name=Steel Dust
item.techreborn.sulfur_dust.name=Sulfur Dust
item.techreborn.tin_dust.name=Tin Dust
item.techreborn.titanium_dust.name=Titanium Dust
item.techreborn.tungsten_dust.name=Tungsten Dust
item.techreborn.uvarovite_dust.name=Uvarovite Dust
item.techreborn.yellow_garnet_dust.name=Yellow Garnet Dust
item.techreborn.zinc_dust.name=Zinc Dust
item.techreborn.almandine_small_dust.name=Almandine Small Dust
item.techreborn.aluminum_small_dust.name=Aluminum Small Dust
item.techreborn.andesite_small_dust.name=Andesite Small Dust
item.techreborn.andradite_small_dust.name=Andradite Small Dust
item.techreborn.ashes_small_dust.name=Ashes Small Dust
item.techreborn.basalt_small_dust.name=Basalt Small Dust
item.techreborn.bauxite_small_dust.name=Bauxite Small Dust
item.techreborn.brass_small_dust.name=Brass Small Dust
item.techreborn.bronze_small_dust.name=Bronze Small Dust
item.techreborn.calcite_small_dust.name=Calcite Small Dust
item.techreborn.charcoal_small_dust.name=Charcoal Small Dust
item.techreborn.chrome_small_dust.name=Chrome Small Dust
item.techreborn.cinnabar_small_dust.name=Cinnabar Small Dust
item.techreborn.clay_small_dust.name=Clay Small Dust
item.techreborn.coal_small_dust.name=Coal Small Dust
item.techreborn.copper_small_dust.name=Copper Small Dust
item.techreborn.dark_ashes_small_dust.name=Dark Ashes Small Dust
item.techreborn.diamond_small_dust.name=Diamond Small Dust
item.techreborn.diorite_small_dust.name=Diorite Small Dust
item.techreborn.electrum_small_dust.name=Electrum Small Dust
item.techreborn.emerald_small_dust.name=Emerald Small Dust
item.techreborn.ender_eye_small_dust.name=Ender Eye Small Dust
item.techreborn.ender_pearl_small_dust.name=Ender Pearl Small Dust
item.techreborn.endstone_small_dust.name=Endstone Small Dust
item.techreborn.flint_small_dust.name=Flint Small Dust
item.techreborn.galena_small_dust.name=Galena Small Dust
item.techreborn.glowstone_small_dust.name=Glowstone Small Dust
item.techreborn.gold_small_dust.name=Gold Small Dust
item.techreborn.granite_small_dust.name=Granite Small Dust
item.techreborn.grossular_small_dust.name=Grossular Small Dust
item.techreborn.invar_small_dust.name=Invar Small Dust
item.techreborn.iron_small_dust.name=Iron Small Dust
item.techreborn.lazurite_small_dust.name=Lazurite Small Dust
item.techreborn.lead_small_dust.name=Lead Small Dust
item.techreborn.magnesium_small_dust.name=Magnesium Small Dust
item.techreborn.manganese_small_dust.name=Manganese Small Dust
item.techreborn.marble_small_dust.name=Marble Small Dust
item.techreborn.netherrack_small_dust.name=Netherrack Small Dust
item.techreborn.nickel_small_dust.name=Nickel Small Dust
item.techreborn.obsidian_small_dust.name=Obsidian Small Dust
item.techreborn.olivine_small_dust.name=Olivine Small Dust
item.techreborn.peridot_small_dust.name=Peridot Small Dust
item.techreborn.phosphorous_small_dust.name=Phosphorous Small Dust
item.techreborn.platinum_small_dust.name=Platinum Small Dust
item.techreborn.pyrite_small_dust.name=Pyrite Small Dust
item.techreborn.pyrope_small_dust.name=Pyrope Small Dust
item.techreborn.redstone_small_dust.name=Redstone Small Dust
item.techreborn.red_garnet_small_dust.name=Red Garnet Small Dust
item.techreborn.ruby_small_dust.name=Ruby Small Dust
item.techreborn.saltpeter_small_dust.name=Saltpeter Small Dust
item.techreborn.sapphire_small_dust.name=Sapphire Small Dust
item.techreborn.saw_small_dust.name=Saw Small Dust
item.techreborn.silver_small_dust.name=Silver Small Dust
item.techreborn.sodalite_small_dust.name=Sodalite Small Dust
item.techreborn.spessartine_small_dust.name=Spessartine Small Dust
item.techreborn.sphalerite_small_dust.name=Sphalerite Small Dust
item.techreborn.steel_small_dust.name=Steel Small Dust
item.techreborn.sulfur_small_dust.name=Sulfur Small Dust
item.techreborn.tin_small_dust.name=Tin Small Dust
item.techreborn.titanium_small_dust.name=Titanium Small Dust
item.techreborn.tungsten_small_dust.name=Tungsten Small Dust
item.techreborn.uvarovite_small_dust.name=Uvarovite Small Dust
item.techreborn.yellow_garnet_small_dust.name=Yellow Garnet Small Dust
item.techreborn.zinc_small_dust.name=Zinc Small Dust
item.techreborn.advanced_alloy_plate.name=Advanced Alloy Plate
item.techreborn.aluminum_plate.name=Aluminum Plate
item.techreborn.brass_plate.name=Brass Plate
item.techreborn.bronze_plate.name=Bronze Plate
item.techreborn.carbon_plate.name=Carbon Plate
item.techreborn.coal_plate.name=Coal Plate
item.techreborn.copper_plate.name=Copper Plate
item.techreborn.diamond_plate.name=Diamond Plate
item.techreborn.electrum_plate.name=Electrum Plate
item.techreborn.emerald_plate.name=Emerald Plate
item.techreborn.gold_plate.name=Gold Plate
item.techreborn.invar_plate.name=Invar Plate
item.techreborn.iridium_alloy_plate.name=Iridium Alloy Plate
item.techreborn.iridium_plate.name=Iridium Plate
item.techreborn.iron_plate.name=Iron Plate
item.techreborn.lapis_plate.name=Lapis Plate
item.techreborn.lazurite_plate.name=Lazurite Plate
item.techreborn.lead_plate.name=Lead Plate
item.techreborn.magnalium_plate.name=Magnalium Plate
item.techreborn.nickel_plate.name=Nickel Plate
item.techreborn.obsidian_plate.name=Obsidian Plate
item.techreborn.peridot_plate.name=Peridot Plate
item.techreborn.platinum_plate.name=Platinum Plate
item.techreborn.red_garnet_plate.name=Red Garnet Plate
item.techreborn.redstone_plate.name=Redstone Plate
item.techreborn.refined_iron_plate.name=Refined Iron Plate
item.techreborn.ruby_plate.name=Ruby Plate
item.techreborn.sapphire_plate.name=Sapphire Plate
item.techreborn.silicon_plate.name=Silicon Plate
item.techreborn.silver_plate.name=Silver Plate
item.techreborn.steel_plate.name=Steel Plate
item.techreborn.tin_plate.name=Tin Plate
item.techreborn.titanium_plate.name=Titanium Plate
item.techreborn.tungsten_plate.name=Tungsten Plate
item.techreborn.tungstensteel_plate.name=Tungstensteel Plate
item.techreborn.wood_plate.name=Wood Plate
item.techreborn.yellow_garnet_plate.name=Yellow Garnet Plate
item.techreborn.zinc_plate.name=Zinc Plate
item.techreborn.carbon_fiber.name=Carbon Fiber
item.techreborn.carbon_mesh.name=Carbon Mesh
item.techreborn.electronic_circuit.name=Electronic Circuit
item.techreborn.advanced_circuit.name=Advanced Circuit
item.techreborn.industrial_circuit.name=Industrial Circuit
item.techreborn.machine_parts.name=Machine Parts
item.techreborn.digital_display.name=Digital Display
item.techreborn.data_storage_core.name=Data Storage Core
item.techreborn.data_storage_chip.name=Data Storage Chip
item.techreborn.energy_flow_chip.name=Energy Flow Chip
item.techreborn.superconductor.name=Superconductor
item.techreborn.diamond_saw_blade.name=Diamond Saw Blade
item.techreborn.diamond_grinding_head.name=Diamond Grinding Head
item.techreborn.tungsten_grinding_head.name=Tungsten Grinding Head
item.techreborn.cupronickel_heating_coil.name=Cupronickel Heating Coil
item.techreborn.kanthal_heating_coil.name=Kanthal Heating Coil
item.techreborn.nichrome_heating_coil.name=Nichrome Heating Coil
item.techreborn.neutron_reflector.name=Neutron Reflector
item.techreborn.thick_neutron_reflector.name=Thick Neutron Reflector
item.techreborn.iridium_neutron_reflector.name=Iridium Neutron Reflector
item.techreborn.water_coolant_cell_10k.name=Water Coolant Cell 10k
item.techreborn.water_coolant_cell_30k.name=Water Coolant Cell 30k
item.techreborn.water_coolant_cell_60k.name=Water Coolant Cell 60k
item.techreborn.helium_coolant_cell_60k.name=Helium Coolant Cell 60k
item.techreborn.helium_coolant_cell_360k.name=Helium Coolant Cell 360k
item.techreborn.helium_coolant_cell_180k.name=Helium Coolant Cell 180k
item.techreborn.nak_coolant_cell_60k.name=Nak Coolant Cell 60k
item.techreborn.nak_coolant_cell_180k.name=Nak Coolant Cell 180k
item.techreborn.nak_coolant_cell_360k.name=Nak Coolant Cell 360k
item.techreborn.rubber.name=Rubber
item.techreborn.sap.name=Sap
item.techreborn.scrap.name=Scrap
item.techreborn.uu_matter.name=Uu Matter
item.techreborn.overclocker_upgrade.name=Overclocker Upgrade
item.techreborn.transformer_upgrade.name=Transformer Upgrade
item.techreborn.energy_storage_upgrade.name=Energy Storage Upgrade
item.techreborn.bronze_sword.name=Bronze Sword
item.techreborn.bronze_pickaxe.name=Bronze Pickaxe
item.techreborn.bronze_spade.name=Bronze Spade
item.techreborn.bronze_axe.name=Bronze Axe
item.techreborn.bronze_hoe.name=Bronze Hoe
item.techreborn.bronze_helmet.name=Bronze Helmet
item.techreborn.bronze_chestplate.name=Bronze Chestplate
item.techreborn.bronze_leggings.name=Bronze Leggings
item.techreborn.bronze_boots.name=Bronze Boots
item.techreborn.ruby_sword.name=Ruby Sword
item.techreborn.ruby_pickaxe.name=Ruby Pickaxe
item.techreborn.ruby_spade.name=Ruby Spade
item.techreborn.ruby_axe.name=Ruby Axe
item.techreborn.ruby_hoe.name=Ruby Hoe
item.techreborn.ruby_helmet.name=Ruby Helmet
item.techreborn.ruby_chestplate.name=Ruby Chestplate
item.techreborn.ruby_leggings.name=Ruby Leggings
item.techreborn.ruby_boots.name=Ruby Boots
item.techreborn.sapphire_sword.name=Sapphire Sword
item.techreborn.sapphire_pickaxe.name=Sapphire Pickaxe
item.techreborn.sapphire_spade.name=Sapphire Spade
item.techreborn.sapphire_axe.name=Sapphire Axe
item.techreborn.sapphire_hoe.name=Sapphire Hoe
item.techreborn.sapphire_helmet.name=Sapphire Helmet
item.techreborn.sapphire_chestplate.name=Sapphire Chestplate
item.techreborn.sapphire_leggings.name=Sapphire Leggings
item.techreborn.sapphire_boots.name=Sapphire Boots
item.techreborn.peridot_sword.name=Peridot Sword
item.techreborn.peridot_pickaxe.name=Peridot Pickaxe
item.techreborn.peridot_spade.name=Peridot Spade
item.techreborn.peridot_axe.name=Peridot Axe
item.techreborn.peridot_hoe.name=Peridot Hoe
item.techreborn.peridot_helmet.name=Peridot Helmet
item.techreborn.peridot_chestplate.name=Peridot Chestplate
item.techreborn.peridot_leggings.name=Peridot Leggings
item.techreborn.peridot_boots.name=Peridot Boots
item.techreborn.red_cell_battery.name=Red Cell Battery
item.techreborn.lithium_ion_battery.name=Lithium Ion Battery
item.techreborn.lithium_ion_batpack.name=Lithium Ion Batpack
item.techreborn.energy_crystal.name=Energy Crystal
item.techreborn.lapotron_crystal.name=Lapotron Crystal
item.techreborn.lapotronic_orb.name=Lapotronic Orb
item.techreborn.lapotronic_orbpack.name=Lapotronic Orbpack
item.techreborn.treetap.name=Treetap
item.techreborn.wrench.name=Wrench
item.techreborn.basic_drill.name=Basic Drill
item.techreborn.basic_chainsaw.name=Basic Chainsaw
item.techreborn.basic_jackhammer.name=Basic Jackhammer
item.techreborn.electric_treetap.name=Electric Treetap
item.techreborn.advanced_drill.name=Advanced Drill
item.techreborn.advanced_chainsaw.name=Advanced Chainsaw
item.techreborn.advanced_jackhammer.name=Advanced Jackhammer
item.techreborn.rock_cutter.name=Rock Cutter
item.techreborn.industrial_drill.name=Industrial Drill
item.techreborn.industrial_chainsaw.name=Industrial Chainsaw
item.techreborn.industrial_jackhammer.name=Industrial Jackhammer
item.techreborn.nanosaber.name=Nanosaber
item.techreborn.omni_tool.name=Omni Tool
item.techreborn.cloaking_device.name=Cloaking Device
item.techreborn.frequency_transmitter.name=Frequency Transmitter
item.techreborn.scrap_box.name=Scrap Box
item.techreborn.manual.name=Manual
item.techreborn.debug_tool.name=Debug Tool
item.techreborn.cell.name=Cell
tile.techreborn.bauxite_ore.name=Bauxite Ore
tile.techreborn.cinnabar_ore.name=Cinnabar Ore
tile.techreborn.copper_ore.name=Copper Ore
tile.techreborn.galena_ore.name=Galena Ore
tile.techreborn.iridium_ore.name=Iridium Ore
tile.techreborn.lead_ore.name=Lead Ore
tile.techreborn.peridot_ore.name=Peridot Ore
tile.techreborn.pyrite_ore.name=Pyrite Ore
tile.techreborn.ruby_ore.name=Ruby Ore
tile.techreborn.sapphire_ore.name=Sapphire Ore
tile.techreborn.sheldonite_ore.name=Sheldonite Ore
tile.techreborn.silver_ore.name=Silver Ore
tile.techreborn.sodalite_ore.name=Sodalite Ore
tile.techreborn.sphalerite_ore.name=Sphalerite Ore
tile.techreborn.tin_ore.name=Tin Ore
tile.techreborn.tungsten_ore.name=Tungsten Ore
tile.techreborn.aluminum_storage_block.name=Aluminum Storage Block
tile.techreborn.brass_storage_block.name=Brass Storage Block
tile.techreborn.bronze_storage_block.name=Bronze Storage Block
tile.techreborn.chrome_storage_block.name=Chrome Storage Block
tile.techreborn.copper_storage_block.name=Copper Storage Block
tile.techreborn.electrum_storage_block.name=Electrum Storage Block
tile.techreborn.invar_storage_block.name=Invar Storage Block
tile.techreborn.iridium_storage_block.name=Iridium Storage Block
tile.techreborn.iridium_reinforced_stone_storage_block.name=Iridium Reinforced Stone Storage Block
tile.techreborn.iridium_reinforced_tungstensteel_storage_block.name=Iridium Reinforced Tungstensteel Storage Block
tile.techreborn.lead_storage_block.name=Lead Storage Block
tile.techreborn.nickel_storage_block.name=Nickel Storage Block
tile.techreborn.osmium_storage_block.name=Osmium Storage Block
tile.techreborn.peridot_storage_block.name=Peridot Storage Block
tile.techreborn.platinum_storage_block.name=Platinum Storage Block
tile.techreborn.red_garnet_storage_block.name=Red Garnet Storage Block
tile.techreborn.refined_iron_storage_block.name=Refined Iron Storage Block
tile.techreborn.ruby_storage_block.name=Ruby Storage Block
tile.techreborn.sapphire_storage_block.name=Sapphire Storage Block
tile.techreborn.silver_storage_block.name=Silver Storage Block
tile.techreborn.steel_storage_block.name=Steel Storage Block
tile.techreborn.tin_storage_block.name=Tin Storage Block
tile.techreborn.titanium_storage_block.name=Titanium Storage Block
tile.techreborn.tungsten_storage_block.name=Tungsten Storage Block
tile.techreborn.tungstensteel_storage_block.name=Tungstensteel Storage Block
tile.techreborn.yellow_garnet_storage_block.name=Yellow Garnet Storage Block
tile.techreborn.zinc_storage_block.name=Zinc Storage Block
tile.techreborn.basic_machine_frame.name=Basic Machine Frame
tile.techreborn.basic_machine_casing.name=Basic Machine Casing
tile.techreborn.advanced_machine_frame.name=Advanced Machine Frame
tile.techreborn.advanced_machine_casing.name=Advanced Machine Casing
tile.techreborn.industrial_machine_frame.name=Industrial Machine Frame
tile.techreborn.industrial_machine_casing.name=Industrial Machine Casing
tile.techreborn.computer_cube.name=Computer Cube
tile.techreborn.cable.name=Cable
tile.techreborn.nuke.name=Nuke
tile.techreborn.refined_iron_fence.name=Refined Iron Fence
tile.techreborn.reinforced_glass.name=Reinforced Glass
tile.techreborn.rubber_leaves.name=Rubber Leaves
tile.techreborn.rubber_log.name=Rubber Log
tile.techreborn.rubber_plank_slab.name=Rubber Plank Slab
tile.techreborn.rubber_plank_double_slab.name=Rubber Plank Double Slab
tile.techreborn.rubber_plank_stair.name=Rubber Plank Stair
tile.techreborn.rubber_planks.name=Rubber Planks
tile.techreborn.rubber_sapling.name=Rubber Sapling
tile.techreborn.alloy_smelter.name=Alloy Smelter
tile.techreborn.assembly_machine.name=Assembly Machine
tile.techreborn.auto_crafting_table.name=Auto Crafting Table
tile.techreborn.compressor.name=Compressor
tile.techreborn.chemical_reactor.name=Chemical Reactor
tile.techreborn.distillation_tower.name=Distillation Tower
tile.techreborn.electric_furnace.name=Electric Furnace
tile.techreborn.extractor.name=Extractor
tile.techreborn.fluid_replicator.name=Fluid Replicator
tile.techreborn.grinder.name=Grinder
tile.techreborn.implosion_compressor.name=Implosion Compressor
tile.techreborn.industrial_blast_furnace.name=Industrial Blast Furnace
tile.techreborn.industrial_centrifuge.name=Industrial Centrifuge
tile.techreborn.industrial_electrolyzer.name=Industrial Electrolyzer
tile.techreborn.industrial_grinder.name=Industrial Grinder
tile.techreborn.industrial_sawmill.name=Industrial Sawmill
tile.techreborn.iron_alloy_furnace.name=Iron Alloy Furnace
tile.techreborn.iron_furnace.name=Iron Furnace
tile.techreborn.matter_fabricator.name=Matter Fabricator
tile.techreborn.recycler.name=Recycler
tile.techreborn.rolling_machine.name=Rolling Machine
tile.techreborn.scrapboxinator.name=Scrapboxinator
tile.techreborn.vacuum_freezer.name=Vacuum Freezer
tile.techreborn.creative_solar_panel.name=Creative Solar Panel
tile.techreborn.diesel_generator.name=Diesel Generator
tile.techreborn.dragon_egg_syphon.name=Dragon Egg Syphon
tile.techreborn.fusion_coil.name=Fusion Coil
tile.techreborn.fusion_control_computer.name=Fusion Control Computer
tile.techreborn.gas_turbine.name=Gas Turbine
tile.techreborn.lightning_rod.name=Lightning Rod
tile.techreborn.plasma_generator.name=Plasma Generator
tile.techreborn.semi_fluid_generator.name=Semi Fluid Generator
tile.techreborn.solar_panel.name=Solar Panel
tile.techreborn.solid_fuel_generator.name=Solid Fuel Generator
tile.techreborn.thermal_generator.name=Thermal Generator
tile.techreborn.water_mill.name=Water Mill
tile.techreborn.wind_mill.name=Wind Mill
tile.techreborn.creative_quantum_chest.name=Creative Quantum Chest
tile.techreborn.creative_quantum_tank.name=Creative Quantum Tank
tile.techreborn.digital_chest.name=Digital Chest
tile.techreborn.quantum_chest.name=Quantum Chest
tile.techreborn.quantum_tank.name=Quantum Tank
tile.techreborn.adjustable_su.name=Adjustable Su
tile.techreborn.charge_o_mat.name=Charge O Mat
tile.techreborn.interdimensional_su.name=Interdimensional Su
tile.techreborn.lapotronic_su.name=Lapotronic Su
tile.techreborn.lsu_storage.name=Lsu Storage
tile.techreborn.low_voltage_su.name=Low Voltage Su
tile.techreborn.medium_voltage_su.name=Medium Voltage Su
tile.techreborn.high_voltage_su.name=High Voltage Su
tile.techreborn.lv_transformer.name=Lv Transformer
tile.techreborn.mv_transformer.name=Mv Transformer
tile.techreborn.hv_transformer.name=Hv Transformer
tile.techreborn.alarm.name=Alarm
tile.techreborn.chunk_loader.name=Chunk Loader
tile.techreborn.lamp_incandescent.name=Lamp Incandescent
tile.techreborn.lamp_led.name=Lamp Led
tile.techreborn.magic_energy_absorber.name=Magic Energy Absorber
tile.techreborn.magic_energy_converter.name=Magic Energy Converter
tile.techreborn.player_detector.name=Player Detector
tile.techreborn.techreborn_techreborn.berylium.name=Berylium
tile.techreborn.techreborn_techreborn.calcium.name=Calcium
tile.techreborn.techreborn_techreborn.calciumcarbonate.name=Calciumcarbonate
tile.techreborn.techreborn_techreborn.chlorite.name=Chlorite
tile.techreborn.techreborn_techreborn.deuterium.name=Deuterium
tile.techreborn.techreborn_techreborn.glyceryl.name=Glyceryl
tile.techreborn.techreborn_techreborn.helium.name=Helium
tile.techreborn.techreborn_techreborn.helium3.name=Helium3
tile.techreborn.techreborn_techreborn.heliumplasma.name=Heliumplasma
tile.techreborn.techreborn_techreborn.hydrogen.name=Hydrogen
tile.techreborn.techreborn_techreborn.lithium.name=Lithium
tile.techreborn.techreborn_techreborn.mercury.name=Mercury
tile.techreborn.techreborn_techreborn.methane.name=Methane
tile.techreborn.techreborn_techreborn.nitrocoalfuel.name=Nitrocoalfuel
tile.techreborn.techreborn_techreborn.nitrofuel.name=Nitrofuel
tile.techreborn.techreborn_techreborn.nitrogen.name=Nitrogen
tile.techreborn.techreborn_techreborn.nitrogendioxide.name=Nitrogendioxide
tile.techreborn.techreborn_techreborn.potassium.name=Potassium
tile.techreborn.techreborn_techreborn.silicon.name=Silicon
tile.techreborn.techreborn_techreborn.sodium.name=Sodium
tile.techreborn.techreborn_techreborn.sodiumpersulfate.name=Sodiumpersulfate
tile.techreborn.techreborn_techreborn.tritium.name=Tritium
tile.techreborn.techreborn_techreborn.wolframium.name=Wolframium
tile.techreborn.techreborn_techreborn.carbon.name=Carbon
tile.techreborn.techreborn_techreborn.carbonfiber.name=Carbonfiber
tile.techreborn.techreborn_techreborn.nitrocarbon.name=Nitrocarbon
tile.techreborn.techreborn_techreborn.sulfur.name=Sulfur
tile.techreborn.techreborn_techreborn.sodiumsulfide.name=Sodiumsulfide
tile.techreborn.techreborn_techreborn.diesel.name=Diesel
tile.techreborn.techreborn_techreborn.nitrodiesel.name=Nitrodiesel
tile.techreborn.techreborn_techreborn.oil.name=Oil
tile.techreborn.techreborn_techreborn.sulfuricacid.name=Sulfuricacid
tile.techreborn.techreborn_techreborn.compressedair.name=Compressedair
tile.techreborn.techreborn_techreborn.electrolyzedwater.name=Electrolyzedwater