From 40e30629033166f6fbc1771cba737da6a6bb7e58 Mon Sep 17 00:00:00 2001 From: Prospector Date: Wed, 14 Jun 2017 08:56:09 -0700 Subject: [PATCH] Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP) --- .../techreborn/blocks/BlockFusionCoil.java | 7 +- .../blocks/BlockFusionControlComputer.java | 22 +- .../techreborn/blocks/BlockMachineCasing.java | 29 +- ...hineFrame.java => BlockMachineFrames.java} | 56 +- src/main/java/techreborn/blocks/BlockOre.java | 2 +- .../java/techreborn/blocks/BlockOre2.java | 2 +- .../blocks/BlockPlayerDetector.java | 7 + ...nFence.java => BlockRefinedIronFence.java} | 9 +- .../blocks/BlockReinforcedGlass.java | 9 +- .../techreborn/blocks/BlockRubberLeaves.java | 5 +- .../techreborn/blocks/BlockRubberLog.java | 5 +- .../techreborn/blocks/BlockRubberPlank.java | 5 +- .../techreborn/blocks/BlockRubberSapling.java | 5 +- .../java/techreborn/blocks/BlockStorage.java | 20 +- .../java/techreborn/blocks/BlockStorage2.java | 24 +- .../BlockDistillationTower.java | 7 +- .../BlockIndustrialElectrolyzer.java | 8 +- .../BlockIndustrialSawmill.java | 8 +- ...anel.java => BlockCreativeSolarPanel.java} | 13 +- .../generator/BlockDieselGenerator.java | 8 +- ...iphoner.java => BlockDragonEggSyphon.java} | 14 +- .../blocks/generator/BlockGasTurbine.java | 7 +- .../blocks/generator/BlockHeatGenerator.java | 13 +- .../blocks/generator/BlockLightningRod.java | 8 +- .../generator/BlockMagicEnergyAbsorber.java | 8 +- .../generator/BlockMagicEnergyConverter.java | 8 +- .../generator/BlockSemiFluidGenerator.java | 12 +- .../blocks/generator/BlockSolarPanel.java | 6 +- ...ator.java => BlockSolidFuelGenerator.java} | 13 +- .../blocks/generator/BlockWaterMill.java | 8 +- .../blocks/generator/BlockWindMill.java | 5 +- ...urnace.java => BlockIronAlloyFurnace.java} | 14 +- .../iron_machines/BlockIronFurnace.java | 5 +- .../machine/BlockAssemblingMachine.java | 8 +- .../blocks/machine/BlockChemicalReactor.java | 8 +- .../blocks/machine/BlockScrapboxinator.java | 8 +- .../blocks/machine/BlockVacuumFreezer.java | 8 +- ...{BlockAESU.java => BlockAdjustableSU.java} | 8 +- .../blocks/storage/BlockEnergyStorage.java | 12 +- ...BlockMFSU.java => BlockHighVoltageSU.java} | 10 +- ...IDSU.java => BlockInterdimensionalSU.java} | 16 +- ...kLESUStorage.java => BlockLSUStorage.java} | 28 +- ...{BlockLESU.java => BlockLapotronicSU.java} | 8 +- ...lockBatBox.java => BlockLowVoltageSU.java} | 10 +- ...lockMFE.java => BlockMediumVoltageSU.java} | 10 +- .../blocks/tier1/BlockCompressor.java | 10 +- .../blocks/tier1/BlockElectricFurnace.java | 8 +- .../blocks/tier1/BlockExtractor.java | 8 +- .../techreborn/blocks/tier1/BlockGrinder.java | 8 +- .../blocks/tier1/BlockRecycler.java | 8 +- .../transformers/BlockHVTransformer.java | 2 +- .../transformers/BlockLVTransformer.java | 2 +- .../transformers/BlockMVTransformer.java | 2 +- .../blocks/transformers/BlockTransformer.java | 7 +- src/main/java/techreborn/client/EGui.java | 6 +- .../java/techreborn/client/GuiHandler.java | 42 +- .../techreborn/client/RegisterItemJsons.java | 24 - .../client/container/ContainerAESU.java | 6 +- .../client/container/ContainerLESU.java | 8 +- .../java/techreborn/client/gui/GuiAESU.java | 6 +- .../client/gui/GuiAlloyFurnace.java | 6 +- .../java/techreborn/client/gui/GuiBatbox.java | 6 +- .../client/gui/GuiFusionReactor.java | 6 +- .../techreborn/client/gui/GuiGenerator.java | 6 +- .../java/techreborn/client/gui/GuiIDSU.java | 6 +- .../java/techreborn/client/gui/GuiLESU.java | 6 +- .../java/techreborn/client/gui/GuiMFE.java | 6 +- .../java/techreborn/client/gui/GuiMFSU.java | 6 +- .../client/gui/GuiSemifluidGenerator.java | 6 +- .../compat/jei/TechRebornJeiPlugin.java | 2 +- .../java/techreborn/init/IC2Duplicates.java | 6 +- src/main/java/techreborn/init/ModBlocks.java | 270 ++- src/main/java/techreborn/init/ModItems.java | 6 +- src/main/java/techreborn/init/ModRecipes.java | 24 +- src/main/java/techreborn/init/OreDict.java | 8 +- .../init/recipes/RecipeMethods.java | 4 +- ...ckAesu.java => ItemBlockAdjustableSU.java} | 8 +- ...Frame.java => ItemBlockMachineFrames.java} | 8 +- .../java/techreborn/packets/PacketAesu.java | 4 +- .../java/techreborn/packets/PacketIdsu.java | 4 +- .../java/techreborn/proxies/ClientProxy.java | 27 +- .../{TileAesu.java => TileAdjustableSU.java} | 6 +- ...Furnace.java => TileIronAlloyFurnace.java} | 8 +- ...er.java => TileFusionControlComputer.java} | 6 +- ...Panel.java => TileCreativeSolarPanel.java} | 2 +- ...Siphoner.java => TileDragonEggSyphon.java} | 8 +- ...rator.java => TileSemiFluidGenerator.java} | 8 +- ...rator.java => TileSolidFuelGenerator.java} | 12 +- ...eIDSU.java => TileInterdimensionalSU.java} | 4 +- .../techreborn/tiles/lesu/LesuNetwork.java | 16 +- ...leLesuStorage.java => TileLSUStorage.java} | 6 +- .../{TileLesu.java => TileLapotronicSU.java} | 18 +- .../tiles/multiblock/MultiblockChecker.java | 20 +- .../multiblock/TileImplosionCompressor.java | 6 +- .../multiblock/TileIndustrialGrinder.java | 6 +- .../multiblock/TileIndustrialSawmill.java | 6 +- .../tiles/multiblock/TileVacuumFreezer.java | 2 +- .../{TileMFSU.java => TileHighVoltageSU.java} | 6 +- ...{TileBatBox.java => TileLowVoltageSU.java} | 6 +- ...{TileMFE.java => TileMediumVoltageSU.java} | 6 +- .../lapotronic_su.json} | 0 .../{hv_storage.json => high_voltage_su.json} | 0 ...nsmitter.json => interdimensional_su.json} | 0 ..._multi_storage.json => lapotronic_su.json} | 0 .../{lv_storage.json => low_voltage_su.json} | 2 +- ...mv_storage.json => medium_voltage_su.json} | 0 ...e_panel.json => creative_solar_panel.json} | 0 ...ctor.json => fusion_control_computer.json} | 0 ...nerator.json => solid_fuel_generator.json} | 0 .../machines/structure/machine_casing.json | 6 +- .../machine_frame.json} | 6 +- ...y_furnace.json => iron_alloy_furnace.json} | 0 ..._alloy_smelter.json => alloy_smelter.json} | 0 .../tier1_machines/player_detector.json | 6 +- ..._saw_mill.json => industrial_sawmill.json} | 0 .../{techreborn.ore.json => ores.json} | 10 + .../blockstates/player_detector.json | 26 - ...ironfence.json => refined_iron_fence.json} | 0 ...rubbersapling.json => rubber_sapling.json} | 0 .../{techreborn.storage.json => storage.json} | 55 + .../blockstates/techreborn.ore2.json | 25 - .../blockstates/techreborn.storage2.json | 70 - .../assets/techreborn/lang/en_us.lang | 1519 ++++++++--------- 123 files changed, 1469 insertions(+), 1486 deletions(-) rename src/main/java/techreborn/blocks/{BlockMachineFrame.java => BlockMachineFrames.java} (64%) rename src/main/java/techreborn/blocks/{BlockIronFence.java => BlockRefinedIronFence.java} (84%) rename src/main/java/techreborn/blocks/generator/{BlockCreativePanel.java => BlockCreativeSolarPanel.java} (80%) rename src/main/java/techreborn/blocks/generator/{BlockDragonEggSiphoner.java => BlockDragonEggSyphon.java} (83%) rename src/main/java/techreborn/blocks/generator/{BlockGenerator.java => BlockSolidFuelGenerator.java} (82%) rename src/main/java/techreborn/blocks/iron_machines/{BlockAlloyFurnace.java => BlockIronAlloyFurnace.java} (86%) rename src/main/java/techreborn/blocks/storage/{BlockAESU.java => BlockAdjustableSU.java} (92%) rename src/main/java/techreborn/blocks/storage/{BlockMFSU.java => BlockHighVoltageSU.java} (89%) rename src/main/java/techreborn/blocks/storage/{BlockIDSU.java => BlockInterdimensionalSU.java} (85%) rename src/main/java/techreborn/blocks/storage/{BlockLESUStorage.java => BlockLSUStorage.java} (75%) rename src/main/java/techreborn/blocks/storage/{BlockLESU.java => BlockLapotronicSU.java} (91%) rename src/main/java/techreborn/blocks/storage/{BlockBatBox.java => BlockLowVoltageSU.java} (89%) rename src/main/java/techreborn/blocks/storage/{BlockMFE.java => BlockMediumVoltageSU.java} (88%) rename src/main/java/techreborn/itemblocks/{ItemBlockAesu.java => ItemBlockAdjustableSU.java} (95%) rename src/main/java/techreborn/itemblocks/{ItemBlockMachineFrame.java => ItemBlockMachineFrames.java} (89%) rename src/main/java/techreborn/tiles/{TileAesu.java => TileAdjustableSU.java} (96%) rename src/main/java/techreborn/tiles/{TileAlloyFurnace.java => TileIronAlloyFurnace.java} (97%) rename src/main/java/techreborn/tiles/fusionReactor/{TileEntityFusionController.java => TileFusionControlComputer.java} (98%) rename src/main/java/techreborn/tiles/generator/{TileCreativePanel.java => TileCreativeSolarPanel.java} (97%) rename src/main/java/techreborn/tiles/generator/{TileDragonEggSiphoner.java => TileDragonEggSyphon.java} (94%) rename src/main/java/techreborn/tiles/generator/{TileSemifluidGenerator.java => TileSemiFluidGenerator.java} (93%) rename src/main/java/techreborn/tiles/generator/{TileGenerator.java => TileSolidFuelGenerator.java} (93%) rename src/main/java/techreborn/tiles/idsu/{TileIDSU.java => TileInterdimensionalSU.java} (96%) rename src/main/java/techreborn/tiles/lesu/{TileLesuStorage.java => TileLSUStorage.java} (94%) rename src/main/java/techreborn/tiles/lesu/{TileLesu.java => TileLapotronicSU.java} (89%) rename src/main/java/techreborn/tiles/storage/{TileMFSU.java => TileHighVoltageSU.java} (89%) rename src/main/java/techreborn/tiles/storage/{TileBatBox.java => TileLowVoltageSU.java} (90%) rename src/main/java/techreborn/tiles/storage/{TileMFE.java => TileMediumVoltageSU.java} (89%) rename src/main/resources/assets/techreborn/blockstates/machines/energy/{ev_multi_storage_ctm.json => ctm/lapotronic_su.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/energy/{hv_storage.json => high_voltage_su.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/energy/{ev_storage_transmitter.json => interdimensional_su.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/energy/{ev_multi_storage.json => lapotronic_su.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/energy/{lv_storage.json => low_voltage_su.json} (99%) rename src/main/resources/assets/techreborn/blockstates/machines/energy/{mv_storage.json => medium_voltage_su.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/generators/{creative_panel.json => creative_solar_panel.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/generators/{fusion_reactor.json => fusion_control_computer.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/generators/{generator.json => solid_fuel_generator.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/{storage/machine_blocks.json => structure/machine_frame.json} (89%) rename src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/{alloy_furnace.json => iron_alloy_furnace.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/{electric_alloy_smelter.json => alloy_smelter.json} (100%) rename src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/{industrial_saw_mill.json => industrial_sawmill.json} (100%) rename src/main/resources/assets/techreborn/blockstates/{techreborn.ore.json => ores.json} (89%) delete mode 100644 src/main/resources/assets/techreborn/blockstates/player_detector.json rename src/main/resources/assets/techreborn/blockstates/{ironfence.json => refined_iron_fence.json} (100%) rename src/main/resources/assets/techreborn/blockstates/{rubbersapling.json => rubber_sapling.json} (100%) rename src/main/resources/assets/techreborn/blockstates/{techreborn.storage.json => storage.json} (56%) delete mode 100644 src/main/resources/assets/techreborn/blockstates/techreborn.ore2.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/techreborn.storage2.json diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 9d6f1262e..2c959edb5 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -27,15 +27,18 @@ package techreborn.blocks; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; public class BlockFusionCoil extends Block { - public BlockFusionCoil(Material material) { + public BlockFusionCoil() { super(Material.IRON); setHardness(2f); setSoundType(SoundType.METAL); - setUnlocalizedName("techreborn.fusioncoil"); setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } } diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 095931c26..f52cdbdf0 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -24,33 +24,35 @@ package techreborn.blocks; -import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.fusionReactor.TileEntityFusionController; +import techreborn.lib.ModInfo; +import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.utils.damageSources.FusionDamageSource; public class BlockFusionControlComputer extends BlockMachineBase { - public BlockFusionControlComputer(final Material material) { + public BlockFusionControlComputer() { super(); - this.setUnlocalizedName("techreborn.fusioncontrolcomputer"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ) { - final TileEntityFusionController tileEntityFusionController = (TileEntityFusionController) world + final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world .getTileEntity(new BlockPos(x, y, z)); - tileEntityFusionController.checkCoils(); + tileFusionControlComputer.checkCoils(); if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.FUSION_CONTROLLER.ordinal(), world, x, y, z); return true; @@ -59,9 +61,9 @@ public class BlockFusionControlComputer extends BlockMachineBase { @Override public void onEntityWalk(final World worldIn, final BlockPos pos, final Entity entityIn) { super.onEntityWalk(worldIn, pos, entityIn); - if (worldIn.getTileEntity(pos) instanceof TileEntityFusionController) { - if (((TileEntityFusionController) worldIn.getTileEntity(pos)).crafingTickTime != 0 - && ((TileEntityFusionController) worldIn.getTileEntity(pos)).checkCoils()) { + if (worldIn.getTileEntity(pos) instanceof TileFusionControlComputer) { + if (((TileFusionControlComputer) worldIn.getTileEntity(pos)).crafingTickTime != 0 + && ((TileFusionControlComputer) worldIn.getTileEntity(pos)).checkCoils()) { entityIn.attackEntityFrom(new FusionDamageSource(), 200F); } } @@ -69,6 +71,6 @@ public class BlockFusionControlComputer extends BlockMachineBase { @Override public TileEntity createNewTileEntity(final World world, final int meta) { - return new TileEntityFusionController(); + return new TileFusionControlComputer(); } } diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 924e763c0..ace9d277a 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -25,8 +25,8 @@ package techreborn.blocks; import com.google.common.base.CaseFormat; +import com.google.common.collect.Lists; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -39,7 +39,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.common.blocks.PropertyString; import reborncore.common.multiblock.BlockMultiblockBase; +import reborncore.common.util.ArrayUtils; import techreborn.Core; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModBlocks; @@ -47,22 +49,26 @@ import techreborn.lib.ModInfo; import techreborn.tiles.TileMachineCasing; import java.security.InvalidParameterException; +import java.util.List; import java.util.Random; public class BlockMachineCasing extends BlockMultiblockBase { public static final String[] types = new String[] { "standard", "reinforced", "advanced" }; - public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length); + public static final PropertyString TYPE = new PropertyString("type", types); + private static final List typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); public BlockMachineCasing() { super(Material.IRON); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2F); - this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); - if (Core.proxy.isCTMAvailable()) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure/ctm")); - } else { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure")); + this.setDefaultState(this.getDefaultState().withProperty(TYPE, "standard")); + for (int i = 0; i > types.length; i++) { + if (Core.proxy.isCTMAvailable()) { + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure/ctm").setInvVariant(types[i])); + } else { + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant(types[i])); + } } } @@ -82,16 +88,19 @@ public class BlockMachineCasing extends BlockMultiblockBase { @Override public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(METADATA, meta); + if (meta > types.length) { + meta = 0; + } + return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(METADATA); + return typesList.indexOf(state.getValue(TYPE)); } protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, METADATA); + return new BlockStateContainer(this, TYPE); } public int getHeatFromState(IBlockState state) { diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrames.java similarity index 64% rename from src/main/java/techreborn/blocks/BlockMachineFrame.java rename to src/main/java/techreborn/blocks/BlockMachineFrames.java index 86632d89e..3267720bc 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrames.java @@ -25,8 +25,8 @@ package techreborn.blocks; import com.google.common.base.CaseFormat; +import com.google.common.collect.Lists; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -34,26 +34,45 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseBlock; +import reborncore.common.blocks.PropertyString; +import reborncore.common.util.ArrayUtils; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; import java.security.InvalidParameterException; +import java.util.List; -public class BlockMachineFrame extends BaseBlock { - public static final String[] types = new String[] { "machine", "advancedMachine", "highlyAdvancedMachine" }; - public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length - 1); +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 typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); - public BlockMachineFrame(Material material) { - super(material); - setUnlocalizedName("techreborn.machineFrame"); + public BlockMachineFrames() { + super(Material.IRON); setCreativeTab(TechRebornCreativeTab.instance); setHardness(1f); - this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); + this.setDefaultState(this.getDefaultState().withProperty(TYPE, "basic")); + for (int i = 0; i > types.length; i++) { + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant(types[i])); + } } public static ItemStack getFrameByName(String name, int count) { - name = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name); + 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, 1); + } + for (int i = 0; i < types.length; i++) { if (types[i].equalsIgnoreCase(name)) { return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i); @@ -80,17 +99,20 @@ public class BlockMachineFrame extends BaseBlock { } @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(METADATA); - } - - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, METADATA); + public IBlockState getStateFromMeta(int meta) { + if (meta > types.length) { + meta = 0; + } + return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); } @Override - public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(METADATA, meta); + public int getMetaFromState(IBlockState state) { + return typesList.indexOf(state.getValue(TYPE)); + } + + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, TYPE); } } diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 8ac56b895..e8a54db9f 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -80,7 +80,7 @@ public class BlockOre extends Block implements IOreNameProvider { setHarvestLevel("pickaxe", 2); this.setDefaultState(this.getStateFromMeta(0)); for (int i = 0; i < ores.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + ores[i]).setFileName("ores")); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + ores[i]).setFileName("ores")); } } diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 57ed8e1e6..f58423e6b 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -64,7 +64,7 @@ public class BlockOre2 extends Block implements IOreNameProvider { setHarvestLevel("pickaxe", 1); this.setDefaultState(this.getStateFromMeta(0)); for (int i = 0; i < ores.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + ores[i]).setFileName("ores")); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + ores[i]).setFileName("ores")); } } diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index 84372006a..29a17a741 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -37,6 +37,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; @@ -52,6 +53,7 @@ import reborncore.common.util.ArrayUtils; import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; import techreborn.client.TechRebornCreativeTab; +import techreborn.init.ModBlocks; import techreborn.lib.MessageIDs; import techreborn.lib.ModInfo; import techreborn.tiles.TilePlayerDectector; @@ -75,6 +77,11 @@ public class BlockPlayerDetector extends BlockMachineBase { } } + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(ModBlocks.PLAYER_DETECTOR, typeNamesList.indexOf(state.getValue(TYPE))); + } + @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(this); diff --git a/src/main/java/techreborn/blocks/BlockIronFence.java b/src/main/java/techreborn/blocks/BlockRefinedIronFence.java similarity index 84% rename from src/main/java/techreborn/blocks/BlockIronFence.java rename to src/main/java/techreborn/blocks/BlockRefinedIronFence.java index 12ee64d1f..50db3994d 100644 --- a/src/main/java/techreborn/blocks/BlockIronFence.java +++ b/src/main/java/techreborn/blocks/BlockRefinedIronFence.java @@ -27,16 +27,19 @@ package techreborn.blocks; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import techreborn.client.TechRebornCreativeTabMisc; +import techreborn.lib.ModInfo; -public class BlockIronFence extends BlockFence { +public class BlockRefinedIronFence extends BlockFence { - public BlockIronFence() { + public BlockRefinedIronFence() { super(Material.IRON, BlockPlanks.EnumType.OAK.getMapColor()); - setUnlocalizedName("techreborn.ironfence"); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2.0F); setHarvestLevel("pickaxe", 2); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java index 4cd9212e6..2268e12c7 100644 --- a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java +++ b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java @@ -29,16 +29,19 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseBlock; import techreborn.client.TechRebornCreativeTabMisc; +import techreborn.lib.ModInfo; public class BlockReinforcedGlass extends BaseBlock { - public BlockReinforcedGlass(Material materialIn) { - super(materialIn); - setUnlocalizedName("techreborn.reinforcedglass"); + public BlockReinforcedGlass() { + super(Material.GLASS); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(4.0F); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 797a79280..97c378c5b 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -37,8 +37,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; import java.util.List; import java.util.Random; @@ -50,11 +53,11 @@ public class BlockRubberLeaves extends BlockLeaves { public BlockRubberLeaves() { super(); - setUnlocalizedName("techreborn.rubberleaves"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true) .withProperty(DECAYABLE, true)); Blocks.FIRE.setFireInfo(this, 30, 60); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index ab45d5295..bbca6055b 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -41,12 +41,15 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModSounds; import techreborn.items.ItemParts; import techreborn.items.tools.ItemElectricTreetap; import techreborn.items.tools.ItemTreeTap; +import techreborn.lib.ModInfo; import java.util.ArrayList; import java.util.List; @@ -62,7 +65,6 @@ public class BlockRubberLog extends Block { public BlockRubberLog() { super(Material.WOOD); - setUnlocalizedName("techreborn.rubberlog"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.setHardness(2.0F); this.setDefaultState( @@ -70,6 +72,7 @@ public class BlockRubberLog extends Block { this.setTickRandomly(true); this.setSoundType(SoundType.WOOD); Blocks.FIRE.setFireInfo(this, 5, 5); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } protected BlockStateContainer createBlockState() { diff --git a/src/main/java/techreborn/blocks/BlockRubberPlank.java b/src/main/java/techreborn/blocks/BlockRubberPlank.java index 59a178e1c..c85c1d6fc 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlank.java @@ -28,7 +28,10 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import techreborn.client.TechRebornCreativeTabMisc; +import techreborn.lib.ModInfo; /** * Created by modmuss50 on 20/02/2016. @@ -37,10 +40,10 @@ public class BlockRubberPlank extends Block { public BlockRubberPlank() { super(Material.WOOD); - setUnlocalizedName("techreborn.rubberplank"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.setHardness(2.0F); this.setSoundType(SoundType.WOOD); Blocks.FIRE.setFireInfo(this, 5, 20); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index b1bfd3e99..9a05b4c19 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -32,7 +32,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import techreborn.client.TechRebornCreativeTabMisc; +import techreborn.lib.ModInfo; import techreborn.world.RubberTreeGenerator; import java.util.Random; @@ -43,10 +46,10 @@ import java.util.Random; public class BlockRubberSapling extends BlockSapling { public BlockRubberSapling() { - setUnlocalizedName("techreborn.rubbersapling"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0)); setSoundType(SoundType.PLANT); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index fd9b1d71c..8be23b5fd 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -24,8 +24,8 @@ package techreborn.blocks; +import com.google.common.collect.Lists; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -37,25 +37,29 @@ import net.minecraftforge.fml.relauncher.SideOnly; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseBlock; +import reborncore.common.blocks.PropertyString; +import reborncore.common.util.ArrayUtils; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; +import java.util.List; import java.util.Random; public class BlockStorage extends BaseBlock { public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass", "lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" }; - public PropertyInteger METADATA; + public static final PropertyString TYPE = new PropertyString("type", types); + private static final List typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); public BlockStorage() { super(Material.IRON); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2f); - this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); + this.setDefaultState(this.getDefaultState().withProperty(TYPE, "silver")); for (int i = 0; i < types.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + types[i]).setFileName("storage")); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]).setFileName("storage")); } } @@ -95,18 +99,16 @@ public class BlockStorage extends BaseBlock { if (meta > types.length) { meta = 0; } - return this.getDefaultState().withProperty(METADATA, meta); + return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(METADATA); + return typesList.indexOf(state.getValue(TYPE)); } protected BlockStateContainer createBlockState() { - - METADATA = PropertyInteger.create("type", 0, types.length - 1); - return new BlockStateContainer(this, METADATA); + return new BlockStateContainer(this, TYPE); } } diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index e8d9c91e3..8ff0c6cfe 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -24,8 +24,9 @@ package techreborn.blocks; +import com.google.common.base.CaseFormat; +import com.google.common.collect.Lists; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -37,31 +38,36 @@ import net.minecraftforge.fml.relauncher.SideOnly; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseBlock; +import reborncore.common.blocks.PropertyString; +import reborncore.common.util.ArrayUtils; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; import java.security.InvalidParameterException; +import java.util.List; import java.util.Random; public class BlockStorage2 extends BaseBlock { public static final String[] types = new String[] { "tungstensteel", "iridium_reinforced_tungstensteel", "iridium_reinforced_stone", "ruby", "sapphire", "peridot", - "yellowGarnet", "redGarnet", "copper", "tin", "refinedIron" }; - public PropertyInteger METADATA; + "yellow_garnet", "red_garnet", "copper", "tin", "refined_iron" }; + public static final PropertyString TYPE = new PropertyString("type", types); + private static final List typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); public BlockStorage2() { super(Material.IRON); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2f); - this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); + this.setDefaultState(this.getDefaultState().withProperty(TYPE, "tungstensteel")); for (int i = 0; i < types.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "storage").setInvVariant("type=" + types[i]).setFileName("storage")); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]).setFileName("storage")); } } public static ItemStack getStorageBlockByName(String name, int count) { + name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); for (int i = 0; i < types.length; i++) { if (types[i].equals(name)) { return new ItemStack(ModBlocks.STORAGE2, count, i); @@ -93,18 +99,16 @@ public class BlockStorage2 extends BaseBlock { if (meta > types.length) { meta = 0; } - return this.getDefaultState().withProperty(METADATA, meta); + return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(METADATA); + return typesList.indexOf(state.getValue(TYPE)); } protected BlockStateContainer createBlockState() { - - METADATA = PropertyInteger.create("type", 0, types.length - 1); - return new BlockStateContainer(this, METADATA); + return new BlockStateContainer(this, TYPE); } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java index 53b4c8cba..f74b6d886 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java @@ -25,14 +25,17 @@ package techreborn.blocks.advanced_machine; import net.minecraft.block.material.Material; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; public class BlockDistillationTower extends BlockMachineBase { - public BlockDistillationTower(Material material) { + public BlockDistillationTower() { super(); - setUnlocalizedName("techreborn.distillationtower"); setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java index 6b65da987..7525cf70f 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java @@ -24,22 +24,24 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.TileIndustrialElectrolyzer; public class BlockIndustrialElectrolyzer extends BlockMachineBase { - public BlockIndustrialElectrolyzer(final Material material) { + public BlockIndustrialElectrolyzer() { super(); - this.setUnlocalizedName("techreborn.industrialelectrolyzer"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java index 45587b226..f4ce09cc7 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java @@ -24,23 +24,25 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileIndustrialSawmill; public class BlockIndustrialSawmill extends BlockMachineBase { - public BlockIndustrialSawmill(final Material material) { + public BlockIndustrialSawmill() { super(); - this.setUnlocalizedName("techreborn.industrialsawmill"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockCreativePanel.java b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java similarity index 80% rename from src/main/java/techreborn/blocks/generator/BlockCreativePanel.java rename to src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java index 01f346d2a..ebf749dae 100644 --- a/src/main/java/techreborn/blocks/generator/BlockCreativePanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java @@ -27,25 +27,28 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.generator.TileCreativePanel; +import techreborn.lib.ModInfo; +import techreborn.tiles.generator.TileCreativeSolarPanel; /** * Created by modmuss50 on 25/02/2016. */ -public class BlockCreativePanel extends BaseTileBlock { +public class BlockCreativeSolarPanel extends BaseTileBlock { - public BlockCreativePanel() { + public BlockCreativeSolarPanel() { super(Material.IRON); - setUnlocalizedName("techreborn.creativepanel"); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2.0F); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override public TileEntity createNewTileEntity(World worldIn, int meta) { - return new TileCreativePanel(); + return new TileCreativeSolarPanel(); } } diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 070e681a2..3ec8cd9ef 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -24,23 +24,25 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileDieselGenerator; public class BlockDieselGenerator extends BlockMachineBase { - public BlockDieselGenerator(final Material material) { + public BlockDieselGenerator() { super(); - this.setUnlocalizedName("techreborn.dieselgenerator"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java similarity index 83% rename from src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java rename to src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java index fd676f41d..b542f71c6 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java @@ -24,29 +24,31 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.generator.TileDragonEggSiphoner; +import techreborn.lib.ModInfo; +import techreborn.tiles.generator.TileDragonEggSyphon; import java.util.List; -public class BlockDragonEggSiphoner extends BlockMachineBase { +public class BlockDragonEggSyphon extends BlockMachineBase { - public BlockDragonEggSiphoner(Material material) { + public BlockDragonEggSyphon() { super(); - setUnlocalizedName("techreborn.dragoneggsiphoner"); setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileDragonEggSiphoner(); + return new TileDragonEggSyphon(); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index ffd6d6405..a9705cd36 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -29,18 +29,21 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileGasTurbine; public class BlockGasTurbine extends BlockMachineBase { - public BlockGasTurbine(final Material material) { + public BlockGasTurbine() { super(); - this.setUnlocalizedName("techreborn.gasTurbine"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index 32e41d9aa..d85b0b68c 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -24,24 +24,21 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileHeatGenerator; -import java.util.List; - public class BlockHeatGenerator extends BlockMachineBase { - public BlockHeatGenerator(Material material) { + public BlockHeatGenerator() { super(); - setUnlocalizedName("techreborn.heatgenerator"); setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index ea18be54a..afc375514 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -24,19 +24,21 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileLightningRod; public class BlockLightningRod extends BlockMachineBase { - public BlockLightningRod(Material material) { + public BlockLightningRod() { super(); - setUnlocalizedName("techreborn.lightningrod"); setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index 39fffc41e..896195985 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -24,16 +24,18 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; public class BlockMagicEnergyAbsorber extends BlockMachineBase { - public BlockMagicEnergyAbsorber(Material material) { + public BlockMagicEnergyAbsorber() { super(); - setUnlocalizedName("techreborn.magicenergyabsorber"); setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 801c2bb61..7cd05fec9 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -24,15 +24,17 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; public class BlockMagicEnergyConverter extends BlockMachineBase { - public BlockMagicEnergyConverter(Material material) { + public BlockMagicEnergyConverter() { super(); - setUnlocalizedName("techreborn.magicenergyconverter"); setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 0cbfa5ca4..1c055c454 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -24,28 +24,30 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.generator.TileSemifluidGenerator; +import techreborn.lib.ModInfo; +import techreborn.tiles.generator.TileSemiFluidGenerator; public class BlockSemiFluidGenerator extends BlockMachineBase { - public BlockSemiFluidGenerator(final Material material) { + public BlockSemiFluidGenerator() { super(); - this.setUnlocalizedName("techreborn.semifluidgenerator"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileSemifluidGenerator(); + return new TileSemiFluidGenerator(); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index 7f0259181..3609e1795 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -34,8 +34,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileSolarPanel; /** @@ -44,14 +47,13 @@ import techreborn.tiles.generator.TileSolarPanel; public class BlockSolarPanel extends BaseTileBlock { public static PropertyBool ACTIVE = PropertyBool.create("active"); - private final String prefix = "techreborn:blocks/machine/generators/"; public BlockSolarPanel() { super(Material.IRON); - setUnlocalizedName("techreborn.solarpanel"); setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false)); setHardness(2.0F); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } protected BlockStateContainer createBlockState() { diff --git a/src/main/java/techreborn/blocks/generator/BlockGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java similarity index 82% rename from src/main/java/techreborn/blocks/generator/BlockGenerator.java rename to src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java index c1e10c088..bfc6ed543 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java @@ -27,23 +27,26 @@ package techreborn.blocks.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.generator.TileGenerator; +import techreborn.lib.ModInfo; +import techreborn.tiles.generator.TileSolidFuelGenerator; -public class BlockGenerator extends BlockMachineBase { +public class BlockSolidFuelGenerator extends BlockMachineBase { - public BlockGenerator() { + public BlockSolidFuelGenerator() { super(); - this.setUnlocalizedName("techreborn.generator"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileGenerator(); + return new TileSolidFuelGenerator(); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index 8bb3121dc..411e48860 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -27,9 +27,11 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import reborncore.RebornCore; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileWaterMill; /** @@ -37,13 +39,11 @@ import techreborn.tiles.generator.TileWaterMill; */ public class BlockWaterMill extends BaseTileBlock { - private final String prefix = "techreborn:blocks/machine/generators/"; - public BlockWaterMill() { super(Material.IRON); - setUnlocalizedName("techreborn.watermill"); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2.0F); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index fe430d891..53da18c38 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -26,8 +26,11 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileWindMill; /** @@ -37,9 +40,9 @@ public class BlockWindMill extends BlockMachineBase { public BlockWindMill() { super(false); - setUnlocalizedName("techreborn.windmill"); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2.0F); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java similarity index 86% rename from src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java rename to src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java index 37501d5da..51d865d65 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java @@ -24,7 +24,6 @@ package techreborn.blocks.iron_machines; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -32,26 +31,29 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.TileAlloyFurnace; +import techreborn.lib.ModInfo; +import techreborn.tiles.TileIronAlloyFurnace; import java.util.ArrayList; import java.util.List; -public class BlockAlloyFurnace extends BlockMachineBase { +public class BlockIronAlloyFurnace extends BlockMachineBase { - public BlockAlloyFurnace(final Material material) { + public BlockIronAlloyFurnace() { super(); - this.setUnlocalizedName("techreborn.alloyfurnace"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines")); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileAlloyFurnace(); + return new TileIronAlloyFurnace(); } @Override diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java index 711d9f046..fd1cf5c3c 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java @@ -35,10 +35,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.TileIronFurnace; import java.util.ArrayList; @@ -49,8 +52,8 @@ public class BlockIronFurnace extends BlockMachineBase { public BlockIronFurnace() { super(); - this.setUnlocalizedName("techreborn.ironfurnace"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 791e06e87..d8a9d725a 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -24,22 +24,24 @@ package techreborn.blocks.machine; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.TileAssemblingMachine; public class BlockAssemblingMachine extends BlockMachineBase { - public BlockAssemblingMachine(final Material material) { + public BlockAssemblingMachine() { super(); - this.setUnlocalizedName("techreborn.assemblingmachine"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index 0f580c1a5..52d4c33b1 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -24,22 +24,24 @@ package techreborn.blocks.machine; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.TileChemicalReactor; public class BlockChemicalReactor extends BlockMachineBase { - public BlockChemicalReactor(final Material material) { + public BlockChemicalReactor() { super(); - this.setUnlocalizedName("techreborn.chemicalreactor"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java index 9aa2a17ed..70cb2541d 100644 --- a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java @@ -24,27 +24,29 @@ package techreborn.blocks.machine; -import net.minecraft.block.material.Material; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.TileScrapboxinator; import java.util.List; public class BlockScrapboxinator extends BlockMachineBase { - public BlockScrapboxinator(final Material material) { + public BlockScrapboxinator() { super(); - this.setUnlocalizedName("techreborn.scrapboxinator"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 3cb77da32..648b59df3 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -24,7 +24,6 @@ package techreborn.blocks.machine; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -32,18 +31,21 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileVacuumFreezer; public class BlockVacuumFreezer extends BlockMachineBase { - public BlockVacuumFreezer(final Material material) { + public BlockVacuumFreezer() { super(); - this.setUnlocalizedName("techreborn.vacuumfreezer"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockAESU.java b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java similarity index 92% rename from src/main/java/techreborn/blocks/storage/BlockAESU.java rename to src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java index b8ed821d3..a2e51ccc5 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAESU.java +++ b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java @@ -32,19 +32,19 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.client.EGui; import techreborn.init.ModBlocks; -import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAdjustableSU; import java.util.ArrayList; import java.util.List; -public class BlockAESU extends BlockEnergyStorage { - public BlockAESU() { +public class BlockAdjustableSU extends BlockEnergyStorage { + public BlockAdjustableSU() { super("AESU", EGui.AESU.ordinal()); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileAesu(); + return new TileAdjustableSU(); } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index e2bc60d39..bce273610 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -37,9 +37,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseTileBlock; import techreborn.Core; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import java.util.Iterator; import java.util.Random; @@ -49,18 +52,17 @@ import java.util.Random; */ public abstract class BlockEnergyStorage extends BaseTileBlock { public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL); - protected final String prefix = "techreborn:blocks/machines/energy/"; public String name; public int guiID; public BlockEnergyStorage(String name, int guiID) { - super(Material.ROCK); + super(Material.IRON); setHardness(2f); - setUnlocalizedName("techreborn." + name.toLowerCase()); setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.name = name; this.guiID = guiID; + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); } @Override @@ -147,10 +149,10 @@ public abstract class BlockEnergyStorage extends BaseTileBlock { if (fullName.equalsIgnoreCase("Batbox")) { return "lv_storage"; } - if (fullName.equalsIgnoreCase("MFE")) { + if (fullName.equalsIgnoreCase("MEDIUM_VOLTAGE_SU")) { return "mv_storage"; } - if (fullName.equalsIgnoreCase("MFSU")) { + if (fullName.equalsIgnoreCase("HIGH_VOLTAGE_SU")) { return "hv_storage"; } if (fullName.equalsIgnoreCase("AESU")) { diff --git a/src/main/java/techreborn/blocks/storage/BlockMFSU.java b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java similarity index 89% rename from src/main/java/techreborn/blocks/storage/BlockMFSU.java rename to src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java index ba2534b78..7047988c7 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMFSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java @@ -32,7 +32,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.client.EGui; import techreborn.init.ModBlocks; -import techreborn.tiles.storage.TileMFSU; +import techreborn.tiles.storage.TileHighVoltageSU; import java.util.ArrayList; import java.util.List; @@ -40,15 +40,15 @@ import java.util.List; /** * Created by modmuss50 on 14/03/2016. */ -public class BlockMFSU extends BlockEnergyStorage { - public BlockMFSU() { - super("MFSU", EGui.MFSU.ordinal()); +public class BlockHighVoltageSU extends BlockEnergyStorage { + public BlockHighVoltageSU() { + super("high_voltage_su", EGui.HIGH_VOLTAGE_SU.ordinal()); this.setHardness(2f); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileMFSU(); + return new TileHighVoltageSU(); } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java similarity index 85% rename from src/main/java/techreborn/blocks/storage/BlockIDSU.java rename to src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java index 0253c4f69..e56c3799d 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java @@ -33,27 +33,27 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.client.EGui; -import techreborn.tiles.idsu.TileIDSU; +import techreborn.tiles.idsu.TileInterdimensionalSU; import java.util.ArrayList; import java.util.List; -public class BlockIDSU extends BlockEnergyStorage { - public BlockIDSU() { +public class BlockInterdimensionalSU extends BlockEnergyStorage { + public BlockInterdimensionalSU() { super("IDSU", EGui.IDSU.ordinal()); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileIDSU(); + return new TileInterdimensionalSU(); } @Override public IBlockState getStateForPlacement(final World world, final BlockPos pos, final EnumFacing facing, final float hitX, final float hitY, final float hitZ, final int meta, final EntityLivingBase placer) { final TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileIDSU) { - ((TileIDSU) tile).ownerUdid = placer.getUniqueID().toString(); + if (tile instanceof TileInterdimensionalSU) { + ((TileInterdimensionalSU) tile).ownerUdid = placer.getUniqueID().toString(); } return this.getDefaultState(); } @@ -69,8 +69,8 @@ public class BlockIDSU extends BlockEnergyStorage { public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { super.onBlockPlacedBy(world, pos, state, placer, stack); TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileIDSU) { - ((TileIDSU) tile).ownerUdid = placer.getUniqueID().toString(); + if (tile instanceof TileInterdimensionalSU) { + ((TileInterdimensionalSU) tile).ownerUdid = placer.getUniqueID().toString(); } } } diff --git a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java similarity index 75% rename from src/main/java/techreborn/blocks/storage/BlockLESUStorage.java rename to src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index b91749c5b..a61ffb841 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -33,34 +33,42 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseTileBlock; +import techreborn.Core; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.lesu.TileLesuStorage; +import techreborn.lib.ModInfo; +import techreborn.tiles.lesu.TileLSUStorage; import java.util.ArrayList; import java.util.List; -public class BlockLESUStorage extends BaseTileBlock { +public class BlockLSUStorage extends BaseTileBlock { ; - public BlockLESUStorage(Material material) { - super(material); - setUnlocalizedName("techreborn.lesustorage"); + public BlockLSUStorage() { + super(Material.IRON); setCreativeTab(TechRebornCreativeTab.instance); + if (Core.proxy.isCTMAvailable()) { + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy/ctm")); + } else { + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); + } } @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemstack) { super.onBlockPlacedBy(world, pos, state, player, itemstack); - if (world.getTileEntity(pos) instanceof TileLesuStorage) { - ((TileLesuStorage) world.getTileEntity(pos)).rebuildNetwork(); + if (world.getTileEntity(pos) instanceof TileLSUStorage) { + ((TileLSUStorage) world.getTileEntity(pos)).rebuildNetwork(); } } @Override public void breakBlock(World world, BlockPos pos, IBlockState state) { - if (world.getTileEntity(pos) instanceof TileLesuStorage) { - ((TileLesuStorage) world.getTileEntity(pos)).removeFromNetwork(); + if (world.getTileEntity(pos) instanceof TileLSUStorage) { + ((TileLSUStorage) world.getTileEntity(pos)).removeFromNetwork(); } super.breakBlock(world, pos, state); } @@ -74,7 +82,7 @@ public class BlockLESUStorage extends BaseTileBlock { @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileLesuStorage(); + return new TileLSUStorage(); } public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) { diff --git a/src/main/java/techreborn/blocks/storage/BlockLESU.java b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java similarity index 91% rename from src/main/java/techreborn/blocks/storage/BlockLESU.java rename to src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java index a42316314..140d28ced 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java @@ -31,19 +31,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.client.EGui; -import techreborn.tiles.lesu.TileLesu; +import techreborn.tiles.lesu.TileLapotronicSU; import java.util.ArrayList; import java.util.List; -public class BlockLESU extends BlockEnergyStorage { - public BlockLESU() { +public class BlockLapotronicSU extends BlockEnergyStorage { + public BlockLapotronicSU() { super("LESU", EGui.LESU.ordinal()); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileLesu(); + return new TileLapotronicSU(); } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockBatBox.java b/src/main/java/techreborn/blocks/storage/BlockLowVoltageSU.java similarity index 89% rename from src/main/java/techreborn/blocks/storage/BlockBatBox.java rename to src/main/java/techreborn/blocks/storage/BlockLowVoltageSU.java index cbea93cb1..08333ff77 100644 --- a/src/main/java/techreborn/blocks/storage/BlockBatBox.java +++ b/src/main/java/techreborn/blocks/storage/BlockLowVoltageSU.java @@ -31,7 +31,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.client.EGui; -import techreborn.tiles.storage.TileBatBox; +import techreborn.tiles.storage.TileLowVoltageSU; import java.util.ArrayList; import java.util.List; @@ -39,14 +39,14 @@ import java.util.List; /** * Created by modmuss50 on 14/03/2016. */ -public class BlockBatBox extends BlockEnergyStorage { - public BlockBatBox() { - super("Batbox", EGui.BATBOX.ordinal()); +public class BlockLowVoltageSU extends BlockEnergyStorage { + public BlockLowVoltageSU() { + super("low_voltage_su", EGui.LOW_VOLTAGE_SU.ordinal()); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileBatBox(); + return new TileLowVoltageSU(); } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockMFE.java b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java similarity index 88% rename from src/main/java/techreborn/blocks/storage/BlockMFE.java rename to src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java index bf02dcf4a..1add69ba7 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMFE.java +++ b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java @@ -32,7 +32,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.client.EGui; import techreborn.init.ModBlocks; -import techreborn.tiles.storage.TileMFE; +import techreborn.tiles.storage.TileMediumVoltageSU; import java.util.ArrayList; import java.util.List; @@ -40,14 +40,14 @@ import java.util.List; /** * Created by modmuss50 on 14/03/2016. */ -public class BlockMFE extends BlockEnergyStorage { - public BlockMFE() { - super("MFE", EGui.MFE.ordinal()); +public class BlockMediumVoltageSU extends BlockEnergyStorage { + public BlockMediumVoltageSU() { + super("medium_voltage_su", EGui.MEDIUM_VOLTAGE_SU.ordinal()); } @Override public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileMFE(); + return new TileMediumVoltageSU(); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index 196397023..9bc9b8c69 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -24,24 +24,24 @@ package techreborn.blocks.tier1; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.teir1.TileCompressor; public class BlockCompressor extends BlockMachineBase { - private final String prefix = "techreborn:blocks/machine/tier1_machines/"; - - public BlockCompressor(final Material material) { + public BlockCompressor() { super(); - this.setUnlocalizedName("techreborn.compressor"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index a973de6aa..a27031336 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -24,22 +24,24 @@ package techreborn.blocks.tier1; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.teir1.TileElectricFurnace; public class BlockElectricFurnace extends BlockMachineBase { - public BlockElectricFurnace(final Material material) { + public BlockElectricFurnace() { super(); - this.setUnlocalizedName("techreborn.electricfurnace"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index 81179387f..ba1d130e7 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -24,22 +24,24 @@ package techreborn.blocks.tier1; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.teir1.TileExtractor; public class BlockExtractor extends BlockMachineBase { - public BlockExtractor(final Material material) { + public BlockExtractor() { super(); - this.setUnlocalizedName("techreborn.extractor"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index b46ae8582..f01c89816 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -24,22 +24,24 @@ package techreborn.blocks.tier1; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.teir1.TileGrinder; public class BlockGrinder extends BlockMachineBase { - public BlockGrinder(final Material material) { + public BlockGrinder() { super(); - this.setUnlocalizedName("techreborn.grinder"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index e1994df05..97d930ce2 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -24,22 +24,24 @@ package techreborn.blocks.tier1; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.teir1.TileRecycler; public class BlockRecycler extends BlockMachineBase { - public BlockRecycler(final Material material) { + public BlockRecycler() { super(); - this.setUnlocalizedName("techreborn.recycler"); this.setCreativeTab(TechRebornCreativeTab.instance); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java index de4b8a20d..33d39b3bb 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java @@ -42,7 +42,7 @@ import java.util.List; public class BlockHVTransformer extends BlockTransformer { public BlockHVTransformer() { - super("hvtransformer"); + super("hv_transformer"); } @Override diff --git a/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java index 245ceee1d..61bb84322 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java @@ -41,7 +41,7 @@ import java.util.List; public class BlockLVTransformer extends BlockTransformer { public BlockLVTransformer() { - super("lvtransformer"); + super("lv_transformer"); } @Override diff --git a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java index 95caf2e44..4edfd09b1 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java @@ -42,7 +42,7 @@ import java.util.List; public class BlockMVTransformer extends BlockTransformer { public BlockMVTransformer() { - super("mvtransformer"); + super("mv_transformer"); } @Override diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 5b9009a66..4eaeafc6f 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -43,8 +43,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import java.util.ArrayList; import java.util.Iterator; @@ -60,12 +63,12 @@ public abstract class BlockTransformer extends BaseTileBlock { public String name; public BlockTransformer(String name) { - super(Material.ROCK); + super(Material.IRON); setHardness(2f); - setUnlocalizedName("techreborn." + name.toLowerCase()); setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.name = name; + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); } protected BlockStateContainer createBlockState() { diff --git a/src/main/java/techreborn/client/EGui.java b/src/main/java/techreborn/client/EGui.java index 69243a28a..5181b5e32 100644 --- a/src/main/java/techreborn/client/EGui.java +++ b/src/main/java/techreborn/client/EGui.java @@ -62,9 +62,9 @@ public enum EGui { IRON_FURNACE(true), RECYCLER(true), SCRAPBOXINATOR(true), - BATBOX(true), - MFSU(true), - MFE(true); + LOW_VOLTAGE_SU(true), + HIGH_VOLTAGE_SU(true), + MEDIUM_VOLTAGE_SU(true); private final boolean containerBuilder; diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index de0cbdc57..070a5e626 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -33,14 +33,14 @@ import techreborn.client.container.*; import techreborn.client.gui.*; import techreborn.manual.GuiManual; import techreborn.tiles.*; -import techreborn.tiles.fusionReactor.TileEntityFusionController; +import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.tiles.generator.*; -import techreborn.tiles.idsu.TileIDSU; -import techreborn.tiles.lesu.TileLesu; +import techreborn.tiles.idsu.TileInterdimensionalSU; +import techreborn.tiles.lesu.TileLapotronicSU; import techreborn.tiles.multiblock.*; -import techreborn.tiles.storage.TileBatBox; -import techreborn.tiles.storage.TileMFE; -import techreborn.tiles.storage.TileMFSU; +import techreborn.tiles.storage.TileLowVoltageSU; +import techreborn.tiles.storage.TileMediumVoltageSU; +import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.teir1.*; public class GuiHandler implements IGuiHandler { @@ -57,11 +57,11 @@ public class GuiHandler implements IGuiHandler { switch (gui) { case AESU: - return new ContainerAESU((TileAesu) tile, player); + return new ContainerAESU((TileAdjustableSU) tile, player); case DESTRUCTOPACK: return new ContainerDestructoPack(player); case LESU: - return new ContainerLESU((TileLesu) tile, player); + return new ContainerLESU((TileLapotronicSU) tile, player); default: break; } @@ -76,15 +76,15 @@ public class GuiHandler implements IGuiHandler { switch (gui) { case AESU: - return new GuiAESU(player, (TileAesu) tile); + return new GuiAESU(player, (TileAdjustableSU) tile); case ALLOY_FURNACE: - return new GuiAlloyFurnace(player, (TileAlloyFurnace) tile); + return new GuiAlloyFurnace(player, (TileIronAlloyFurnace) tile); case ALLOY_SMELTER: return new GuiAlloySmelter(player, (TileAlloySmelter) tile); case ASSEMBLING_MACHINE: return new GuiAssemblingMachine(player, (TileAssemblingMachine) tile); - case BATBOX: - return new GuiBatbox(player, (TileBatBox) tile); + case LOW_VOLTAGE_SU: + return new GuiBatbox(player, (TileLowVoltageSU) tile); case BLAST_FURNACE: return new GuiBlastFurnace(player, (TileIndustrialBlastFurnace) tile); case CENTRIFUGE: @@ -108,15 +108,15 @@ public class GuiHandler implements IGuiHandler { case EXTRACTOR: return new GuiExtractor(player, (TileExtractor) tile); case FUSION_CONTROLLER: - return new GuiFusionReactor(player, (TileEntityFusionController) tile); + return new GuiFusionReactor(player, (TileFusionControlComputer) tile); case GAS_TURBINE: return new GuiGasTurbine(player, (TileGasTurbine) tile); case GENERATOR: - return new GuiGenerator(player, (TileGenerator) tile); + return new GuiGenerator(player, (TileSolidFuelGenerator) tile); case GRINDER: return new GuiGrinder(player, (TileGrinder) tile); case IDSU: - return new GuiIDSU(player, (TileIDSU) tile); + return new GuiIDSU(player, (TileInterdimensionalSU) tile); case IMPLOSION_COMPRESSOR: return new GuiImplosionCompressor(player, (TileImplosionCompressor) tile); case INDUSTRIAL_ELECTROLYZER: @@ -126,15 +126,15 @@ public class GuiHandler implements IGuiHandler { case IRON_FURNACE: return new GuiIronFurnace(player, (TileIronFurnace) tile); case LESU: - return new GuiLESU(player, (TileLesu) tile); + return new GuiLESU(player, (TileLapotronicSU) tile); case MANUAL: return new GuiManual(); case MATTER_FABRICATOR: return new GuiMatterFabricator(player, (TileMatterFabricator) tile); - case MFE: - return new GuiMFE(player, (TileMFE) tile); - case MFSU: - return new GuiMFSU(player, (TileMFSU) tile); + case MEDIUM_VOLTAGE_SU: + return new GuiMFE(player, (TileMediumVoltageSU) tile); + case HIGH_VOLTAGE_SU: + return new GuiMFSU(player, (TileHighVoltageSU) tile); case QUANTUM_CHEST: return new GuiQuantumChest(player, (TileQuantumChest) tile); case QUANTUM_TANK: @@ -148,7 +148,7 @@ public class GuiHandler implements IGuiHandler { case SCRAPBOXINATOR: return new GuiScrapboxinator(player, (TileScrapboxinator) tile); case SEMIFLUID_GENERATOR: - return new GuiSemifluidGenerator(player, (TileSemifluidGenerator) tile); + return new GuiSemifluidGenerator(player, (TileSemiFluidGenerator) tile); case THERMAL_GENERATOR: return new GuiThermalGenerator(player, (TileThermalGenerator) tile); case VACUUM_FREEZER: diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index b4e6a3a98..6313d5549 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -33,10 +33,6 @@ import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; -import techreborn.blocks.BlockOre; -import techreborn.blocks.BlockOre2; -import techreborn.blocks.BlockStorage; -import techreborn.blocks.BlockStorage2; import techreborn.blocks.cable.BlockCable; import techreborn.blocks.cable.EnumCableType; import techreborn.config.ConfigTechReborn; @@ -165,26 +161,6 @@ public class RegisterItemJsons { registerBlockstate(ModItems.UPGRADES, i, name[i], "items/misc/"); } - for (int i = 0; i < BlockOre.ores.length; ++i) { - String[] name = BlockOre.ores.clone(); - registerBlockstate(ModBlocks.ORE, i, name[i]); - } - - for (int i = 0; i < BlockOre2.ores.length; ++i) { - String[] name = BlockOre2.ores.clone(); - registerBlockstate(ModBlocks.ORE2, i, name[i]); - } - - for (int i = 0; i < BlockStorage.types.length; ++i) { - String[] name = BlockStorage.types.clone(); - registerBlockstate(ModBlocks.STORAGE, i, name[i]); - } - - for (int i = 0; i < BlockStorage2.types.length; ++i) { - String[] name = BlockStorage2.types.clone(); - registerBlockstate(ModBlocks.STORAGE2, i, name[i]); - } - for (EnumCableType cableType : EnumCableType.values()) { registerBlockstateMultiItem(Item.getItemFromBlock(ModBlocks.CABLE), cableType.ordinal(), cableType.getName().toLowerCase(), "cable_inv"); } diff --git a/src/main/java/techreborn/client/container/ContainerAESU.java b/src/main/java/techreborn/client/container/ContainerAESU.java index 0c4838fc1..76127a686 100644 --- a/src/main/java/techreborn/client/container/ContainerAESU.java +++ b/src/main/java/techreborn/client/container/ContainerAESU.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; -import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAdjustableSU; public class ContainerAESU extends RebornContainer { @@ -38,9 +38,9 @@ public class ContainerAESU extends RebornContainer { public int storedEu; public int euChange; EntityPlayer player; - TileAesu tile; + TileAdjustableSU tile; - public ContainerAESU(TileAesu tileaesu, EntityPlayer player) { + public ContainerAESU(TileAdjustableSU tileaesu, EntityPlayer player) { tile = tileaesu; this.player = player; diff --git a/src/main/java/techreborn/client/container/ContainerLESU.java b/src/main/java/techreborn/client/container/ContainerLESU.java index cde05a86a..be639f218 100644 --- a/src/main/java/techreborn/client/container/ContainerLESU.java +++ b/src/main/java/techreborn/client/container/ContainerLESU.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; -import techreborn.tiles.lesu.TileLesu; +import techreborn.tiles.lesu.TileLapotronicSU; public class ContainerLESU extends RebornContainer { @@ -40,9 +40,9 @@ public class ContainerLESU extends RebornContainer { public int connectedBlocks; public double euStorage; EntityPlayer player; - TileLesu tile; + TileLapotronicSU tile; - public ContainerLESU(TileLesu tileaesu, EntityPlayer player) { + public ContainerLESU(TileLapotronicSU tileaesu, EntityPlayer player) { tile = tileaesu; this.player = player; @@ -111,7 +111,7 @@ public class ContainerLESU extends RebornContainer { } else if (id == 4) { this.euStorage = value; } - this.euStorage = ((connectedBlocks + 1) * TileLesu.storagePerBlock); + this.euStorage = ((connectedBlocks + 1) * TileLapotronicSU.storagePerBlock); } } diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index f944de371..2cb793711 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -34,7 +34,7 @@ import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; import techreborn.client.container.ContainerAESU; import techreborn.packets.PacketAesu; -import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAdjustableSU; import java.awt.*; import java.io.IOException; @@ -43,11 +43,11 @@ public class GuiAESU extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/aesu.png"); - TileAesu aesu; + TileAdjustableSU aesu; ContainerAESU containerAesu; - public GuiAESU(EntityPlayer player, TileAesu tileaesu) { + public GuiAESU(EntityPlayer player, TileAdjustableSU tileaesu) { super(new ContainerAESU(tileaesu, player)); this.xSize = 176; this.ySize = 197; diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index c17563048..61733c02d 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -29,16 +29,16 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; -import techreborn.tiles.TileAlloyFurnace; +import techreborn.tiles.TileIronAlloyFurnace; public class GuiAlloyFurnace extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/alloy_furnace.png"); - TileAlloyFurnace alloyfurnace; + TileIronAlloyFurnace alloyfurnace; - public GuiAlloyFurnace(final EntityPlayer player, final TileAlloyFurnace alloyFurnace) { + public GuiAlloyFurnace(final EntityPlayer player, final TileIronAlloyFurnace alloyFurnace) { super(alloyFurnace.createContainer(player)); this.xSize = 176; this.ySize = 167; diff --git a/src/main/java/techreborn/client/gui/GuiBatbox.java b/src/main/java/techreborn/client/gui/GuiBatbox.java index 52e17dbc5..b9bad4662 100644 --- a/src/main/java/techreborn/client/gui/GuiBatbox.java +++ b/src/main/java/techreborn/client/gui/GuiBatbox.java @@ -27,13 +27,13 @@ package techreborn.client.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.powerSystem.PowerSystem; -import techreborn.tiles.storage.TileBatBox; +import techreborn.tiles.storage.TileLowVoltageSU; public class GuiBatbox extends GuiBase { - TileBatBox tile; + TileLowVoltageSU tile; - public GuiBatbox(final EntityPlayer player, final TileBatBox tile) { + public GuiBatbox(final EntityPlayer player, final TileLowVoltageSU tile) { super(player, tile, tile.createContainer(player)); this.tile = tile; } diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 9f33c2436..52b42d4f2 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -38,7 +38,7 @@ import reborncore.common.misc.Location; import reborncore.common.powerSystem.PowerSystem; import techreborn.client.ClientMultiBlocks; import techreborn.proxies.ClientProxy; -import techreborn.tiles.fusionReactor.TileEntityFusionController; +import techreborn.tiles.fusionReactor.TileFusionControlComputer; import java.io.IOException; @@ -47,9 +47,9 @@ public class GuiFusionReactor extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/fusion_reactor.png"); - TileEntityFusionController fusionController; + TileFusionControlComputer fusionController; - public GuiFusionReactor(final EntityPlayer player, final TileEntityFusionController fusion) { + public GuiFusionReactor(final EntityPlayer player, final TileFusionControlComputer fusion) { super(fusion.createContainer(player)); this.fusionController = fusion; } diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index 3b08ee814..a5b16d57a 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -25,13 +25,13 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.generator.TileGenerator; +import techreborn.tiles.generator.TileSolidFuelGenerator; public class GuiGenerator extends GuiBase { - TileGenerator tile; + TileSolidFuelGenerator tile; - public GuiGenerator(final EntityPlayer player, final TileGenerator tile) { + public GuiGenerator(final EntityPlayer player, final TileSolidFuelGenerator tile) { super(player, tile, tile.createContainer(player)); this.tile = tile; } diff --git a/src/main/java/techreborn/client/gui/GuiIDSU.java b/src/main/java/techreborn/client/gui/GuiIDSU.java index 79d6dac74..f0da7ffcc 100644 --- a/src/main/java/techreborn/client/gui/GuiIDSU.java +++ b/src/main/java/techreborn/client/gui/GuiIDSU.java @@ -27,13 +27,13 @@ package techreborn.client.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.powerSystem.PowerSystem; -import techreborn.tiles.idsu.TileIDSU; +import techreborn.tiles.idsu.TileInterdimensionalSU; public class GuiIDSU extends GuiBase { - TileIDSU idsu; + TileInterdimensionalSU idsu; - public GuiIDSU(EntityPlayer player, TileIDSU tileIDSU) { + public GuiIDSU(EntityPlayer player, TileInterdimensionalSU tileIDSU) { super(player, tileIDSU, tileIDSU.createContainer(player)); this.xSize = 176; this.ySize = 197; diff --git a/src/main/java/techreborn/client/gui/GuiLESU.java b/src/main/java/techreborn/client/gui/GuiLESU.java index bcb8a0e18..4e414b7ff 100644 --- a/src/main/java/techreborn/client/gui/GuiLESU.java +++ b/src/main/java/techreborn/client/gui/GuiLESU.java @@ -31,7 +31,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import reborncore.common.powerSystem.PowerSystem; import techreborn.client.container.ContainerLESU; -import techreborn.tiles.lesu.TileLesu; +import techreborn.tiles.lesu.TileLapotronicSU; import java.awt.*; @@ -39,11 +39,11 @@ public class GuiLESU extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/aesu.png"); - TileLesu aesu; + TileLapotronicSU aesu; ContainerLESU containerLesu; - public GuiLESU(EntityPlayer player, TileLesu tileaesu) { + public GuiLESU(EntityPlayer player, TileLapotronicSU tileaesu) { super(new ContainerLESU(tileaesu, player)); this.xSize = 176; this.ySize = 197; diff --git a/src/main/java/techreborn/client/gui/GuiMFE.java b/src/main/java/techreborn/client/gui/GuiMFE.java index be0250ad4..7eb654747 100644 --- a/src/main/java/techreborn/client/gui/GuiMFE.java +++ b/src/main/java/techreborn/client/gui/GuiMFE.java @@ -27,13 +27,13 @@ package techreborn.client.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.powerSystem.PowerSystem; -import techreborn.tiles.storage.TileMFE; +import techreborn.tiles.storage.TileMediumVoltageSU; public class GuiMFE extends GuiBase { - TileMFE mfe; + TileMediumVoltageSU mfe; - public GuiMFE(final EntityPlayer player, final TileMFE mfe) { + public GuiMFE(final EntityPlayer player, final TileMediumVoltageSU mfe) { super(player, mfe, mfe.createContainer(player)); this.mfe = mfe; } diff --git a/src/main/java/techreborn/client/gui/GuiMFSU.java b/src/main/java/techreborn/client/gui/GuiMFSU.java index 7b45d5c4d..84d0f9bbf 100644 --- a/src/main/java/techreborn/client/gui/GuiMFSU.java +++ b/src/main/java/techreborn/client/gui/GuiMFSU.java @@ -27,13 +27,13 @@ package techreborn.client.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.powerSystem.PowerSystem; -import techreborn.tiles.storage.TileMFSU; +import techreborn.tiles.storage.TileHighVoltageSU; public class GuiMFSU extends GuiBase { - TileMFSU mfsu; + TileHighVoltageSU mfsu; - public GuiMFSU(final EntityPlayer player, final TileMFSU mfsu) { + public GuiMFSU(final EntityPlayer player, final TileHighVoltageSU mfsu) { super(player, mfsu, mfsu.createContainer(player)); this.mfsu = mfsu; } diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index 0ecf56618..975abfef3 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import reborncore.client.RenderUtil; -import techreborn.tiles.generator.TileSemifluidGenerator; +import techreborn.tiles.generator.TileSemiFluidGenerator; public class GuiSemifluidGenerator extends GuiContainer { @@ -38,9 +38,9 @@ public class GuiSemifluidGenerator extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/semifluid_generator.png"); - TileSemifluidGenerator semifluidGenerator; + TileSemiFluidGenerator semifluidGenerator; - public GuiSemifluidGenerator(final EntityPlayer player, final TileSemifluidGenerator semifluidGenerator) { + public GuiSemifluidGenerator(final EntityPlayer player, final TileSemiFluidGenerator semifluidGenerator) { super(semifluidGenerator.createContainer(player)); this.xSize = 176; this.ySize = 167; diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index 7f0efd832..2fbc9dc6b 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -298,7 +298,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin { RecipeCategoryUids.ROLLING_MACHINE); registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR), + registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR), EFluidGenerator.SEMIFLUID.getRecipeID()); registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.GAS_TURBINE), EFluidGenerator.GAS.getRecipeID()); diff --git a/src/main/java/techreborn/init/IC2Duplicates.java b/src/main/java/techreborn/init/IC2Duplicates.java index 875479513..dd694002b 100644 --- a/src/main/java/techreborn/init/IC2Duplicates.java +++ b/src/main/java/techreborn/init/IC2Duplicates.java @@ -45,9 +45,9 @@ public enum IC2Duplicates { SOLAR_PANEL(new ItemStack(ModBlocks.SOLAR_PANEL)), RECYCLER(new ItemStack(ModBlocks.RECYCLER)), COMPRESSOR(new ItemStack(ModBlocks.COMPRESSOR)), - BAT_BOX(new ItemStack(ModBlocks.BATTERY_BOX)), - MFE(new ItemStack(ModBlocks.MVSU)), - MFSU(new ItemStack(ModBlocks.HVSU)), + BAT_BOX(new ItemStack(ModBlocks.LOW_VOLTAGE_SU)), + MFE(new ItemStack(ModBlocks.MEDIUM_VOLTAGE_SU)), + MFSU(new ItemStack(ModBlocks.HIGH_VOLTAGE_SU)), LVT(new ItemStack(ModBlocks.LV_TRANSFORMER)), MVT(new ItemStack(ModBlocks.MV_TRANSFORMER)), HVT(new ItemStack(ModBlocks.HV_TRANSFORMER)), diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 1f497faeb..7e59baa0c 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -25,7 +25,6 @@ package techreborn.init; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -38,7 +37,7 @@ import techreborn.blocks.*; import techreborn.blocks.advanced_machine.*; import techreborn.blocks.cable.BlockCable; import techreborn.blocks.generator.*; -import techreborn.blocks.iron_machines.BlockAlloyFurnace; +import techreborn.blocks.iron_machines.BlockIronAlloyFurnace; import techreborn.blocks.iron_machines.BlockIronFurnace; import techreborn.blocks.machine.*; import techreborn.blocks.storage.*; @@ -50,15 +49,15 @@ import techreborn.itemblocks.*; import techreborn.lib.ModInfo; import techreborn.tiles.*; import techreborn.tiles.cable.TileCable; -import techreborn.tiles.fusionReactor.TileEntityFusionController; +import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.tiles.generator.*; -import techreborn.tiles.idsu.TileIDSU; -import techreborn.tiles.lesu.TileLesu; -import techreborn.tiles.lesu.TileLesuStorage; +import techreborn.tiles.idsu.TileInterdimensionalSU; +import techreborn.tiles.lesu.TileLSUStorage; +import techreborn.tiles.lesu.TileLapotronicSU; import techreborn.tiles.multiblock.*; -import techreborn.tiles.storage.TileBatBox; -import techreborn.tiles.storage.TileMFE; -import techreborn.tiles.storage.TileMFSU; +import techreborn.tiles.storage.TileHighVoltageSU; +import techreborn.tiles.storage.TileLowVoltageSU; +import techreborn.tiles.storage.TileMediumVoltageSU; import techreborn.tiles.teir1.*; import techreborn.tiles.transformers.TileHVTransformer; import techreborn.tiles.transformers.TileLVTransformer; @@ -81,20 +80,20 @@ public class ModBlocks { public static Block IMPLOSION_COMPRESSOR; public static Block MATTER_FABRICATOR; public static Block CHUNK_LOADER; - public static Block DRAGON_EGG_SIPHONER; + public static Block DRAGON_EGG_SYPHON; public static Block MAGIC_ENERGY_CONVERTER; public static Block ASSEMBLY_MACHINE; public static Block DIESEL_GENERATOR; public static Block INDUSTRIAL_ELECTROLYZER; public static Block MAGICAL_ABSORBER; - public static Block SEMIFLUID_GENERATOR; + public static Block SEMI_FLUID_GENERATOR; public static Block GAS_TURBINE; public static Block IRON_ALLOY_FURNACE; public static Block CHEMICAL_REACTOR; public static Block INTERDIMENSIONAL_SU; public static Block ADJUSTABLE_SU; public static Block LAPOTRONIC_SU; - public static Block LSU_STORAGE_BLOCK; + public static Block LSU_STORAGE; public static Block DISTILLATION_TOWER; public static Block VACUUM_FREEZER; public static Block FUSION_CONTROL_COMPUTER; @@ -110,13 +109,13 @@ public class ModBlocks { public static Block EXTRACTOR; public static Block ELECTRIC_FURNACE; public static Block SOLAR_PANEL; - public static Block CREATIVE_PANEL; + public static Block CREATIVE_SOLAR_PANEL; public static Block WATER_MILL; public static Block WIND_MILL; public static Block RECYCLER; - public static Block BATTERY_BOX; - public static Block MVSU; - public static Block HVSU; + public static Block LOW_VOLTAGE_SU; + public static Block MEDIUM_VOLTAGE_SU; + public static Block HIGH_VOLTAGE_SU; public static Block SCRAPBOXINATOR; public static Block LV_TRANSFORMER; public static Block MV_TRANSFORMER; @@ -217,218 +216,183 @@ public class ModBlocks { STORAGE2 = new BlockStorage2(); registerBlock(STORAGE2, ItemBlockStorage2.class, "storage2"); - DRAGON_EGG_SIPHONER = new BlockDragonEggSiphoner(Material.ROCK); - registerBlock(DRAGON_EGG_SIPHONER, "dragoneggenergsiphon"); - GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR"); - Core.proxy.registerCustomBlockStateLocation(DRAGON_EGG_SIPHONER, "machines/generators/dragon_egg_syphon"); + DRAGON_EGG_SYPHON = new BlockDragonEggSyphon(); + registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon"); + GameRegistry.registerTileEntity(TileDragonEggSyphon.class, "TileDragonEggSyphonTR"); - MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter(Material.ROCK); - registerBlock(MAGIC_ENERGY_CONVERTER, "magicenergyconverter"); - Core.proxy.registerCustomBlockStateLocation(MAGIC_ENERGY_CONVERTER, "machines/generators/magic_energy_converter"); + MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter(); + registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter"); - ASSEMBLY_MACHINE = new BlockAssemblingMachine(Material.ROCK); - registerBlock(ASSEMBLY_MACHINE, "assemblymachine"); + ASSEMBLY_MACHINE = new BlockAssemblingMachine(); + registerBlock(ASSEMBLY_MACHINE, "assembly_machine"); GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR"); - Core.proxy.registerCustomBlockStateLocation(ASSEMBLY_MACHINE, "machines/tier1_machines/assembly_machine"); - DIESEL_GENERATOR = new BlockDieselGenerator(Material.ROCK); - registerBlock(DIESEL_GENERATOR, "dieselgenerator"); + DIESEL_GENERATOR = new BlockDieselGenerator(); + registerBlock(DIESEL_GENERATOR, "diesel_generator"); GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR"); - Core.proxy.registerCustomBlockStateLocation(DIESEL_GENERATOR, "machines/generators/diesel_generator"); - INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer(Material.ROCK); - registerBlock(INDUSTRIAL_ELECTROLYZER, "industrialelectrolyzer"); + INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer(); + registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer"); GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR"); - Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_ELECTROLYZER, "machines/tier1_machines/industrial_electrolyzer"); - MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber(Material.ROCK); - registerBlock(MAGICAL_ABSORBER, "magicrnergyabsorber"); - Core.proxy.registerCustomBlockStateLocation(MAGICAL_ABSORBER, "machines/generators/magic_energy_absorber"); + MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber(); + registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber"); - SEMIFLUID_GENERATOR = new BlockSemiFluidGenerator(Material.ROCK); - registerBlock(SEMIFLUID_GENERATOR, "semifluidgenerator"); - GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR"); - Core.proxy.registerCustomBlockStateLocation(SEMIFLUID_GENERATOR, "machines/generators/semi_fluid_generator"); + SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator(); + registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator"); + GameRegistry.registerTileEntity(TileSemiFluidGenerator.class, "TileSemiFluidGeneratorTR"); - GAS_TURBINE = new BlockGasTurbine(Material.ROCK); - registerBlock(GAS_TURBINE, "gasturbine"); - GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR"); - Core.proxy.registerCustomBlockStateLocation(GAS_TURBINE, "machines/generators/gas_turbine"); + GAS_TURBINE = new BlockGasTurbine(); + registerBlock(GAS_TURBINE, "gas_turbine"); + GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGasTurbineTR"); - IRON_ALLOY_FURNACE = new BlockAlloyFurnace(Material.ROCK); - registerBlock(IRON_ALLOY_FURNACE, "alloyfurnace"); - GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR"); - Core.proxy.registerCustomBlockStateLocation(IRON_ALLOY_FURNACE, "machines/tier0_machines/alloy_furnace"); + IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace(); + registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace"); + GameRegistry.registerTileEntity(TileIronAlloyFurnace.class, "TileIronAlloyFurnaceTR"); - CHEMICAL_REACTOR = new BlockChemicalReactor(Material.ROCK); - registerBlock(CHEMICAL_REACTOR, "chemicalreactor"); + CHEMICAL_REACTOR = new BlockChemicalReactor(); + registerBlock(CHEMICAL_REACTOR, "chemical_reactor"); GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR"); - Core.proxy.registerCustomBlockStateLocation(CHEMICAL_REACTOR, "machines/tier1_machines/chemical_reactor"); - INTERDIMENSIONAL_SU = new BlockIDSU(); - registerBlock(INTERDIMENSIONAL_SU, "idsu"); - GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR"); + INTERDIMENSIONAL_SU = new BlockInterdimensionalSU(); + registerBlock(INTERDIMENSIONAL_SU, "inderdimensional_su"); + GameRegistry.registerTileEntity(TileInterdimensionalSU.class, "TileInterdimensionalSUTR"); - ADJUSTABLE_SU = new BlockAESU(); - registerBlock(ADJUSTABLE_SU, ItemBlockAesu.class, "aesu"); - GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR"); + ADJUSTABLE_SU = new BlockAdjustableSU(); + registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su"); + GameRegistry.registerTileEntity(TileAdjustableSU.class, "TileAdjustableSUTR"); - LAPOTRONIC_SU = new BlockLESU(); - registerBlock(LAPOTRONIC_SU, "lesu"); - GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); + LAPOTRONIC_SU = new BlockLapotronicSU(); + registerBlock(LAPOTRONIC_SU, "lapotronic_su"); + GameRegistry.registerTileEntity(TileLapotronicSU.class, "TileLapotronicSUTR"); - LSU_STORAGE_BLOCK = new BlockLESUStorage(Material.ROCK); - registerBlock(LSU_STORAGE_BLOCK, "lesustorage"); - GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); - if (Core.proxy.isCTMAvailable()) { - Core.proxy.registerCustomBlockStateLocation(LSU_STORAGE_BLOCK, "machines/energy/ev_multi_storage_ctm"); - } else { - Core.proxy.registerCustomBlockStateLocation(LSU_STORAGE_BLOCK, "machines/energy/ev_multi_storage"); - } + LSU_STORAGE = new BlockLSUStorage(); + registerBlock(LSU_STORAGE, "lsu_storage"); + GameRegistry.registerTileEntity(TileLSUStorage.class, "TileLSUStorageTR"); - DISTILLATION_TOWER = new BlockDistillationTower(Material.ROCK); - registerBlock(DISTILLATION_TOWER, "distillationtower"); - Core.proxy.registerCustomBlockStateLocation(DISTILLATION_TOWER, "machines/tier2_machines/distillation_tower"); + DISTILLATION_TOWER = new BlockDistillationTower(); + registerBlock(DISTILLATION_TOWER, "distillation_tower"); - VACUUM_FREEZER = new BlockVacuumFreezer(Material.ROCK); - registerBlock(VACUUM_FREEZER, "vacuumfreezer"); + VACUUM_FREEZER = new BlockVacuumFreezer(); + registerBlock(VACUUM_FREEZER, "vacuum_freezer"); GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR"); - Core.proxy.registerCustomBlockStateLocation(VACUUM_FREEZER, "machines/tier2_machines/vacuum_freezer"); - FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer(Material.ROCK); - registerBlock(FUSION_CONTROL_COMPUTER, "fusioncontrolcomputer"); - GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR"); - Core.proxy.registerCustomBlockStateLocation(FUSION_CONTROL_COMPUTER, "machines/generators/fusion_reactor"); + FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer(); + registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer"); + GameRegistry.registerTileEntity(TileFusionControlComputer.class, "TileFusionControlComputerTR"); - FUSION_COIL = new BlockFusionCoil(Material.ROCK); - registerBlock(FUSION_COIL, "fusioncoil"); - Core.proxy.registerCustomBlockStateLocation(FUSION_COIL, "machines/generators/fusion_coil"); + FUSION_COIL = new BlockFusionCoil(); + registerBlock(FUSION_COIL, "fusion_coil"); - LIGHTNING_ROD = new BlockLightningRod(Material.ROCK); - registerBlock(LIGHTNING_ROD, "lightningrod"); + LIGHTNING_ROD = new BlockLightningRod(); + registerBlock(LIGHTNING_ROD, "lightning_rod"); GameRegistry.registerTileEntity(TileLightningRod.class, "TileLightningRodTR"); - Core.proxy.registerCustomBlockStateLocation(LIGHTNING_ROD, "machines/generators/lightning_rod"); - HEAT_GENERATOR = new BlockHeatGenerator(Material.ROCK); - registerBlock(HEAT_GENERATOR, "heatgenerator"); + HEAT_GENERATOR = new BlockHeatGenerator(); + registerBlock(HEAT_GENERATOR, "heat_generator"); GameRegistry.registerTileEntity(TileHeatGenerator.class, "TileHeatGeneratorTR"); - INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill(Material.ROCK); - registerBlock(INDUSTRIAL_SAWMILL, "industrialSawmill"); + INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill(); + registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill"); GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR"); - Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_SAWMILL, "machines/tier2_machines/industrial_saw_mill"); - MACHINE_FRAMES = new BlockMachineFrame(Material.IRON); - registerBlock(MACHINE_FRAMES, ItemBlockMachineFrame.class, "techreborn.machineFrame"); - Core.proxy.registerCustomBlockStateLocation(MACHINE_FRAMES, "machines/storage/machine_blocks"); + MACHINE_FRAMES = new BlockMachineFrames(); + registerBlock(MACHINE_FRAMES, ItemBlockMachineFrames.class, "machine_frame"); - GRINDER = new BlockGrinder(Material.IRON); - registerBlock(GRINDER, "techreborn.grinder"); + GRINDER = new BlockGrinder(); + registerBlock(GRINDER, "grinder"); GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR"); - Core.proxy.registerCustomBlockStateLocation(GRINDER, "machines/tier1_machines/grinder"); - SOLID_FUEL_GENEREATOR = new BlockGenerator(); - registerBlock(SOLID_FUEL_GENEREATOR, "techreborn.generator"); - GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR"); - Core.proxy.registerCustomBlockStateLocation(SOLID_FUEL_GENEREATOR, "machines/generators/generator"); + SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator(); + registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator"); + GameRegistry.registerTileEntity(TileSolidFuelGenerator.class, "TileSolidFuelGeneratorTR"); - EXTRACTOR = new BlockExtractor(Material.IRON); - registerBlock(EXTRACTOR, "techreborn.extractor"); + EXTRACTOR = new BlockExtractor(); + registerBlock(EXTRACTOR, "extractor"); GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR"); - Core.proxy.registerCustomBlockStateLocation(EXTRACTOR, "machines/tier1_machines/extractor"); - COMPRESSOR = new BlockCompressor(Material.IRON); - registerBlock(COMPRESSOR, "techreborn.compressor"); + COMPRESSOR = new BlockCompressor(); + registerBlock(COMPRESSOR, "compressor"); GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR"); - Core.proxy.registerCustomBlockStateLocation(COMPRESSOR, "machines/tier1_machines/compressor"); - ELECTRIC_FURNACE = new BlockElectricFurnace(Material.IRON); - registerBlock(ELECTRIC_FURNACE, "techreborn.electricfurnace"); + ELECTRIC_FURNACE = new BlockElectricFurnace(); + registerBlock(ELECTRIC_FURNACE, "electric_furnace"); GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR"); - Core.proxy.registerCustomBlockStateLocation(ELECTRIC_FURNACE, "machines/tier1_machines/electric_furnace"); SOLAR_PANEL = new BlockSolarPanel(); - registerBlock(SOLAR_PANEL, "techreborn.solarpanel"); - GameRegistry.registerTileEntity(TileSolarPanel.class, "TileSolarPanel"); - Core.proxy.registerCustomBlockStateLocation(SOLAR_PANEL, "machines/generators/solar_panel"); + registerBlock(SOLAR_PANEL, "solar_panel"); + GameRegistry.registerTileEntity(TileSolarPanel.class, "TileSolarPanelTR"); - CREATIVE_PANEL = new BlockCreativePanel(); - registerBlock(CREATIVE_PANEL, "techreborn.creativepanel"); - GameRegistry.registerTileEntity(TileCreativePanel.class, "TileCreativePanel"); - Core.proxy.registerCustomBlockStateLocation(CREATIVE_PANEL, "machines/generators/creative_panel"); + CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel(); + registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel"); + GameRegistry.registerTileEntity(TileCreativeSolarPanel.class, "TileCreativeSolarPanelTR"); WATER_MILL = new BlockWaterMill(); - registerBlock(WATER_MILL, "techreborn.watermill"); - GameRegistry.registerTileEntity(TileWaterMill.class, "TileWaterMill"); - Core.proxy.registerCustomBlockStateLocation(WATER_MILL, "machines/generators/water_mill"); + registerBlock(WATER_MILL, "water_mill"); + GameRegistry.registerTileEntity(TileWaterMill.class, "TileWaterMillTR"); WIND_MILL = new BlockWindMill(); - registerBlock(WIND_MILL, "techreborn.windmill"); - GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMill"); - Core.proxy.registerCustomBlockStateLocation(WIND_MILL, "machines/generators/wind_mill"); + registerBlock(WIND_MILL, "wind_mill"); + GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMillTR"); GameRegistry.registerTileEntity(TileMachineBase.class, "TileMachineBaseTR"); RUBBER_LOG = new BlockRubberLog(); - registerBlock(RUBBER_LOG, "rubberLog"); + registerBlock(RUBBER_LOG, "rubber_log"); RUBBER_PLANKS = new BlockRubberPlank(); - registerBlock(RUBBER_PLANKS, "rubberPlanks"); + registerBlock(RUBBER_PLANKS, "rubber_planks"); RUBBER_LEAVES = new BlockRubberLeaves(); - registerBlock(RUBBER_LEAVES, "rubberLeaves"); + registerBlock(RUBBER_LEAVES, "rubber_leaves"); RUBBER_SAPLING = new BlockRubberSapling(); - registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubberSapling"); - Core.proxy.registerCustomBlockStateLocation(RUBBER_SAPLING, "rubbersapling"); + registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling"); - REFINED_IRON_FENCE = new BlockIronFence(); - registerBlock(REFINED_IRON_FENCE, "ironFence"); + REFINED_IRON_FENCE = new BlockRefinedIronFence(); + registerBlock(REFINED_IRON_FENCE, "refined_iron_fence"); - REINFORCED_GLASS = new BlockReinforcedGlass(Material.GLASS); - registerBlock(REINFORCED_GLASS, "reinforcedglass"); + REINFORCED_GLASS = new BlockReinforcedGlass(); + registerBlock(REINFORCED_GLASS, "reinforced_glass"); - RECYCLER = new BlockRecycler(Material.IRON); + RECYCLER = new BlockRecycler(); registerBlock(RECYCLER, "recycler"); GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR"); - Core.proxy.registerCustomBlockStateLocation(RECYCLER, "machines/tier1_machines/recycler"); - BATTERY_BOX = new BlockBatBox(); - registerBlock(BATTERY_BOX, "batBox"); - GameRegistry.registerTileEntity(TileBatBox.class, "TileBatBox"); + LOW_VOLTAGE_SU = new BlockLowVoltageSU(); + registerBlock(LOW_VOLTAGE_SU, "low_voltage_su"); + GameRegistry.registerTileEntity(TileLowVoltageSU.class, "TileLowVoltageSUTR"); - MVSU = new BlockMFE(); - registerBlock(MVSU, "MFE"); - GameRegistry.registerTileEntity(TileMFE.class, "TileMFE"); + MEDIUM_VOLTAGE_SU = new BlockMediumVoltageSU(); + registerBlock(MEDIUM_VOLTAGE_SU, "medium_voltage_su"); + GameRegistry.registerTileEntity(TileMediumVoltageSU.class, "TileMediumVoltageSUTR"); - HVSU = new BlockMFSU(); - registerBlock(HVSU, "MFSU"); - GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU"); + HIGH_VOLTAGE_SU = new BlockHighVoltageSU(); + registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su"); + GameRegistry.registerTileEntity(TileHighVoltageSU.class, "TileHighVoltageSUTR"); LV_TRANSFORMER = new BlockLVTransformer(); - registerBlock(LV_TRANSFORMER, "LVT"); - GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformer"); + registerBlock(LV_TRANSFORMER, "lv_transformer"); + GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformerTR"); MV_TRANSFORMER = new BlockMVTransformer(); - registerBlock(MV_TRANSFORMER, "MVT"); - GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformer"); + registerBlock(MV_TRANSFORMER, "mv_transformer"); + GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformerTR"); HV_TRANSFORMER = new BlockHVTransformer(); - registerBlock(HV_TRANSFORMER, "HVT"); - GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer"); + registerBlock(HV_TRANSFORMER, "hv_transformer"); + GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformerTR"); IRON_FURNACE = new BlockIronFurnace(); - registerBlock(IRON_FURNACE, "ironfurnace"); + registerBlock(IRON_FURNACE, "iron_furnace"); GameRegistry.registerTileEntity(TileIronFurnace.class, "TileIronFurnaceTR"); - Core.proxy.registerCustomBlockStateLocation(IRON_FURNACE, "machines/tier0_machines/furnace"); NUKE = new BlockNuke(); registerBlock(NUKE, "nuke"); - SCRAPBOXINATOR = new BlockScrapboxinator(Material.IRON); + SCRAPBOXINATOR = new BlockScrapboxinator(); registerBlock(SCRAPBOXINATOR, "scrapboxinator"); GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR"); - Core.proxy.registerCustomBlockStateLocation(SCRAPBOXINATOR, "machines/tier1_machines/scrapboxinator"); //TODO enable when done // flare = new BlockFlare(); @@ -516,9 +480,9 @@ public class ModBlocks { OreDictionary.registerOre("fenceIron", REFINED_IRON_FENCE); - OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1)); - OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1)); - OreDictionary.registerOre("machineBlockHighlyAdvanced", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1)); + OreDictionary.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("basic", 1)); + OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advanced", 1)); + OreDictionary.registerOre("machineBlockHighlyAdvanced", BlockMachineFrames.getFrameByName("highly_advanced", 1)); } diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index c6ab26d8b..12d036c2d 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -35,7 +35,7 @@ import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.BucketHandler; import techreborn.Core; import techreborn.api.Reference; -import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockMachineFrames; import techreborn.config.ConfigTechReborn; import techreborn.items.*; import techreborn.items.armor.ItemLapotronPack; @@ -341,8 +341,8 @@ public class ModItems { Core.logHelper.info("TechReborns Items Loaded"); - BlockMachineBase.advancedMachineStack = BlockMachineFrame.getFrameByName("advancedMachine", 1); - BlockMachineBase.machineStack = BlockMachineFrame.getFrameByName("machine", 1); + BlockMachineBase.advancedFrameStack = BlockMachineFrames.getFrameByName("advanced", 1); + BlockMachineBase.basicFrameStack = BlockMachineFrames.getFrameByName("basic", 1); OreDictionary.registerOre("itemRubber", ItemParts.getPartByName("rubber")); } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index a59d2a7ec..50f750ee8 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -44,7 +44,7 @@ import techreborn.Core; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.machines.*; -import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockMachineFrames; import techreborn.blocks.BlockOre; import techreborn.compat.CompatManager; import techreborn.config.ConfigTechReborn; @@ -411,10 +411,10 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ALLOY_SMELTER), "XCX", "FMF", "XXX", 'C', "circuitBasic", 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig(), 'M', - BlockMachineFrame.getFrameByName("machine", 1)); + BlockMachineFrames.getFrameByName("machine", 1)); CraftingHelper - .addShapedOreRecipe(new ItemStack(ModBlocks.LSU_STORAGE_BLOCK), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', + .addShapedOreRecipe(new ItemStack(ModBlocks.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic"); RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hot_tungstensteel"), @@ -746,7 +746,7 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'A', - BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'O', ModItems.LAPOTRONIC_ORB); + BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1), 'O', ModItems.LAPOTRONIC_ORB); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.HEAT_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', @@ -765,11 +765,11 @@ public class ModRecipes { getOre("glassReinforced")); CraftingHelper - .addShapedOreRecipe(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", + .addShapedOreRecipe(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', ModBlocks.REINFORCED_GLASS, 'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig()); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR), "AAA", "AHA", "CGC", 'A', + CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR), "AAA", "AHA", "CGC", 'A', "plateAluminum", 'H', ModBlocks.REINFORCED_GLASS, 'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig()); @@ -805,7 +805,7 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B', - BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig()); + BlockMachineFrames.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig()); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', ModBlocks.INDUSTRIAL_ELECTROLYZER, 'H', "craftingGrinder", 'C', @@ -814,7 +814,7 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B', - BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig()); + BlockMachineFrames.getFrameByName("advancedMachine", 1), 'P', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig()); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', @@ -865,10 +865,10 @@ public class ModRecipes { // 'M', new ItemStack(ModItems.parts, 1, 39)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', IC2Duplicates.LVT.getStackBasedOnConfig(), 'C', - "circuitAdvanced", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'B', ModBlocks.LSU_STORAGE_BLOCK); + "circuitAdvanced", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'B', ModBlocks.LSU_STORAGE); CraftingHelper - .addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC", + .addShapedOreRecipe(BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC", 'C', "ingotChrome", 'T', "ingotTitanium", 'B', "machineBlockAdvanced"); @@ -880,12 +880,12 @@ public class ModRecipes { "plateSteel", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced"); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MACHINE_CASINGS, 4, 2), "HHH", "CBC", "HHH", 'H', - "ingotChrome", 'C', "circuitElite", 'B', BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1)); + "ingotChrome", 'C', "circuitElite", 'B', BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1)); if (!CompatManager.isQuantumStorageLoaded) { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"), 'A', - BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.DIGITAL_CHEST, 'T', + BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.DIGITAL_CHEST, 'T', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig()); } diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index 544b3c75c..642eb7004 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -32,7 +32,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.oredict.OreDictionary; import techreborn.Core; -import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockMachineFrames; import techreborn.blocks.cable.BlockCable; import techreborn.items.*; @@ -59,9 +59,9 @@ public class OreDict { OreDictionary.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit")); OreDictionary.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit")); - OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1)); - OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1)); - OreDictionary.registerOre("machineBlockElite", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1)); + OreDictionary.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("machine", 1)); + OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advancedMachine", 1)); + OreDictionary.registerOre("machineBlockElite", BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1)); OreDictionary.registerOre("lapotronCrystal", ModItems.LAPOTRONIC_CRYSTAL); OreDictionary.registerOre("energyCrystal", ModItems.ENERGY_CRYSTAL); diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index fffc15be0..4315c9ffc 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -31,7 +31,7 @@ import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.OreUtil; import reborncore.common.util.StringUtils; import techreborn.blocks.BlockMachineCasing; -import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockMachineFrames; import techreborn.blocks.cable.BlockCable; import techreborn.init.IC2Duplicates; import techreborn.items.*; @@ -60,7 +60,7 @@ public abstract class RecipeMethods { } else if (type == Type.CABLE) { return BlockCable.getCableByName(name, count); } else if (type == Type.MACHINE_FRAME) { - return BlockMachineFrame.getFrameByName(name, count); + return BlockMachineFrames.getFrameByName(name, count); } else if (type == Type.MACHINE_CASING) { return BlockMachineCasing.getStackByName(name, count); } else if (type == Type.UPGRADE) { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java b/src/main/java/techreborn/itemblocks/ItemBlockAdjustableSU.java similarity index 95% rename from src/main/java/techreborn/itemblocks/ItemBlockAesu.java rename to src/main/java/techreborn/itemblocks/ItemBlockAdjustableSU.java index a27264bd0..4306f573f 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockAdjustableSU.java @@ -40,13 +40,13 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.powerSystem.PowerSystem; import techreborn.init.ModBlocks; -import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAdjustableSU; import java.util.List; -public class ItemBlockAesu extends ItemBlock { +public class ItemBlockAdjustableSU extends ItemBlock { - public ItemBlockAesu(Block p_i45328_1_) { + public ItemBlockAdjustableSU(Block p_i45328_1_) { super(p_i45328_1_); } @@ -73,7 +73,7 @@ public class ItemBlockAesu extends ItemBlock { // y, z, metadata); } if (stack != ItemStack.EMPTY && stack.hasTagCompound()) { - ((TileAesu) world.getTileEntity(pos)) + ((TileAdjustableSU) world.getTileEntity(pos)) .readFromNBTWithoutCoords(stack.getTagCompound().getCompoundTag("tileEntity")); } return true; diff --git a/src/main/java/techreborn/itemblocks/ItemBlockMachineFrame.java b/src/main/java/techreborn/itemblocks/ItemBlockMachineFrames.java similarity index 89% rename from src/main/java/techreborn/itemblocks/ItemBlockMachineFrame.java rename to src/main/java/techreborn/itemblocks/ItemBlockMachineFrames.java index 628774285..06557e06a 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockMachineFrame.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockMachineFrames.java @@ -26,13 +26,13 @@ package techreborn.itemblocks; import net.minecraft.block.Block; import reborncore.common.itemblock.ItemBlockBase; -import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockMachineFrames; import techreborn.init.ModBlocks; -public class ItemBlockMachineFrame extends ItemBlockBase { +public class ItemBlockMachineFrames extends ItemBlockBase { - public ItemBlockMachineFrame(Block block) { - super(ModBlocks.MACHINE_FRAMES, ModBlocks.MACHINE_FRAMES, BlockMachineFrame.types); + public ItemBlockMachineFrames(Block block) { + super(ModBlocks.MACHINE_FRAMES, ModBlocks.MACHINE_FRAMES, BlockMachineFrames.types); } } diff --git a/src/main/java/techreborn/packets/PacketAesu.java b/src/main/java/techreborn/packets/PacketAesu.java index 5bfe16b99..0060d8262 100644 --- a/src/main/java/techreborn/packets/PacketAesu.java +++ b/src/main/java/techreborn/packets/PacketAesu.java @@ -28,7 +28,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; -import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAdjustableSU; import java.io.IOException; @@ -40,7 +40,7 @@ public class PacketAesu implements INetworkPacket { public PacketAesu() { } - public PacketAesu(int buttonID, TileAesu tile) { + public PacketAesu(int buttonID, TileAdjustableSU tile) { this.pos = tile.getPos(); this.buttonID = buttonID; } diff --git a/src/main/java/techreborn/packets/PacketIdsu.java b/src/main/java/techreborn/packets/PacketIdsu.java index 892cbfbe7..a2aee92df 100644 --- a/src/main/java/techreborn/packets/PacketIdsu.java +++ b/src/main/java/techreborn/packets/PacketIdsu.java @@ -28,7 +28,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; -import techreborn.tiles.idsu.TileIDSU; +import techreborn.tiles.idsu.TileInterdimensionalSU; import java.io.IOException; @@ -40,7 +40,7 @@ public class PacketIdsu implements INetworkPacket { public PacketIdsu() { } - public PacketIdsu(int buttonID, TileIDSU tile) { + public PacketIdsu(int buttonID, TileInterdimensionalSU tile) { this.pos = tile.getPos(); this.buttonID = buttonID; } diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 18223ae54..c84de471a 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -51,7 +51,7 @@ import reborncore.client.hud.StackInfoHUD; import reborncore.client.multiblock.MultiblockRenderEvent; import techreborn.Core; import techreborn.blocks.BlockMachineCasing; -import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockMachineFrames; import techreborn.blocks.BlockRubberLeaves; import techreborn.client.ClientMultiBlocks; import techreborn.client.IconSupplier; @@ -100,31 +100,6 @@ public class ClientProxy extends CommonProxy { StackInfoHUD.registerElement(new ItemFrequencyTransmitter.StackInfoFreqTransmitter()); RenderingRegistry.registerEntityRenderingHandler(EntityNukePrimed.class, new RenderManagerNuke()); - ManualLoader loader = new ManualLoader(new File(event.getModConfigurationDirectory(), "techreborn")); - - // new Thread(() ->` - // { - // try { - // loader.load(); - // } catch (IOException e) { - // e.printStackTrace(); - // } - // }).start(); - - // for (Object object : RebornCore.jsonDestroyer.objectsToDestroy) { - // if (object instanceof BlockMachineBase) { - // BlockMachineBase base = (BlockMachineBase) object; - // registerItemModel(Item.getItemFromBlock(base)); - // } - // } - - for (int i = 0; i < BlockMachineCasing.types.length; i++) { - Core.proxy.registerSubBlockInventoryLocation(ModBlocks.MACHINE_CASINGS, i, "techreborn:machines/structure/machine_casing", "type=" + i); - } - for (int i = 0; i < BlockMachineFrame.types.length; i++) { - Core.proxy.registerSubBlockInventoryLocation(ModBlocks.MACHINE_FRAMES, i, "techreborn:machines/storage/machine_blocks", "type=" + i); - } - ModelDynamicCell.init(); RegisterItemJsons.registerModels(); } diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAdjustableSU.java similarity index 96% rename from src/main/java/techreborn/tiles/TileAesu.java rename to src/main/java/techreborn/tiles/TileAdjustableSU.java index 71e156ed2..b47911f92 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAdjustableSU.java @@ -37,7 +37,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileAesu extends TilePowerAcceptor implements IWrenchable { +public class TileAdjustableSU extends TilePowerAcceptor implements IWrenchable { @ConfigRegistry(config = "machines", category = "aesu", key = "AesuMaxInput", comment = "AESU Max Input (Value in EU)") public static int maxInput = 8192; @@ -46,13 +46,13 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { @ConfigRegistry(config = "machines", category = "aesu", key = "AesuMaxEnergy", comment = "AESU Max Energy (Value in EU)") public static int maxEnergy = 100000000; - public Inventory inventory = new Inventory(4, "TileAesu", 64, this); + public Inventory inventory = new Inventory(4, "TileAdjustableSU", 64, this); private int OUTPUT = 64; // The current output private double euLastTick = 0; private double euChange; private int ticks; - public TileAesu() { + public TileAdjustableSU() { super(); } diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java similarity index 97% rename from src/main/java/techreborn/tiles/TileAlloyFurnace.java rename to src/main/java/techreborn/tiles/TileIronAlloyFurnace.java index 259603e28..5b5b77dd9 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java @@ -50,14 +50,14 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileAlloyFurnace extends TileLegacyMachineBase +public class TileIronAlloyFurnace extends TileLegacyMachineBase implements IWrenchable, IInventoryProvider, IContainerProvider { // @ConfigRegistry(config = "machines", category = "alloy_furnace", key = "AlloyFurnaceWrenchDropRate", comment = "Alloy Furnace Wrench Drop Rate") public static float wrenchDropRate = 1.0F; public int tickTime; - public Inventory inventory = new Inventory(4, "TileAlloyFurnace", 64, this); + public Inventory inventory = new Inventory(4, "TileIronAlloyFurnace", 64, this); public int burnTime; public int currentItemBurnTime; public int cookTime; @@ -66,7 +66,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase int output = 2; int fuel = 3; - public TileAlloyFurnace() { + public TileIronAlloyFurnace() { } @@ -127,7 +127,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase if (!this.world.isRemote) { if (this.burnTime != 0 || this.getStackInSlot(this.input1) != ItemStack.EMPTY && this.getStackInSlot(this.fuel) != ItemStack.EMPTY) { if (this.burnTime == 0 && this.canSmelt()) { - this.currentItemBurnTime = this.burnTime = TileAlloyFurnace.getItemBurnTime(this.getStackInSlot(this.fuel)); + this.currentItemBurnTime = this.burnTime = TileIronAlloyFurnace.getItemBurnTime(this.getStackInSlot(this.fuel)); if (this.burnTime > 0) { flag1 = true; if (this.getStackInSlot(this.fuel) != ItemStack.EMPTY) { diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java similarity index 98% rename from src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java rename to src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index 79788efb7..14599d945 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -45,7 +45,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileEntityFusionController extends TilePowerAcceptor implements IInventoryProvider, IContainerProvider { +public class TileFusionControlComputer extends TilePowerAcceptor implements IInventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorMaxInput", comment = "Fusion Reactor Max Input (Value in EU)") public static int maxInput = 8192; @@ -56,7 +56,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn // @ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorWrenchDropRate", comment = "Fusion Reactor Wrench Drop Rate") public static float wrenchDropRate = 1.0F; - public Inventory inventory = new Inventory(3, "TileEntityFusionController", 64, this); + public Inventory inventory = new Inventory(3, "TileFusionControlComputer", 64, this); // 0= no coils, 1 = coils public int coilStatus = 0; @@ -69,7 +69,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn FusionReactorRecipe currentRecipe = null; boolean hasStartedCrafting = false; - public TileEntityFusionController() { + public TileFusionControlComputer() { super(); } diff --git a/src/main/java/techreborn/tiles/generator/TileCreativePanel.java b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java similarity index 97% rename from src/main/java/techreborn/tiles/generator/TileCreativePanel.java rename to src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java index 025decba9..13f971b7f 100644 --- a/src/main/java/techreborn/tiles/generator/TileCreativePanel.java +++ b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java @@ -38,7 +38,7 @@ import java.util.List; /** * Created by modmuss50 on 25/02/2016. */ -public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable { +public class TileCreativeSolarPanel extends TilePowerAcceptor implements IWrenchable { boolean shouldMakePower = false; boolean lastTickSate = false; diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java similarity index 94% rename from src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java rename to src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java index 696610425..20a77f911 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java @@ -40,7 +40,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventoryProvider { +public class TileDragonEggSyphon extends TilePowerAcceptor implements IWrenchable, IInventoryProvider { @ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerMaxOutput", comment = "Dragon Egg Siphoner Max Output (Value in EU)") public static int maxOutput = 128; @@ -49,10 +49,10 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha @ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerEnergyPerTick", comment = "Dragon Egg Siphoner Energy Per Tick (Value in EU)") public static int energyPerTick = 4; - public Inventory inventory = new Inventory(3, "TileDragonEggSiphoner", 64, this); + public Inventory inventory = new Inventory(3, "TileDragonEggSyphon", 64, this); private long lastOutput = 0; - public TileDragonEggSiphoner() { + public TileDragonEggSyphon() { super(); } @@ -109,7 +109,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.DRAGON_EGG_SIPHONER, 1); + return new ItemStack(ModBlocks.DRAGON_EGG_SYPHON, 1); } public boolean isComplete() { diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java similarity index 93% rename from src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java rename to src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java index 6fde5481e..c0bbee763 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java @@ -36,7 +36,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IContainerProvider { +public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IContainerProvider { @ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorMaxOutput", comment = "Semifluid Generator Max Output (Value in EU)") public static int maxOutput = 128; @@ -47,13 +47,13 @@ public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IC @ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorEnergyPerTick", comment = "Semifluid Generator Energy Per Tick (Value in EU)") public static int energyPerTick = 8; - public TileSemifluidGenerator() { - super(EFluidGenerator.SEMIFLUID, "TileSemifluidGenerator", tankCapacity, energyPerTick); + public TileSemiFluidGenerator() { + super(EFluidGenerator.SEMIFLUID, "TileSemiFluidGenerator", tankCapacity, energyPerTick); } @Override public ItemStack getWrenchDrop(final EntityPlayer arg0) { - return new ItemStack(ModBlocks.SEMIFLUID_GENERATOR, 1); + return new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR, 1); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java similarity index 93% rename from src/main/java/techreborn/tiles/generator/TileGenerator.java rename to src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java index b54410455..6bcf75c27 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java @@ -45,7 +45,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider { +public class TileSolidFuelGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "generator", key = "GeneratorMaxOutput", comment = "Solid Fuel Generator Max Output (Value in EU)") public static int maxOutput = 32; @@ -54,7 +54,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @ConfigRegistry(config = "machines", category = "generator", key = "GeneratorEnergyOutput", comment = "Solid Fuel Generator Energy Output Amount (Value in EU)") public static int outputAmount = 10; - public Inventory inventory = new Inventory(2, "TileGenerator", 64, this); + public Inventory inventory = new Inventory(2, "TileSolidFuelGenerator", 64, this); public int fuelSlot = 0; public int burnTime; public int totalBurnTime = 0; @@ -64,7 +64,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn public boolean lastTickBurning; ItemStack burnItem; - public TileGenerator() { + public TileSolidFuelGenerator() { super(); } @@ -81,7 +81,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn if (this.getEnergy() < this.getMaxPower()) { if (this.burnTime > 0) { this.burnTime--; - this.addEnergy(TileGenerator.outputAmount); + this.addEnergy(TileSolidFuelGenerator.outputAmount); this.isBurning = true; } } else { @@ -90,7 +90,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn if (this.burnTime == 0) { this.updateState(); - this.burnTime = this.totalBurnTime = TileGenerator.getItemBurnTime(this.getStackInSlot(this.fuelSlot)); + this.burnTime = this.totalBurnTime = TileSolidFuelGenerator.getItemBurnTime(this.getStackInSlot(this.fuelSlot)); if (this.burnTime > 0) { this.updateState(); this.burnItem = this.getStackInSlot(this.fuelSlot); @@ -204,7 +204,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @Override public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) { - return TileGenerator.getItemBurnTime(itemStackIn) != 0; + return TileSolidFuelGenerator.getItemBurnTime(itemStackIn) != 0; } @Override diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java similarity index 96% rename from src/main/java/techreborn/tiles/idsu/TileIDSU.java rename to src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java index 39f719418..214199f89 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java @@ -38,7 +38,7 @@ import techreborn.lib.ModInfo; import techreborn.tiles.storage.TileEnergyStorage; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileIDSU extends TileEnergyStorage implements IContainerProvider { +public class TileInterdimensionalSU extends TileEnergyStorage implements IContainerProvider { @ConfigRegistry(config = "machines", category = "idsu", key = "IdsuMaxInput", comment = "IDSU Max Input (Value in EU)") public static int maxInput = 8192; @@ -49,7 +49,7 @@ public class TileIDSU extends TileEnergyStorage implements IContainerProvider { public String ownerUdid; - public TileIDSU() { + public TileInterdimensionalSU() { super("IDSU", 2, ModBlocks.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy); } diff --git a/src/main/java/techreborn/tiles/lesu/LesuNetwork.java b/src/main/java/techreborn/tiles/lesu/LesuNetwork.java index 158bc9f4b..9f6120d78 100644 --- a/src/main/java/techreborn/tiles/lesu/LesuNetwork.java +++ b/src/main/java/techreborn/tiles/lesu/LesuNetwork.java @@ -28,24 +28,24 @@ import java.util.ArrayList; public class LesuNetwork { - public ArrayList storages = new ArrayList<>(); + public ArrayList storages = new ArrayList<>(); - public TileLesu master; + public TileLapotronicSU master; - public void addElement(TileLesuStorage lesuStorage) { + public void addElement(TileLSUStorage lesuStorage) { if (!storages.contains(lesuStorage) && storages.size() < 5000) { storages.add(lesuStorage); } } - public void removeElement(TileLesuStorage lesuStorage) { + public void removeElement(TileLSUStorage lesuStorage) { storages.remove(lesuStorage); rebuild(); } private void rebuild() { master = null; - for (TileLesuStorage lesuStorage : storages) { + for (TileLSUStorage lesuStorage : storages) { lesuStorage.findAndJoinNetwork(lesuStorage.getWorld(), lesuStorage.getPos().getX(), lesuStorage.getPos().getY(), lesuStorage.getPos().getZ()); } @@ -53,10 +53,10 @@ public class LesuNetwork { public void merge(LesuNetwork network) { if (network != this) { - ArrayList tileLesuStorages = new ArrayList<>(); + ArrayList tileLesuStorages = new ArrayList<>(); tileLesuStorages.addAll(network.storages); network.clear(false); - for (TileLesuStorage lesuStorage : tileLesuStorages) { + for (TileLSUStorage lesuStorage : tileLesuStorages) { lesuStorage.setNetwork(this); } if (network.master != null && this.master == null) { @@ -67,7 +67,7 @@ public class LesuNetwork { private void clear(boolean clearTiles) { if (clearTiles) { - for (TileLesuStorage tileLesuStorage : storages) { + for (TileLSUStorage tileLesuStorage : storages) { tileLesuStorage.resetNetwork(); } } diff --git a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java b/src/main/java/techreborn/tiles/lesu/TileLSUStorage.java similarity index 94% rename from src/main/java/techreborn/tiles/lesu/TileLesuStorage.java rename to src/main/java/techreborn/tiles/lesu/TileLSUStorage.java index 9d414b4a9..ca15c3345 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java +++ b/src/main/java/techreborn/tiles/lesu/TileLSUStorage.java @@ -29,7 +29,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.common.tile.TileLegacyMachineBase; -public class TileLesuStorage extends TileLegacyMachineBase { +public class TileLSUStorage extends TileLegacyMachineBase { public LesuNetwork network; @@ -52,8 +52,8 @@ public class TileLesuStorage extends TileLegacyMachineBase { network.addElement(this); for (EnumFacing direction : EnumFacing.values()) { if (world.getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(), - z + direction.getFrontOffsetZ())) instanceof TileLesuStorage) { - TileLesuStorage lesu = (TileLesuStorage) world + z + direction.getFrontOffsetZ())) instanceof TileLSUStorage) { + TileLSUStorage lesu = (TileLSUStorage) world .getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(), z + direction.getFrontOffsetZ())); if (lesu.network != null) { diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLapotronicSU.java similarity index 89% rename from src/main/java/techreborn/tiles/lesu/TileLesu.java rename to src/main/java/techreborn/tiles/lesu/TileLapotronicSU.java index 8f64a6c4f..251590fa9 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLapotronicSU.java @@ -31,13 +31,13 @@ import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; -import techreborn.blocks.storage.BlockLESU; +import techreborn.blocks.storage.BlockLapotronicSU; import techreborn.lib.ModInfo; import java.util.ArrayList; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileLesu extends TilePowerAcceptor {// TODO wrench +public class TileLapotronicSU extends TilePowerAcceptor {// TODO wrench @ConfigRegistry(config = "machines", category = "lesu", key = "LesuMaxInput", comment = "LESU Max Input (Value in EU)") public static int maxInput = 8192; @@ -49,7 +49,7 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench public static int extraIOPerBlock = 8; public int connectedBlocks = 0; - public Inventory inventory = new Inventory(2, "TileAesu", 64, this); + public Inventory inventory = new Inventory(2, "TileAdjustableSU", 64, this); private ArrayList countedNetworks = new ArrayList<>(); private double euLastTick = 0; private double euChange; @@ -57,7 +57,7 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench private int output; private int maxStorage; - public TileLesu() { + public TileLapotronicSU() { super(); } @@ -72,11 +72,11 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench for (EnumFacing dir : EnumFacing.values()) { if (world.getTileEntity( new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), - getPos().getZ() + dir.getFrontOffsetZ())) instanceof TileLesuStorage) { - if (((TileLesuStorage) world.getTileEntity( + getPos().getZ() + dir.getFrontOffsetZ())) instanceof TileLSUStorage) { + if (((TileLSUStorage) world.getTileEntity( new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ()))).network != null) { - LesuNetwork network = ((TileLesuStorage) world.getTileEntity(new BlockPos( + LesuNetwork network = ((TileLSUStorage) world.getTileEntity(new BlockPos( getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ()))).network; if (!countedNetworks.contains(network)) { @@ -145,8 +145,8 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench @Override public EnumFacing getFacingEnum() { Block block = world.getBlockState(pos).getBlock(); - if (block instanceof BlockLESU) { - return ((BlockLESU) block).getFacing(world.getBlockState(pos)); + if (block instanceof BlockLapotronicSU) { + return ((BlockLapotronicSU) block).getFacing(world.getBlockState(pos)); } return null; } diff --git a/src/main/java/techreborn/tiles/multiblock/MultiblockChecker.java b/src/main/java/techreborn/tiles/multiblock/MultiblockChecker.java index 2ce25485b..74511a4cb 100644 --- a/src/main/java/techreborn/tiles/multiblock/MultiblockChecker.java +++ b/src/main/java/techreborn/tiles/multiblock/MultiblockChecker.java @@ -34,9 +34,9 @@ public class MultiblockChecker { public static final BlockPos ZERO_OFFSET = BlockPos.ORIGIN; - public static final int CASING_NORMAL = 0; - public static final int CASING_REINFORCED = 1; - public static final int CASING_ADVANCED = 2; + public static final String STANDARD_CASING = "standard"; + public static final String REINFORCED_CASING = "reinforced"; + public static final String ADVANCED_CASING = "advanced"; private final World world; private final BlockPos downCenter; @@ -46,10 +46,10 @@ public class MultiblockChecker { this.downCenter = downCenter; } - public boolean checkCasing(int offX, int offY, int offZ, int type) { + public boolean checkCasing(int offX, int offY, int offZ, String type) { IBlockState block = getBlock(offX, offY, offZ); if (block.getBlock() == ModBlocks.MACHINE_CASINGS) { - if (block.getValue(BlockMachineCasing.METADATA) == type) + if (block.getValue(BlockMachineCasing.TYPE).equals(type)) return true; } return false; @@ -65,7 +65,7 @@ public class MultiblockChecker { return world.getBlockState(pos); } - public boolean checkRectY(int sizeX, int sizeZ, int casingType, BlockPos offset) { + public boolean checkRectY(int sizeX, int sizeZ, String casingType, BlockPos offset) { for (int x = -sizeX; x <= sizeX; x++) { for (int z = -sizeZ; z <= sizeZ; z++) { if (!checkCasing(x + offset.getX(), offset.getY(), z + offset.getZ(), casingType)) @@ -75,7 +75,7 @@ public class MultiblockChecker { return true; } - public boolean checkRectZ(int sizeX, int sizeY, int casingType, BlockPos offset) { + public boolean checkRectZ(int sizeX, int sizeY, String casingType, BlockPos offset) { for (int x = -sizeX; x <= sizeX; x++) { for (int y = -sizeY; y <= sizeY; y++) { if (!checkCasing(x + offset.getX(), y + offset.getY(), offset.getZ(), casingType)) @@ -85,7 +85,7 @@ public class MultiblockChecker { return true; } - public boolean checkRectX(int sizeZ, int sizeY, int casingType, BlockPos offset) { + public boolean checkRectX(int sizeZ, int sizeY, String casingType, BlockPos offset) { for (int z = -sizeZ; z <= sizeZ; z++) { for (int y = -sizeY; y <= sizeY; y++) { if (!checkCasing(offset.getX(), y + offset.getY(), z + offset.getZ(), casingType)) @@ -95,7 +95,7 @@ public class MultiblockChecker { return true; } - public boolean checkRingY(int sizeX, int sizeZ, int casingType, BlockPos offset) { + public boolean checkRingY(int sizeX, int sizeZ, String casingType, BlockPos offset) { for (int x = -sizeX; x <= sizeX; x++) { for (int z = -sizeZ; z <= sizeZ; z++) { if ((x == sizeX || x == -sizeX) || (z == sizeZ || z == -sizeZ)) { @@ -107,7 +107,7 @@ public class MultiblockChecker { return true; } - public boolean checkRingYHollow(int sizeX, int sizeZ, int casingType, BlockPos offset) { + public boolean checkRingYHollow(int sizeX, int sizeZ, String casingType, BlockPos offset) { for (int x = -sizeX; x <= sizeX; x++) { for (int z = -sizeZ; z <= sizeZ; z++) { if ((x == sizeX || x == -sizeX) || (z == sizeZ || z == -sizeZ)) { diff --git a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java index 47682cec5..717c0844e 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java @@ -87,9 +87,9 @@ public class TileImplosionCompressor extends TilePowerAcceptor } public boolean getMutliBlock() { - final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_REINFORCED, MultiblockChecker.ZERO_OFFSET); - final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_REINFORCED, new BlockPos(0, 2, 0)); - final boolean chamber = this.multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.CASING_REINFORCED, new BlockPos(0, 1, 0)); + final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET); + final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 2, 0)); + final boolean chamber = this.multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); return down && chamber && up; } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 2a7ef15c7..54090183a 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -105,11 +105,11 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha if (multiblockChecker == null) { return false; } - final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL, + final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, MultiblockChecker.ZERO_OFFSET); - final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL, + final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, new BlockPos(0, 2, 0)); - final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.CASING_REINFORCED, + final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); final IBlockState centerBlock = this.multiblockChecker.getBlock(0, 1, 0); final boolean center = centerBlock.getBlock() == Blocks.WATER; diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index a4aad05c9..0e88151a5 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -121,11 +121,11 @@ public class TileIndustrialSawmill extends TilePowerAcceptor } public boolean getMutliBlock() { - final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL, + final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, MultiblockChecker.ZERO_OFFSET); - final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL, + final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, new BlockPos(0, 2, 0)); - final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.CASING_REINFORCED, + final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); final IBlockState centerBlock = this.multiblockChecker.getBlock(0, 1, 0); final boolean center = centerBlock.getBlock() == Blocks.WATER; diff --git a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java index f8fa71ecf..a6fa3abb2 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java @@ -68,7 +68,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor } public boolean getMultiBlock() { - return this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_REINFORCED, MultiblockChecker.ZERO_OFFSET); + return this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET); } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileMFSU.java b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java similarity index 89% rename from src/main/java/techreborn/tiles/storage/TileMFSU.java rename to src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java index 044727268..d23bf0762 100644 --- a/src/main/java/techreborn/tiles/storage/TileMFSU.java +++ b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java @@ -34,10 +34,10 @@ import techreborn.init.ModBlocks; /** * Created by modmuss50 on 14/03/2016. */ -public class TileMFSU extends TileEnergyStorage implements IContainerProvider { +public class TileHighVoltageSU extends TileEnergyStorage implements IContainerProvider { - public TileMFSU() { - super("MFSU", 2, ModBlocks.HVSU, EnumPowerTier.HIGH, 2048, 2048, 1000000); + public TileHighVoltageSU() { + super("HIGH_VOLTAGE_SU", 2, ModBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 2048, 2048, 1000000); } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileBatBox.java b/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java similarity index 90% rename from src/main/java/techreborn/tiles/storage/TileBatBox.java rename to src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java index 8752d8522..eeddfdf2a 100644 --- a/src/main/java/techreborn/tiles/storage/TileBatBox.java +++ b/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java @@ -34,10 +34,10 @@ import techreborn.init.ModBlocks; /** * Created by modmuss50 on 14/03/2016. */ -public class TileBatBox extends TileEnergyStorage implements IContainerProvider { +public class TileLowVoltageSU extends TileEnergyStorage implements IContainerProvider { - public TileBatBox() { - super("BatBox", 2, ModBlocks.BATTERY_BOX, EnumPowerTier.LOW, 32, 32, 40000); + public TileLowVoltageSU() { + super("BatBox", 2, ModBlocks.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000); } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileMFE.java b/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java similarity index 89% rename from src/main/java/techreborn/tiles/storage/TileMFE.java rename to src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java index 63a8aec3a..aad4dffe1 100644 --- a/src/main/java/techreborn/tiles/storage/TileMFE.java +++ b/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java @@ -34,10 +34,10 @@ import techreborn.init.ModBlocks; /** * Created by modmuss50 on 14/03/2016. */ -public class TileMFE extends TileEnergyStorage implements IContainerProvider { +public class TileMediumVoltageSU extends TileEnergyStorage implements IContainerProvider { - public TileMFE() { - super("MFE", 2, ModBlocks.MVSU, EnumPowerTier.MEDIUM, 512, 512, 600000); + public TileMediumVoltageSU() { + super("MEDIUM_VOLTAGE_SU", 2, ModBlocks.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 512, 512, 600000); } @Override diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_multi_storage_ctm.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/ctm/lapotronic_su.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/energy/ev_multi_storage_ctm.json rename to src/main/resources/assets/techreborn/blockstates/machines/energy/ctm/lapotronic_su.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/hv_storage.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/energy/hv_storage.json rename to src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_storage_transmitter.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/interdimensional_su.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/energy/ev_storage_transmitter.json rename to src/main/resources/assets/techreborn/blockstates/machines/energy/interdimensional_su.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_multi_storage.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/lapotronic_su.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/energy/ev_multi_storage.json rename to src/main/resources/assets/techreborn/blockstates/machines/energy/lapotronic_su.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/lv_storage.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json similarity index 99% rename from src/main/resources/assets/techreborn/blockstates/machines/energy/lv_storage.json rename to src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json index a7496204b..4e2254291 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/lv_storage.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json @@ -9,4 +9,4 @@ "south": "techreborn:blocks/machines/energy/lv_storage_side", "west": "techreborn:blocks/machines/energy/lv_storage_side" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/mv_storage.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/energy/mv_storage.json rename to src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/creative_panel.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/creative_solar_panel.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/generators/creative_panel.json rename to src/main/resources/assets/techreborn/blockstates/machines/generators/creative_solar_panel.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_reactor.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_control_computer.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_reactor.json rename to src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_control_computer.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/generator.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/solid_fuel_generator.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/generators/generator.json rename to src/main/resources/assets/techreborn/blockstates/machines/generators/solid_fuel_generator.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/structure/machine_casing.json b/src/main/resources/assets/techreborn/blockstates/machines/structure/machine_casing.json index 12818b91a..b51af62cc 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/structure/machine_casing.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/structure/machine_casing.json @@ -10,17 +10,17 @@ {} ], "type": { - "0": { + "standard": { "textures": { "all": "techreborn:blocks/machines/structure/tier1_casing" } }, - "1": { + "reinforced": { "textures": { "all": "techreborn:blocks/machines/structure/tier2_casing" } }, - "2": { + "advanced": { "textures": { "all": "techreborn:blocks/machines/structure/tier3_casing" } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/storage/machine_blocks.json b/src/main/resources/assets/techreborn/blockstates/machines/structure/machine_frame.json similarity index 89% rename from src/main/resources/assets/techreborn/blockstates/machines/storage/machine_blocks.json rename to src/main/resources/assets/techreborn/blockstates/machines/structure/machine_frame.json index 010ccc38d..40f8a989e 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/storage/machine_blocks.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/structure/machine_frame.json @@ -10,17 +10,17 @@ {} ], "type": { - "0": { + "basic": { "textures": { "all": "techreborn:blocks/machines/structure/tier1_machine_block" } }, - "1": { + "advanced": { "textures": { "all": "techreborn:blocks/machines/structure/tier2_machine_block" } }, - "2": { + "highly_advanced": { "textures": { "all": "techreborn:blocks/machines/structure/tier3_machine_block" } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/alloy_furnace.json b/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_alloy_furnace.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/alloy_furnace.json rename to src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_alloy_furnace.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/electric_alloy_smelter.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/alloy_smelter.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/electric_alloy_smelter.json rename to src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/alloy_smelter.json diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/player_detector.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/player_detector.json index d4b3af61c..dc09bf425 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/player_detector.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/player_detector.json @@ -12,17 +12,17 @@ "type": { "all": { "textures": { - "all": "techreborn:blocks/tier1_machines/player_detector_all" + "all": "techreborn:blocks/machines/tier1_machines/player_detector_all" } }, "others": { "textures": { - "all": "techreborn:blocks/tier1_machines/player_detector_others" + "all": "techreborn:blocks/machines/tier1_machines/player_detector_others" } }, "you": { "textures": { - "all": "techreborn:blocks/tier1_machines/player_detector_you" + "all": "techreborn:blocks/machines/tier1_machines/player_detector_you" } } } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_saw_mill.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_saw_mill.json rename to src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json diff --git a/src/main/resources/assets/techreborn/blockstates/techreborn.ore.json b/src/main/resources/assets/techreborn/blockstates/ores.json similarity index 89% rename from src/main/resources/assets/techreborn/blockstates/techreborn.ore.json rename to src/main/resources/assets/techreborn/blockstates/ores.json index 2a585bbcf..ca3c59417 100644 --- a/src/main/resources/assets/techreborn/blockstates/techreborn.ore.json +++ b/src/main/resources/assets/techreborn/blockstates/ores.json @@ -79,6 +79,16 @@ "textures": { "all": "techreborn:blocks/ore/silver_ore" } + }, + "copper": { + "textures": { + "all": "techreborn:blocks/ore/copper_ore" + } + }, + "tin": { + "textures": { + "all": "techreborn:blocks/ore/tin_ore" + } } } } diff --git a/src/main/resources/assets/techreborn/blockstates/player_detector.json b/src/main/resources/assets/techreborn/blockstates/player_detector.json deleted file mode 100644 index 960f319ea..000000000 --- a/src/main/resources/assets/techreborn/blockstates/player_detector.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "cube_all", - "textures": { - "particle": "#cable" - } - }, - "variants": { - "type": { - "all": { - "textures": { - } - }, - "others": { - "textures": { - } - }, - "you": { - "textures": { - } - } - } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/ironfence.json b/src/main/resources/assets/techreborn/blockstates/refined_iron_fence.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/ironfence.json rename to src/main/resources/assets/techreborn/blockstates/refined_iron_fence.json diff --git a/src/main/resources/assets/techreborn/blockstates/rubbersapling.json b/src/main/resources/assets/techreborn/blockstates/rubber_sapling.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/rubbersapling.json rename to src/main/resources/assets/techreborn/blockstates/rubber_sapling.json diff --git a/src/main/resources/assets/techreborn/blockstates/techreborn.storage.json b/src/main/resources/assets/techreborn/blockstates/storage.json similarity index 56% rename from src/main/resources/assets/techreborn/blockstates/techreborn.storage.json rename to src/main/resources/assets/techreborn/blockstates/storage.json index 84ca0e7a8..b8c26dfd1 100644 --- a/src/main/resources/assets/techreborn/blockstates/techreborn.storage.json +++ b/src/main/resources/assets/techreborn/blockstates/storage.json @@ -79,6 +79,61 @@ "textures": { "all": "techreborn:blocks/storage/invar_block" } + }, + "tungstensteel": { + "textures": { + "all": "techreborn:blocks/storage/tungstensteel_block" + } + }, + "iridium_reinforced_tungstensteel": { + "textures": { + "all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block" + } + }, + "iridium_reinforced_stone": { + "textures": { + "all": "techreborn:blocks/storage/iridium_reinforced_stone_block" + } + }, + "ruby": { + "textures": { + "all": "techreborn:blocks/storage/ruby_block" + } + }, + "sapphire": { + "textures": { + "all": "techreborn:blocks/storage/sapphire_block" + } + }, + "peridot": { + "textures": { + "all": "techreborn:blocks/storage/peridot_block" + } + }, + "yellow_garnet": { + "textures": { + "all": "techreborn:blocks/storage/yellowgarnet_block" + } + }, + "red_garnet": { + "textures": { + "all": "techreborn:blocks/storage/redgarnet_block" + } + }, + "copper": { + "textures": { + "all": "techreborn:blocks/storage/copper_block" + } + }, + "tin": { + "textures": { + "all": "techreborn:blocks/storage/tin_block" + } + }, + "refined_iron": { + "textures": { + "all": "techreborn:blocks/storage/refinediron_block" + } } } } diff --git a/src/main/resources/assets/techreborn/blockstates/techreborn.ore2.json b/src/main/resources/assets/techreborn/blockstates/techreborn.ore2.json deleted file mode 100644 index d6bb70ae5..000000000 --- a/src/main/resources/assets/techreborn/blockstates/techreborn.ore2.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": {}, - "transform": "forge:default-block", - "model": "cube_all" - }, - "variants": { - "inventory": [ - {} - ], - "type": { - "copper": { - "textures": { - "all": "techreborn:blocks/ore/copper_ore" - } - }, - "tin": { - "textures": { - "all": "techreborn:blocks/ore/tin_ore" - } - } - } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/techreborn.storage2.json b/src/main/resources/assets/techreborn/blockstates/techreborn.storage2.json deleted file mode 100644 index 5ceee68e1..000000000 --- a/src/main/resources/assets/techreborn/blockstates/techreborn.storage2.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": {}, - "transform": "forge:default-block", - "model": "cube_all" - }, - "variants": { - "inventory": [ - {} - ], - "type": { - "tungstensteel": { - "textures": { - "all": "techreborn:blocks/storage/tungstensteel_block" - } - }, - "iridium_reinforced_tungstensteel": { - "textures": { - "all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block" - } - }, - "iridium_reinforced_stone": { - "textures": { - "all": "techreborn:blocks/storage/iridium_reinforced_stone_block" - } - }, - "ruby": { - "textures": { - "all": "techreborn:blocks/storage/ruby_block" - } - }, - "sapphire": { - "textures": { - "all": "techreborn:blocks/storage/sapphire_block" - } - }, - "peridot": { - "textures": { - "all": "techreborn:blocks/storage/peridot_block" - } - }, - "yellowgarnet": { - "textures": { - "all": "techreborn:blocks/storage/yellowgarnet_block" - } - }, - "redgarnet": { - "textures": { - "all": "techreborn:blocks/storage/redgarnet_block" - } - }, - "copper": { - "textures": { - "all": "techreborn:blocks/storage/copper_block" - } - }, - "tin": { - "textures": { - "all": "techreborn:blocks/storage/tin_block" - } - }, - "refinediron": { - "textures": { - "all": "techreborn:blocks/storage/refinediron_block" - } - } - } - } -} diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index bffc9ec8d..593601e82 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -4,171 +4,164 @@ item.missingRecipe.name=Missing Recipe Placeholder itemGroup.techreborn=Tech Reborn #machines -tile.techreborn.pump.name=Pump -tile.techreborn.gasTurbine.name=Gas Turbine -tile.techreborn.industrialBlock.name=Industrial -tile.techreborn.thermalGenerator.name=Thermal Generator -tile.techreborn.quantumTank.name=Quantum Tank -tile.techreborn.quantumChest.name=Quantum Chest -tile.techreborn.digitalChest.name=Digital Chest -tile.techreborn.centrifuge.name=Industrial Centrifuge -tile.techreborn.rollingmachine.name=Rolling Machine -tile.techreborn.machineCasing.standard.name=Standard Machine Casing -tile.techreborn.machineCasing.reinforced.name=Reinforced Machine Casing -tile.techreborn.machineCasing.advanced.name=Advanced Machine Casing -tile.techreborn.blastfurnace.name=Blast Furnace -tile.techreborn.alloysmelter.name=Electric Alloy Furnace -tile.techreborn.matterfabricator.name=Matter Fabricator -tile.techreborn.implosioncompressor.name=Implosion Compressor -tile.techreborn.industrialgrinder.name=Industrial Grinder -tile.techreborn.chunkloader.name=Industrial Chunkloader -tile.techreborn.magicenergyconverter.name=Magic Energy Converter -tile.techreborn.dieselgenerator.name=Diesel Generator -tile.techreborn.heatgenerator.name=Heat Generator -tile.techreborn.industrialelectrolyzer.name=Industrial Electrolyzer -tile.techreborn.magicenergyabsorber.name=Magic Energy Absorber -tile.techreborn.assemblingmachine.name=Assembling Machine -tile.techreborn.semifluidgenerator.name=Semifluid Generator -tile.techreborn.alloyfurnace.name=Iron Alloy Furnace -tile.techreborn.chemicalreactor.name=Chemical Reactor -tile.techreborn.dragoneggsiphoner.name=Dragon Egg Energy Siphon -tile.techreborn.idsu.name=IDSU -tile.techreborn.pos.name=AESU -tile.techreborn.lesu.name=LESU -tile.techreborn.lesustorage.name=LESU Block -tile.techreborn.distillationtower.name=Distillation Tower -tile.techreborn.electriccraftingtable.name=Electric Autocrafting Table -tile.techreborn.vacuumfreezer.name=Vacuum Freezer -tile.techreborn.plasmagenerator.name=Plasma Generator -tile.techreborn.fusioncontrolcomputer.name=Fusion Reactor -tile.techreborn.computercube.name=TechReborn Computer Cube -tile.techreborn.fusioncoil.name=Fusion Coil -tile.techreborn.lightningrod.name=Lightning Rod -tile.techreborn.assemblinmachine.name=Assembling Machine -tile.techreborn.machineFrame.aluminum.name=Aluminium Machine Hull -tile.techreborn.machineFrame.iron.name=Iron Machine Hull -tile.techreborn.machineFrame.bronze.name=Bronze Machine Hull -tile.techreborn.machineFrame.brass.name=Brass Machine Hull -tile.techreborn.machineFrame.steel.name=Steel Machine Hull -tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull -tile.techreborn.industrialsawmill.name=Saw Mill -tile.techreborn.chargebench.name=Charge Bench -tile.techreborn.playerDetector.all.name=Player Detector (All) -tile.techreborn.playerDetector.others.name=Player Detector (Others) -tile.techreborn.playerDetector.you.name=Player Detector (You) -tile.techreborn.generator.name=Generator -tile.techreborn.extractor.name=Extractor -tile.techreborn.grinder.name=Grinder -tile.techreborn.compressor.name=Compressor -tile.techreborn.electricfurnace.name=Electric Furnace -tile.techreborn.machineFrame.highlyAdvancedMachine.name=Highly Advanced Machine Block -tile.techreborn.machineFrame.advancedMachine.name=Advanced Machine Block -tile.techreborn.machineFrame.machine.name=Machine Block -tile.techreborn.ore2.copper.name=Copper Ore -tile.techreborn.ore2.tin.name=Tin Ore -tile.techreborn.solarpanel.name=Solar Panel -tile.techreborn.creativepanel.name=Creative Panel -tile.techreborn.watermill.name=Water Mill -tile.techreborn.windmill.name=Wind Mill -tile.techreborn.ironfurnace.name=Iron Furnace -tile.techreborn.recycler.name=Recycler -tile.techreborn.scrapboxinator.name=Scrapbox-inator -tile.techreborn.batbox.name=Battery Box -tile.techreborn.mfe.name=MFE -tile.techreborn.mfsu.name=MFSU -tile.techreborn.reinforcedglass.name=Reinforced Glass -tile.techreborn.nuke.name=Nuke -tile.techreborn.lvtransformer.name=LV Transformer -tile.techreborn.mvtransformer.name=MV Transformer -tile.techreborn.hvtransformer.name=HV Transformer -tile.techreborn.evtransformer.name=EV Transformer +tile.techreborn:pump.name=Pump +tile.techreborn:gas_turbine.name=Gas Turbine +tile.techreborn:industrial_block.name=Industrial +tile.techreborn:thermal_generator.name=Thermal Generator +tile.techreborn:quantum_tank.name=Quantum Tank +tile.techreborn:quantum_chest.name=Quantum Chest +tile.techreborn:digital_chest.name=Digital Chest +tile.techreborn:industrial_centrifuge.name=Industrial Centrifuge +tile.techreborn:rolling_machine.name=Rolling Machine +tile.techreborn:machine_casing.standard.name=Standard Machine Casing +tile.techreborn:machine_casing.reinforced.name=Reinforced Machine Casing +tile.techreborn:machine_casing.advanced.name=Advanced Machine Casing +tile.techreborn:industrial_blast_furnace.name=Industrial Blast Furnace +tile.techreborn:alloy_smelter.name=Alloy Smelter +tile.techreborn:matter_fabricator.name=Matter Fabricator +tile.techreborn:implosion_compressor.name=Implosion Compressor +tile.techreborn:industrial_grinder.name=Industrial Grinder +tile.techreborn:chunk_loader.name=Industrial Chunkloader +tile.techreborn:magic_energy_converter.name=Magic Energy Converter +tile.techreborn:diesel_generator.name=Diesel Generator +tile.techreborn:heat_generator.name=Heat Generator +tile.techreborn:industrial_electrolyzer.name=Industrial Electrolyzer +tile.techreborn:magic_energy_absorber.name=Magic Energy Absorber +tile.techreborn:assembling_machine.name=Assembling Machine +tile.techreborn:semi_fluid_generator.name=Semi Fluid Generator +tile.techreborn:iron_alloy_furnace.name=Iron Alloy Furnace +tile.techreborn:chemical_reactor.name=Chemical Reactor +tile.techreborn:dragon_egg_syphon.name=Dragon Egg Energy Siphon +tile.techreborn:interdimensional_su.name=Interdimensional SU +tile.techreborn:adjustable_su.name=Adjustable SU +tile.techreborn:lapotronic_su.name=Lapotronic SU +tile.techreborn:lsu_storage.name=LSU Storage +tile.techreborn:distillation_tower.name=Distillation Tower +tile.techreborn:electric_crafting_table.name=Electric Autocrafting Table +tile.techreborn:vacuum_freezer.name=Vacuum Freezer +tile.techreborn:plasma_generator.name=Plasma Generator +tile.techreborn:fusion_control_computer.name=Fusion Control Computer +tile.techreborn:computer_cube.name=Tech Reborn Computer Cube +tile.techreborn:fusion_coil.name=Fusion Coil +tile.techreborn:lightning_rod.name=Lightning Rod +tile.techreborn:industrial_sawmill.name=Sawmill +tile.techreborn:charge_o_mat.name=Charge-O-Mat +tile.techreborn:player_detector.all.name=Player Detector (All) +tile.techreborn:player_detector.others.name=Player Detector (Others) +tile.techreborn:player_detector.you.name=Player Detector (You) +tile.techreborn:generator.name=Generator +tile.techreborn:extractor.name=Extractor +tile.techreborn:grinder.name=Grinder +tile.techreborn:compressor.name=Compressor +tile.techreborn:electric_furnace.name=Electric Furnace +tile.techreborn:machine_frame.highly_advanced.name=Highly Advanced Machine Frame +tile.techreborn:machine_frame.advanced.name=Advanced Machine Frame +tile.techreborn:machine_frame.basic.name=Basic Machine Frame +tile.techreborn:ore2.copper.name=Copper Ore +tile.techreborn:ore2.tin.name=Tin Ore +tile.techreborn:solar_panel.name=Solar Panel +tile.techreborn:creative_panel.name=Creative Panel +tile.techreborn:water_mill.name=Water Mill +tile.techreborn:wind_mill.name=Wind Mill +tile.techreborn:iron_furnace.name=Iron Furnace +tile.techreborn:recycler.name=Recycler +tile.techreborn:scrapboxinator.name=Scrapbox-inator +tile.techreborn:batbox.name=Battery Box +tile.techreborn:mfe.name=MFE +tile.techreborn:mfsu.name=MFSU +tile.techreborn:reinforcedglass.name=Reinforced Glass +tile.techreborn:nuke.name=Nuke +tile.techreborn:lvtransformer.name=LV Transformer +tile.techreborn:mvtransformer.name=MV Transformer +tile.techreborn:hvtransformer.name=HV Transformer +tile.techreborn:evtransformer.name=EV Transformer #Blocks -tile.techreborn.rubberlog.name=Rubber Wood -tile.techreborn.rubberplank.name=Rubber Wood Planks -tile.techreborn.rubberleaves.name=Rubber Leaves -tile.techreborn.rubbersapling.name=Rubber Sapling +tile.techreborn:rubberlog.name=Rubber Wood +tile.techreborn:rubberplank.name=Rubber Wood Planks +tile.techreborn:rubberleaves.name=Rubber Leaves +tile.techreborn:rubbersapling.name=Rubber Sapling -tile.techreborn.ironfence.name=Iron Fence +tile.techreborn:ironfence.name=Iron Fence #Ores -tile.techreborn.ore.galena.name=Galena Ore -tile.techreborn.ore.iridium.name=Iridium Ore -tile.techreborn.ore.ruby.name=Ruby Ore -tile.techreborn.ore.sapphire.name=Sapphire Ore -tile.techreborn.ore.bauxite.name=Bauxite Ore -tile.techreborn.ore.pyrite.name=Pyrite Ore -tile.techreborn.ore.cinnabar.name=Cinnabar Ore -tile.techreborn.ore.sphalerite.name=Sphalerite Ore -tile.techreborn.ore.tungsten.name=Tungsten Ore -tile.techreborn.ore.sheldonite.name=Sheldonite Ore -tile.techreborn.ore.peridot.name=Peridot Ore -tile.techreborn.ore.sodalite.name=Sodalite Ore -tile.techreborn.ore.tetrahedrite.name=Tetrahedrite Ore -tile.techreborn.ore.cassiterite.name=Cassiterite Ore -tile.techreborn.ore.lead.name=Lead Ore -tile.techreborn.ore.silver.name=Silver Ore +tile.techreborn:ore.galena.name=Galena Ore +tile.techreborn:ore.iridium.name=Iridium Ore +tile.techreborn:ore.ruby.name=Ruby Ore +tile.techreborn:ore.sapphire.name=Sapphire Ore +tile.techreborn:ore.bauxite.name=Bauxite Ore +tile.techreborn:ore.pyrite.name=Pyrite Ore +tile.techreborn:ore.cinnabar.name=Cinnabar Ore +tile.techreborn:ore.sphalerite.name=Sphalerite Ore +tile.techreborn:ore.tungsten.name=Tungsten Ore +tile.techreborn:ore.sheldonite.name=Sheldonite Ore +tile.techreborn:ore.peridot.name=Peridot Ore +tile.techreborn:ore.sodalite.name=Sodalite Ore +tile.techreborn:ore.tetrahedrite.name=Tetrahedrite Ore +tile.techreborn:ore.cassiterite.name=Cassiterite Ore +tile.techreborn:ore.lead.name=Lead Ore +tile.techreborn:ore.silver.name=Silver Ore #Storage -tile.techreborn.storage.silver.name=Block of Silver -tile.techreborn.storage.aluminum.name=Block of Aluminium -tile.techreborn.storage.titanium.name=Block of Titanium -tile.techreborn.storage.chrome.name=Block of Chrome -tile.techreborn.storage.steel.name=Block of Steel -tile.techreborn.storage.brass.name=Block of Brass -tile.techreborn.storage.lead.name=Block of Lead -tile.techreborn.storage.electrum.name=Block of Electrum -tile.techreborn.storage.zinc.name=Block of Zinc -tile.techreborn.storage.platinum.name=Block of Platinum -tile.techreborn.storage.tungsten.name=Block of Tungsten -tile.techreborn.storage.nickel.name=Block of Nickel -tile.techreborn.storage.invar.name=Block of Invar -tile.techreborn.storage.osmium.name=Block of Osmium -tile.techreborn.storage.iridium.name=Block of Iridium -tile.techreborn.storage2.tungstensteel.name=Block of Tungstensteel -tile.techreborn.storage2.lodestone.name=Block of Lodestone -tile.techreborn.storage2.tellurium.name=Block of Tellurium -tile.techreborn.storage2.iridium_reinforced_tungstensteel.name=Iridium Reinforced Tungstensteel Block -tile.techreborn.storage2.iridium_reinforced_stone.name=Iridium Reinforced Stone -tile.techreborn.storage2.ruby.name=Block of Ruby -tile.techreborn.storage2.sapphire.name=Block of Sapphire -tile.techreborn.storage2.peridot.name=Block of Peridot -tile.techreborn.storage2.yellowGarnet.name=Block of Yellow Garnet -tile.techreborn.storage2.redGarnet.name=Block of Red Garnet -tile.techreborn.storage2.refinedIron.name=Block of Refined Iron -tile.techreborn.storage2.copper.name=Block of Copper -tile.techreborn.storage2.tin.name=Block of Tin -tile.techreborn.farm.name=Farm +tile.techreborn:storage.silver.name=Block of Silver +tile.techreborn:storage.aluminum.name=Block of Aluminium +tile.techreborn:storage.titanium.name=Block of Titanium +tile.techreborn:storage.chrome.name=Block of Chrome +tile.techreborn:storage.steel.name=Block of Steel +tile.techreborn:storage.brass.name=Block of Brass +tile.techreborn:storage.lead.name=Block of Lead +tile.techreborn:storage.electrum.name=Block of Electrum +tile.techreborn:storage.zinc.name=Block of Zinc +tile.techreborn:storage.platinum.name=Block of Platinum +tile.techreborn:storage.tungsten.name=Block of Tungsten +tile.techreborn:storage.nickel.name=Block of Nickel +tile.techreborn:storage.invar.name=Block of Invar +tile.techreborn:storage.osmium.name=Block of Osmium +tile.techreborn:storage.iridium.name=Block of Iridium +tile.techreborn:storage2.tungstensteel.name=Block of Tungstensteel +tile.techreborn:storage2.lodestone.name=Block of Lodestone +tile.techreborn:storage2.tellurium.name=Block of Tellurium +tile.techreborn:storage2.iridium_reinforced_tungstensteel.name=Iridium Reinforced Tungstensteel Block +tile.techreborn:storage2.iridium_reinforced_stone.name=Iridium Reinforced Stone +tile.techreborn:storage2.ruby.name=Block of Ruby +tile.techreborn:storage2.sapphire.name=Block of Sapphire +tile.techreborn:storage2.peridot.name=Block of Peridot +tile.techreborn:storage2.yellowGarnet.name=Block of Yellow Garnet +tile.techreborn:storage2.redGarnet.name=Block of Red Garnet +tile.techreborn:storage2.refinedIron.name=Block of Refined Iron +tile.techreborn:storage2.copper.name=Block of Copper +tile.techreborn:storage2.tin.name=Block of Tin +tile.techreborn:farm.name=Farm #Fluids -tile.techreborn.berylium.name=Beryllium Source -tile.techreborn.calcium.name=Calcium Source -tile.techreborn.calciumcarbonate.name=Calciumcarbonate Source -tile.techreborn.chlorite.name=Chlorite Source -tile.techreborn.deuterium.name=Deuterium Source -tile.techreborn.glyceryl.name=Glyceryl Source -tile.techreborn.helium.name=Helium Source -tile.techreborn.helium3.name=Helium3 Source -tile.techreborn.heliumplasma.name=Heliumplasma Source -tile.techreborn.hydrogen.name=Hydrogen Source -tile.techreborn.lithium.name=Lithium Source -tile.techreborn.mercury.name=Mercury Source -tile.techreborn.methane.name=Methane Source -tile.techreborn.nitrocoalfuel.name=Nitrocoalfuel Source -tile.techreborn.nitrofuel.name=Nitrofuel Source -tile.techreborn.nitrogen.name=Nitrogen Source -tile.techreborn.nitrogendioxide.name=Nitrogendioxide Source -tile.techreborn.potassium.name=Potassium Source -tile.techreborn.silicon.name=Silicon Source -tile.techreborn.sodium.name=Sodium Source -tile.techreborn.sodiumpersulfate.name=Sodiumpersulfate Source -tile.techreborn.tritium.name=Tritium Source -tile.techreborn.wolframium.name=Wolframium Source -tile.techreborn.compressedair.name=Compressed Air Source -tile.techreborn.electrolyzedwater.name=Electrolyzed Water Source -tile.techreborn.supercondensator.name=Supercondensator +tile.techreborn:berylium.name=Beryllium Source +tile.techreborn:calcium.name=Calcium Source +tile.techreborn:calciumcarbonate.name=Calciumcarbonate Source +tile.techreborn:chlorite.name=Chlorite Source +tile.techreborn:deuterium.name=Deuterium Source +tile.techreborn:glyceryl.name=Glyceryl Source +tile.techreborn:helium.name=Helium Source +tile.techreborn:helium3.name=Helium3 Source +tile.techreborn:heliumplasma.name=Heliumplasma Source +tile.techreborn:hydrogen.name=Hydrogen Source +tile.techreborn:lithium.name=Lithium Source +tile.techreborn:mercury.name=Mercury Source +tile.techreborn:methane.name=Methane Source +tile.techreborn:nitrocoalfuel.name=Nitrocoalfuel Source +tile.techreborn:nitrofuel.name=Nitrofuel Source +tile.techreborn:nitrogen.name=Nitrogen Source +tile.techreborn:nitrogendioxide.name=Nitrogendioxide Source +tile.techreborn:potassium.name=Potassium Source +tile.techreborn:silicon.name=Silicon Source +tile.techreborn:sodium.name=Sodium Source +tile.techreborn:sodiumpersulfate.name=Sodiumpersulfate Source +tile.techreborn:tritium.name=Tritium Source +tile.techreborn:wolframium.name=Wolframium Source +tile.techreborn:compressedair.name=Compressed Air Source +tile.techreborn:electrolyzedwater.name=Electrolyzed Water Source +tile.techreborn:supercondensator.name=Supercondensator fluid.fluid.fluidberylium=Beryllium fluid.fluid.fluidcalcium=Calcium fluid.fluid.fluidcalciumcarbonate=Calciumcarbonate @@ -194,13 +187,13 @@ fluid.fluid.fluidtritium=Tritium fluid.fluid.fluidwolframium=Wolframium fluid.fluid.electrolyzedwater=Electrolyzed Water fluid.fluid.compresseair=Compressed Air -fluid.tile.techreborn.glyceryl=Glyceryl -fluid.tile.techreborn.berylium=Beryllium -fluid.tile.techreborn.chlorite=Chlorite -fluid.tile.techreborn.helium3=Helium3 -fluid.tile.techreborn.deuterium=Deuterium -fluid.tile.techreborn.helium=Helium -fluid.tile.techreborn.calciumcarbonate=Calcium Carbonate +fluid.tile.techreborn:glyceryl=Glyceryl +fluid.tile.techreborn:berylium=Beryllium +fluid.tile.techreborn:chlorite=Chlorite +fluid.tile.techreborn:helium3=Helium3 +fluid.tile.techreborn:deuterium=Deuterium +fluid.tile.techreborn:helium=Helium +fluid.tile.techreborn:calciumcarbonate=Calcium Carbonate fluid.titanium.name=Molten Titanium fluid.chrome.name=Molten Chrome fluid.platinum.name=Molten Platinum @@ -209,339 +202,339 @@ fluid.invar.name=Molten Invar fluid.tungsten.name=Molten Tungsten #Dusts -item.techreborn.dust.almandine.name=Almandine Dust -item.techreborn.dust.aluminumBrass.name=Aluminium Brass Dust -item.techreborn.dust.aluminum.name=Aluminium Dust -item.techreborn.dust.alumite.name=Alumite Dust -item.techreborn.dust.andradite.name=Andradite Dust -item.techreborn.dust.antimony.name=Antimony Dust -item.techreborn.dust.ardite.name=Ardite Dust -item.techreborn.dust.ashes.name=Ashes -item.techreborn.dust.basalt.name=Basalt Dust -item.techreborn.dust.bauxite.name=Bauxite Dust -item.techreborn.dust.biotite.name=Biotite Dust -item.techreborn.dust.brass.name=Brass Dust -item.techreborn.dust.bronze.name=Bronze Dust -item.techreborn.dust.cadmium.name=Cadmium Dust -item.techreborn.dust.calcite.name=Calcite Dust -item.techreborn.dust.charcoal.name=Charcoal Dust -item.techreborn.dust.chrome.name=Chrome Dust -item.techreborn.dust.cinnabar.name=Cinnabar Dust -item.techreborn.dust.clay.name=Clay Dust -item.techreborn.dust.coal.name=Coal Dust -item.techreborn.dust.cobalt.name=Cobalt Dust -item.techreborn.dust.copper.name=Copper Dust -item.techreborn.dust.cupronickel.name=Cupronickel Dust -item.techreborn.dust.dark_ashes.name=Dark Ashes -item.techreborn.dust.darkIron.name=Dark Iron Dust -item.techreborn.dust.diamond.name=Diamond Dust -item.techreborn.dust.electrum.name=Electrum Dust -item.techreborn.dust.emerald.name=Emerald Dust -item.techreborn.dust.ender_eye.name=Ender Eye Dust -item.techreborn.dust.ender_pearl.name=Ender Pearl Dust -item.techreborn.dust.endstone.name=Endstone Dust -item.techreborn.dust.flint.name=Flint Dust -item.techreborn.dust.gold.name=Gold Dust -item.techreborn.dust.graphite.name=Graphite Dust -item.techreborn.dust.grossular.name=Grossular Dust -item.techreborn.dust.indium.name=Indium Dust -item.techreborn.dust.invar.name=Invar Dust -item.techreborn.dust.iridium.name=Iridium Dust -item.techreborn.dust.iron.name=Iron Dust -item.techreborn.dust.lazurite.name=Lazurite Dust -item.techreborn.dust.lead.name=Lead Dust -item.techreborn.dust.magnesium.name=Magnesium Dust -item.techreborn.dust.manganese.name=Manganese Dust -item.techreborn.dust.marble.name=Marble Dust -item.techreborn.dust.netherrack.name=Netherrack Dust -item.techreborn.dust.nickel.name=Nickel Dust -item.techreborn.dust.obsidian.name=Obsidian Dust -item.techreborn.dust.osmium.name=Osmium Dust -item.techreborn.dust.peridot.name=Peridot Dust -item.techreborn.dust.phosphorous.name=Phosphorous Dust -item.techreborn.dust.platinum.name=Platinum Dust -item.techreborn.dust.potassiumFeldspar.name=Potassium Feldspar Dust -item.techreborn.dust.pyrite.name=Pyrite Dust -item.techreborn.dust.pyrope.name=Pyrope Dust -item.techreborn.dust.red_garnet.name=Red Garnet Dust -item.techreborn.dust.ruby.name=Ruby Dust -item.techreborn.dust.saltpeter.name=Saltpeter Dust -item.techreborn.dust.sapphire.name=Sapphire Dust -item.techreborn.dust.silicon.name=Silicon Dust -item.techreborn.dust.silver.name=Silver Dust -item.techreborn.dust.sodalite.name=Sodalite Dust -item.techreborn.dust.spessartine.name=Spessartine Dust -item.techreborn.dust.sphalerite.name=Sphalerite Dust -item.techreborn.dust.steel.name=Steel Dust -item.techreborn.dust.sulfur.name=Sulfur Dust -item.techreborn.dust.tellurium.name=Tellurium Dust -item.techreborn.dust.teslatite.name=Teslatite Dust -item.techreborn.dust.tetrahedrite.name=Tetrahedrite Dust -item.techreborn.dust.tin.name=Tin Dust -item.techreborn.dust.titanium.name=Titanium Dust -item.techreborn.dust.tungsten.name=Tungsten Dust -item.techreborn.dust.uvarovite.name=Uvarovite Dust -item.techreborn.dust.vinteum.name=Vinteum Dust -item.techreborn.dust.voidstone.name=Voidstone Dust -item.techreborn.dust.yellow_garnet.name=Yellow Garnet Dust -item.techreborn.dust.zinc.name=Zinc Dust -item.techreborn.dust.galena.name=Galena Dust -item.techreborn.dust.saw_dust.name=Saw Dust -item.techreborn.dust.olivine.name=Olivine Dust -item.techreborn.dust.andesite.name=Andesite Dust -item.techreborn.dust.diorite.name=Diorite Dust -item.techreborn.dust.granite.name=Granite Dust +item.techreborn:dust.almandine.name=Almandine Dust +item.techreborn:dust.aluminumBrass.name=Aluminium Brass Dust +item.techreborn:dust.aluminum.name=Aluminium Dust +item.techreborn:dust.alumite.name=Alumite Dust +item.techreborn:dust.andradite.name=Andradite Dust +item.techreborn:dust.antimony.name=Antimony Dust +item.techreborn:dust.ardite.name=Ardite Dust +item.techreborn:dust.ashes.name=Ashes +item.techreborn:dust.basalt.name=Basalt Dust +item.techreborn:dust.bauxite.name=Bauxite Dust +item.techreborn:dust.biotite.name=Biotite Dust +item.techreborn:dust.brass.name=Brass Dust +item.techreborn:dust.bronze.name=Bronze Dust +item.techreborn:dust.cadmium.name=Cadmium Dust +item.techreborn:dust.calcite.name=Calcite Dust +item.techreborn:dust.charcoal.name=Charcoal Dust +item.techreborn:dust.chrome.name=Chrome Dust +item.techreborn:dust.cinnabar.name=Cinnabar Dust +item.techreborn:dust.clay.name=Clay Dust +item.techreborn:dust.coal.name=Coal Dust +item.techreborn:dust.cobalt.name=Cobalt Dust +item.techreborn:dust.copper.name=Copper Dust +item.techreborn:dust.cupronickel.name=Cupronickel Dust +item.techreborn:dust.dark_ashes.name=Dark Ashes +item.techreborn:dust.darkIron.name=Dark Iron Dust +item.techreborn:dust.diamond.name=Diamond Dust +item.techreborn:dust.electrum.name=Electrum Dust +item.techreborn:dust.emerald.name=Emerald Dust +item.techreborn:dust.ender_eye.name=Ender Eye Dust +item.techreborn:dust.ender_pearl.name=Ender Pearl Dust +item.techreborn:dust.endstone.name=Endstone Dust +item.techreborn:dust.flint.name=Flint Dust +item.techreborn:dust.gold.name=Gold Dust +item.techreborn:dust.graphite.name=Graphite Dust +item.techreborn:dust.grossular.name=Grossular Dust +item.techreborn:dust.indium.name=Indium Dust +item.techreborn:dust.invar.name=Invar Dust +item.techreborn:dust.iridium.name=Iridium Dust +item.techreborn:dust.iron.name=Iron Dust +item.techreborn:dust.lazurite.name=Lazurite Dust +item.techreborn:dust.lead.name=Lead Dust +item.techreborn:dust.magnesium.name=Magnesium Dust +item.techreborn:dust.manganese.name=Manganese Dust +item.techreborn:dust.marble.name=Marble Dust +item.techreborn:dust.netherrack.name=Netherrack Dust +item.techreborn:dust.nickel.name=Nickel Dust +item.techreborn:dust.obsidian.name=Obsidian Dust +item.techreborn:dust.osmium.name=Osmium Dust +item.techreborn:dust.peridot.name=Peridot Dust +item.techreborn:dust.phosphorous.name=Phosphorous Dust +item.techreborn:dust.platinum.name=Platinum Dust +item.techreborn:dust.potassiumFeldspar.name=Potassium Feldspar Dust +item.techreborn:dust.pyrite.name=Pyrite Dust +item.techreborn:dust.pyrope.name=Pyrope Dust +item.techreborn:dust.red_garnet.name=Red Garnet Dust +item.techreborn:dust.ruby.name=Ruby Dust +item.techreborn:dust.saltpeter.name=Saltpeter Dust +item.techreborn:dust.sapphire.name=Sapphire Dust +item.techreborn:dust.silicon.name=Silicon Dust +item.techreborn:dust.silver.name=Silver Dust +item.techreborn:dust.sodalite.name=Sodalite Dust +item.techreborn:dust.spessartine.name=Spessartine Dust +item.techreborn:dust.sphalerite.name=Sphalerite Dust +item.techreborn:dust.steel.name=Steel Dust +item.techreborn:dust.sulfur.name=Sulfur Dust +item.techreborn:dust.tellurium.name=Tellurium Dust +item.techreborn:dust.teslatite.name=Teslatite Dust +item.techreborn:dust.tetrahedrite.name=Tetrahedrite Dust +item.techreborn:dust.tin.name=Tin Dust +item.techreborn:dust.titanium.name=Titanium Dust +item.techreborn:dust.tungsten.name=Tungsten Dust +item.techreborn:dust.uvarovite.name=Uvarovite Dust +item.techreborn:dust.vinteum.name=Vinteum Dust +item.techreborn:dust.voidstone.name=Voidstone Dust +item.techreborn:dust.yellow_garnet.name=Yellow Garnet Dust +item.techreborn:dust.zinc.name=Zinc Dust +item.techreborn:dust.galena.name=Galena Dust +item.techreborn:dust.saw_dust.name=Saw Dust +item.techreborn:dust.olivine.name=Olivine Dust +item.techreborn:dust.andesite.name=Andesite Dust +item.techreborn:dust.diorite.name=Diorite Dust +item.techreborn:dust.granite.name=Granite Dust -item.techreborn.wrench.name=Wrench -tile.techreborn.cable.copper.name=Copper Cable -tile.techreborn.cable.tin.name=Tin Cable -tile.techreborn.cable.gold.name=Gold Cable -tile.techreborn.cable.hv.name=HV Cable -tile.techreborn.cable.glassfiber.name=Glass Fiber Cable -tile.techreborn.cable.insulatedcopper.name=Insulated Copper Cable -tile.techreborn.cable.insulatedgold.name=Insulated Gold Cable -tile.techreborn.cable.insulatedhv.name=Insulated HV Cable -item.techreborn.scrapbox.name=Scrap Box -item.techreborn.part.carbon_mesh.name=Carbon Mesh -item.techreborn.part.carbon_fiber.name=Carbon Fiber +item.techreborn:wrench.name=Wrench +tile.techreborn:cable.copper.name=Copper Cable +tile.techreborn:cable.tin.name=Tin Cable +tile.techreborn:cable.gold.name=Gold Cable +tile.techreborn:cable.hv.name=HV Cable +tile.techreborn:cable.glassfiber.name=Glass Fiber Cable +tile.techreborn:cable.insulatedcopper.name=Insulated Copper Cable +tile.techreborn:cable.insulatedgold.name=Insulated Gold Cable +tile.techreborn:cable.insulatedhv.name=Insulated HV Cable +item.techreborn:scrapbox.name=Scrap Box +item.techreborn:part.carbon_mesh.name=Carbon Mesh +item.techreborn:part.carbon_fiber.name=Carbon Fiber #Small Dusts -item.techreborn.dustsmall.almandine.name=Small Pile of Almandine Dust -item.techreborn.dustsmall.aluminum.name=Small Pile of Aluminium Dust -item.techreborn.dustsmall.andradite.name=Small Pile of Andradite Dust -item.techreborn.dustsmall.ashes.name=Small Pile of Ashes -item.techreborn.dustsmall.basalt.name=Small Pile of Basalt Dust -item.techreborn.dustsmall.bauxite.name=Small Pile of Bauxite Dust -item.techreborn.dustsmall.brass.name=Small Pile of Brass Dust -item.techreborn.dustsmall.bronze.name=Small Pile of Bronze Dust -item.techreborn.dustsmall.calcite.name=Small Pile of Calcite Dust -item.techreborn.dustsmall.charcoal.name=Small Pile of Charcoal Dust -item.techreborn.dustsmall.chrome.name=Small Pile of Chrome Dust -item.techreborn.dustsmall.cinnabar.name=Small Pile of Cinnabar Dust -item.techreborn.dustsmall.clay.name=Small Pile of Clay Dust -item.techreborn.dustsmall.coal.name=Small Pile of Coal Dust -item.techreborn.dustsmall.copper.name=Small Pile of Copper Dust -item.techreborn.dustsmall.dark_ashes.name=Small Pile of Dark Ashes -item.techreborn.dustsmall.diamond.name=Small Pile of Diamond Dust -item.techreborn.dustsmall.electrum.name=Small Pile of Electrum Dust -item.techreborn.dustsmall.emerald.name=Small Pile of Emerald Dust -item.techreborn.dustsmall.ender_eye.name=Small Pile of Ender Eye Dust -item.techreborn.dustsmall.ender_pearl.name=Small Pile of Ender Pearl Dust -item.techreborn.dustsmall.endstone.name=Small Pile of Endstone Dust -item.techreborn.dustsmall.flint.name=Small Pile of Flint Dust -item.techreborn.dustsmall.galena.name=Small Pile of Galena Dust -item.techreborn.dustsmall.glowstone.name=Small Pile of Glowstone Dust -item.techreborn.dustsmall.gold.name=Small Pile of Gold Dust -item.techreborn.dustsmall.grossular.name=Small Pile of Grossular Dust -item.techreborn.dustsmall.invar.name=Small Pile of Invar Dust -item.techreborn.dustsmall.iron.name=Small Pile of Iron Dust -item.techreborn.dustsmall.lazurite.name=Small Pile of Lazurite Dust -item.techreborn.dustsmall.lead.name=Small Pile of Lead Dust -item.techreborn.dustsmall.magnesium.name=Small Pile of Magnesium Dust -item.techreborn.dustsmall.manganese.name=Small Pile of Manganese Dust -item.techreborn.dustsmall.marble.name=Small Pile of Marble Dust -item.techreborn.dustsmall.netherrack.name=Small Pile of Netherrack Dust -item.techreborn.dustsmall.nickel.name=Small Pile of Nickel Dust -item.techreborn.dustsmall.obsidian.name=Small Pile of Obsidian Dust -item.techreborn.dustsmall.peridot.name=Small Pile of Peridot -item.techreborn.dustsmall.phosphorous.name=Small Pile of Phosphorous Dust -item.techreborn.dustsmall.platinum.name=Small Pile of Platinum Dust -item.techreborn.dustsmall.pyrite.name=Small Pile of Pyrite Dust -item.techreborn.dustsmall.pyrope.name=Small Pile of Pyrope Dust -item.techreborn.dustsmall.red_garnet.name=Small Pile of Red Garnet Dust -item.techreborn.dustsmall.redstone.name=Small Pile of Redstone -item.techreborn.dustsmall.ruby.name=Small Pile of Ruby Dust -item.techreborn.dustsmall.saltpeter.name=Small Pile of Saltpeter Dust -item.techreborn.dustsmall.sapphire.name=Small Pile of Sapphire Dust -item.techreborn.dustsmall.saw_dust.name=Small Pile of Saw Dust -item.techreborn.dustsmall.silver.name=Small Pile of Silver Dust -item.techreborn.dustsmall.sodalite.name=Small Pile of Sodalite Dust -item.techreborn.dustsmall.spessartine.name=Small Pile of Spessartine Dust -item.techreborn.dustsmall.sphalerite.name=Small Pile of Sphalerite Dust -item.techreborn.dustsmall.steel.name=Small Pile of Steel Dust -item.techreborn.dustsmall.sulfur.name=Small Pile of Sulfur Dust -item.techreborn.dustsmall.tin.name=Small Pile of Tin Dust -item.techreborn.dustsmall.titanium.name=Small Pile of Titanium Dust -item.techreborn.dustsmall.tungsten.name=Small Pile of Tungsten Dust -item.techreborn.dustsmall.uvarovite.name=Small Pile of Uvarovite Dust -item.techreborn.dustsmall.voidstone.name=Small Pile of Voidstone Dust -item.techreborn.dustsmall.yellow_garnet.name=Small Pile of Yellow Garnet Dust -item.techreborn.dustsmall.zinc.name=Small Pile of Zinc Dust -item.techreborn.dustsmall.olivine.name=Small Pile of Olivine Dust -item.techreborn.dustsmall.andesite.name=Small Pile of Andesite Dust -item.techreborn.dustsmall.diorite.name=Small Pile of Diorite Dust -item.techreborn.dustsmall.granite.name=Small Pile of Granite Dust +item.techreborn:dustsmall.almandine.name=Small Pile of Almandine Dust +item.techreborn:dustsmall.aluminum.name=Small Pile of Aluminium Dust +item.techreborn:dustsmall.andradite.name=Small Pile of Andradite Dust +item.techreborn:dustsmall.ashes.name=Small Pile of Ashes +item.techreborn:dustsmall.basalt.name=Small Pile of Basalt Dust +item.techreborn:dustsmall.bauxite.name=Small Pile of Bauxite Dust +item.techreborn:dustsmall.brass.name=Small Pile of Brass Dust +item.techreborn:dustsmall.bronze.name=Small Pile of Bronze Dust +item.techreborn:dustsmall.calcite.name=Small Pile of Calcite Dust +item.techreborn:dustsmall.charcoal.name=Small Pile of Charcoal Dust +item.techreborn:dustsmall.chrome.name=Small Pile of Chrome Dust +item.techreborn:dustsmall.cinnabar.name=Small Pile of Cinnabar Dust +item.techreborn:dustsmall.clay.name=Small Pile of Clay Dust +item.techreborn:dustsmall.coal.name=Small Pile of Coal Dust +item.techreborn:dustsmall.copper.name=Small Pile of Copper Dust +item.techreborn:dustsmall.dark_ashes.name=Small Pile of Dark Ashes +item.techreborn:dustsmall.diamond.name=Small Pile of Diamond Dust +item.techreborn:dustsmall.electrum.name=Small Pile of Electrum Dust +item.techreborn:dustsmall.emerald.name=Small Pile of Emerald Dust +item.techreborn:dustsmall.ender_eye.name=Small Pile of Ender Eye Dust +item.techreborn:dustsmall.ender_pearl.name=Small Pile of Ender Pearl Dust +item.techreborn:dustsmall.endstone.name=Small Pile of Endstone Dust +item.techreborn:dustsmall.flint.name=Small Pile of Flint Dust +item.techreborn:dustsmall.galena.name=Small Pile of Galena Dust +item.techreborn:dustsmall.glowstone.name=Small Pile of Glowstone Dust +item.techreborn:dustsmall.gold.name=Small Pile of Gold Dust +item.techreborn:dustsmall.grossular.name=Small Pile of Grossular Dust +item.techreborn:dustsmall.invar.name=Small Pile of Invar Dust +item.techreborn:dustsmall.iron.name=Small Pile of Iron Dust +item.techreborn:dustsmall.lazurite.name=Small Pile of Lazurite Dust +item.techreborn:dustsmall.lead.name=Small Pile of Lead Dust +item.techreborn:dustsmall.magnesium.name=Small Pile of Magnesium Dust +item.techreborn:dustsmall.manganese.name=Small Pile of Manganese Dust +item.techreborn:dustsmall.marble.name=Small Pile of Marble Dust +item.techreborn:dustsmall.netherrack.name=Small Pile of Netherrack Dust +item.techreborn:dustsmall.nickel.name=Small Pile of Nickel Dust +item.techreborn:dustsmall.obsidian.name=Small Pile of Obsidian Dust +item.techreborn:dustsmall.peridot.name=Small Pile of Peridot +item.techreborn:dustsmall.phosphorous.name=Small Pile of Phosphorous Dust +item.techreborn:dustsmall.platinum.name=Small Pile of Platinum Dust +item.techreborn:dustsmall.pyrite.name=Small Pile of Pyrite Dust +item.techreborn:dustsmall.pyrope.name=Small Pile of Pyrope Dust +item.techreborn:dustsmall.red_garnet.name=Small Pile of Red Garnet Dust +item.techreborn:dustsmall.redstone.name=Small Pile of Redstone +item.techreborn:dustsmall.ruby.name=Small Pile of Ruby Dust +item.techreborn:dustsmall.saltpeter.name=Small Pile of Saltpeter Dust +item.techreborn:dustsmall.sapphire.name=Small Pile of Sapphire Dust +item.techreborn:dustsmall.saw_dust.name=Small Pile of Saw Dust +item.techreborn:dustsmall.silver.name=Small Pile of Silver Dust +item.techreborn:dustsmall.sodalite.name=Small Pile of Sodalite Dust +item.techreborn:dustsmall.spessartine.name=Small Pile of Spessartine Dust +item.techreborn:dustsmall.sphalerite.name=Small Pile of Sphalerite Dust +item.techreborn:dustsmall.steel.name=Small Pile of Steel Dust +item.techreborn:dustsmall.sulfur.name=Small Pile of Sulfur Dust +item.techreborn:dustsmall.tin.name=Small Pile of Tin Dust +item.techreborn:dustsmall.titanium.name=Small Pile of Titanium Dust +item.techreborn:dustsmall.tungsten.name=Small Pile of Tungsten Dust +item.techreborn:dustsmall.uvarovite.name=Small Pile of Uvarovite Dust +item.techreborn:dustsmall.voidstone.name=Small Pile of Voidstone Dust +item.techreborn:dustsmall.yellow_garnet.name=Small Pile of Yellow Garnet Dust +item.techreborn:dustsmall.zinc.name=Small Pile of Zinc Dust +item.techreborn:dustsmall.olivine.name=Small Pile of Olivine Dust +item.techreborn:dustsmall.andesite.name=Small Pile of Andesite Dust +item.techreborn:dustsmall.diorite.name=Small Pile of Diorite Dust +item.techreborn:dustsmall.granite.name=Small Pile of Granite Dust -item.techreborn.cell.name=Empty Cell -item.techreborn.rebattery.name=Battery -item.techreborn.lithiumBattery.name=Lithium Battery -item.techreborn.energyCrystal.name=Energy Crystal -item.techreborn.lapotronCrystal.name=Lapotron Crystal -item.techreborn.treetap.name=Treetap -item.techreborn.nanosaber.name=Nanosaber -item.techreborn.upgrade.overclock.name=Overclocker Upgrade -item.techreborn.upgrade.transformer.name=Tranformer Upgrade -item.techreborn.upgrade.energy_storage.name=Energy Storage Upgrade -item.techreborn.upgrade.range.name=Range Upgrade -item.techreborn.upgrade.ejection.name=Ejector Upgrade -item.techreborn.upgrade.injection.name=Importer Upgrade -item.techreborn.electric_treetap.name=Electric Treetap +item.techreborn:cell.name=Empty Cell +item.techreborn:rebattery.name=Battery +item.techreborn:lithiumBattery.name=Lithium Battery +item.techreborn:energyCrystal.name=Energy Crystal +item.techreborn:lapotronCrystal.name=Lapotron Crystal +item.techreborn:treetap.name=Treetap +item.techreborn:nanosaber.name=Nanosaber +item.techreborn:upgrade.overclock.name=Overclocker Upgrade +item.techreborn:upgrade.transformer.name=Tranformer Upgrade +item.techreborn:upgrade.energy_storage.name=Energy Storage Upgrade +item.techreborn:upgrade.range.name=Range Upgrade +item.techreborn:upgrade.ejection.name=Ejector Upgrade +item.techreborn:upgrade.injection.name=Importer Upgrade +item.techreborn:electric_treetap.name=Electric Treetap #Gems -item.techreborn.gem.ruby.name=Ruby -item.techreborn.gem.sapphire.name=Sapphire -item.techreborn.gem.peridot.name=Peridot -item.techreborn.gem.red_garnet.name=Red Garnet -item.techreborn.gem.yellow_garnet.name=Yellow Garnet +item.techreborn:gem.ruby.name=Ruby +item.techreborn:gem.sapphire.name=Sapphire +item.techreborn:gem.peridot.name=Peridot +item.techreborn:gem.red_garnet.name=Red Garnet +item.techreborn:gem.yellow_garnet.name=Yellow Garnet #Ingots -item.techreborn.ingot.aluminum.name=Aluminium Ingot -item.techreborn.ingot.brass.name=Brass Ingot -item.techreborn.ingot.bronze.name=Bronze Ingot -item.techreborn.ingot.chrome.name=Chrome Ingot -item.techreborn.ingot.copper.name=Copper Ingot -item.techreborn.ingot.electrum.name=Electrum Ingot -item.techreborn.ingot.invar.name=Invar Ingot -item.techreborn.ingot.iridium.name=Iridium Ingot -item.techreborn.ingot.lead.name=Lead Ingot -item.techreborn.ingot.nickel.name=Nickel Ingot -item.techreborn.ingot.platinum.name=Platinum Ingot -item.techreborn.ingot.silver.name=Silver Ingot -item.techreborn.ingot.steel.name=Steel Ingot -item.techreborn.ingot.tin.name=Tin Ingot -item.techreborn.ingot.titanium.name=Titanium Ingot -item.techreborn.ingot.tungsten.name=Tungsten Ingot -item.techreborn.ingot.hot_tungstensteel.name=Hot Tungstensteel Ingot -item.techreborn.ingot.tungstensteel.name=Tungstensteel Ingot -item.techreborn.ingot.zinc.name=Zinc Ingot -item.techreborn.ingot.advanced_alloy.name=Advanced Alloy Ingot -item.techreborn.ingot.mixed_metal.name=Mixed Metal Ingot -item.techreborn.ingot.iridium_alloy.name=Iridium Alloy Ingot -item.techreborn.ingot.refined_iron.name=Refined Iron Ingot +item.techreborn:ingot.aluminum.name=Aluminium Ingot +item.techreborn:ingot.brass.name=Brass Ingot +item.techreborn:ingot.bronze.name=Bronze Ingot +item.techreborn:ingot.chrome.name=Chrome Ingot +item.techreborn:ingot.copper.name=Copper Ingot +item.techreborn:ingot.electrum.name=Electrum Ingot +item.techreborn:ingot.invar.name=Invar Ingot +item.techreborn:ingot.iridium.name=Iridium Ingot +item.techreborn:ingot.lead.name=Lead Ingot +item.techreborn:ingot.nickel.name=Nickel Ingot +item.techreborn:ingot.platinum.name=Platinum Ingot +item.techreborn:ingot.silver.name=Silver Ingot +item.techreborn:ingot.steel.name=Steel Ingot +item.techreborn:ingot.tin.name=Tin Ingot +item.techreborn:ingot.titanium.name=Titanium Ingot +item.techreborn:ingot.tungsten.name=Tungsten Ingot +item.techreborn:ingot.hot_tungstensteel.name=Hot Tungstensteel Ingot +item.techreborn:ingot.tungstensteel.name=Tungstensteel Ingot +item.techreborn:ingot.zinc.name=Zinc Ingot +item.techreborn:ingot.advanced_alloy.name=Advanced Alloy Ingot +item.techreborn:ingot.mixed_metal.name=Mixed Metal Ingot +item.techreborn:ingot.iridium_alloy.name=Iridium Alloy Ingot +item.techreborn:ingot.refined_iron.name=Refined Iron Ingot #Nuggets -item.techreborn.nuggets.aluminum.name=Aluminium Nugget -item.techreborn.nuggets.antimony.name=Antimony Nugget -item.techreborn.nuggets.brass.name=Brass Nugget -item.techreborn.nuggets.bronze.name=Bronze Nugget -item.techreborn.nuggets.chrome.name=Chrome Nugget -item.techreborn.nuggets.copper.name=Copper Nugget -item.techreborn.nuggets.electrum.name=Electrum Nugget -item.techreborn.nuggets.invar.name=Invar Nugget -item.techreborn.nuggets.iridium.name=Iridium Nugget -item.techreborn.nuggets.iron.name=Iron Nugget -item.techreborn.nuggets.lead.name=Lead Nugget -item.techreborn.nuggets.nickel.name=Nickel Nugget -item.techreborn.nuggets.osmium.name=Osmium Nugget -item.techreborn.nuggets.platinum.name=Platinum Nugget -item.techreborn.nuggets.silver.name=Silver Nugget -item.techreborn.nuggets.steel.name=Steel Nugget -item.techreborn.nuggets.tin.name=Tin Nugget -item.techreborn.nuggets.titanium.name=Titanium Nugget -item.techreborn.nuggets.tungsten.name=Tungsten Nugget -item.techreborn.nuggets.tungstensteel.name=Tungstensteel Nugget -item.techreborn.nuggets.hot_tungstensteel.name=Hot Tungstensteeel Nugget -item.techreborn.nuggets.zinc.name=Zinc Nugget -item.techreborn.nuggets.refined_iron.name=Refined Iron Nugget -item.techreborn.nuggets.diamond.name=Diamond Nugget +item.techreborn:nuggets.aluminum.name=Aluminium Nugget +item.techreborn:nuggets.antimony.name=Antimony Nugget +item.techreborn:nuggets.brass.name=Brass Nugget +item.techreborn:nuggets.bronze.name=Bronze Nugget +item.techreborn:nuggets.chrome.name=Chrome Nugget +item.techreborn:nuggets.copper.name=Copper Nugget +item.techreborn:nuggets.electrum.name=Electrum Nugget +item.techreborn:nuggets.invar.name=Invar Nugget +item.techreborn:nuggets.iridium.name=Iridium Nugget +item.techreborn:nuggets.iron.name=Iron Nugget +item.techreborn:nuggets.lead.name=Lead Nugget +item.techreborn:nuggets.nickel.name=Nickel Nugget +item.techreborn:nuggets.osmium.name=Osmium Nugget +item.techreborn:nuggets.platinum.name=Platinum Nugget +item.techreborn:nuggets.silver.name=Silver Nugget +item.techreborn:nuggets.steel.name=Steel Nugget +item.techreborn:nuggets.tin.name=Tin Nugget +item.techreborn:nuggets.titanium.name=Titanium Nugget +item.techreborn:nuggets.tungsten.name=Tungsten Nugget +item.techreborn:nuggets.tungstensteel.name=Tungstensteel Nugget +item.techreborn:nuggets.hot_tungstensteel.name=Hot Tungstensteeel Nugget +item.techreborn:nuggets.zinc.name=Zinc Nugget +item.techreborn:nuggets.refined_iron.name=Refined Iron Nugget +item.techreborn:nuggets.diamond.name=Diamond Nugget #Plates -item.techreborn.plate.aluminum.name=Aluminium Plate -item.techreborn.plate.brass.name=Brass Plate -item.techreborn.plate.bronze.name=Bronze Plate -item.techreborn.plate.carbon.name=Carbon Plate -item.techreborn.plate.coal.name=Coal Plate -item.techreborn.plate.chrome.name=Chrome Plate -item.techreborn.plate.copper.name=Copper Plate -item.techreborn.plate.diamond.name=Diamond Plate -item.techreborn.plate.electrum.name=Electrum Plate -item.techreborn.plate.emerald.name=Emerald Plate -item.techreborn.plate.gold.name=Gold Plate -item.techreborn.plate.invar.name=Invar Plate -item.techreborn.plate.iridium.name=Iridium Plate -item.techreborn.plate.iron.name=Iron Plate -item.techreborn.plate.lapis.name=Lapis Lazuli Plate -item.techreborn.plate.lead.name=Lead Plate -item.techreborn.plate.nickel.name=Nickel Plate -item.techreborn.plate.obsidian.name=Obsidian Plate -item.techreborn.plate.peridot.name=Peridot Plate -item.techreborn.plate.platinum.name=Platinum Plate -item.techreborn.plate.red_garnet.name=Red Garnet Plate -item.techreborn.plate.redstone.name=Redstone Plate -item.techreborn.plate.ruby.name=Ruby Plate -item.techreborn.plate.sapphire.name=Sapphire Plate -item.techreborn.plate.silicon.name=Silicon Plate -item.techreborn.plate.silver.name=Silver Plate -item.techreborn.plate.steel.name=Steel Plate -item.techreborn.plate.teslatite.name=Teslatite Plate -item.techreborn.plate.tin.name=Tin Plate -item.techreborn.plate.titanium.name=Titanium Plate -item.techreborn.plate.tungsten.name=Tungsten Plate -item.techreborn.plate.hot_tungstensteel.name=Hot Tungstensteel Plate -item.techreborn.plate.tungstensteel.name=Tungstensteel Plate -item.techreborn.plate.yellow_garnet.name=Yellow Garnet Plate -item.techreborn.plate.zinc.name=Zinc Plate -item.techreborn.plate.refined_iron.name=Refined Iron Plate -item.techreborn.plate.wood.name=Wooden Plate -item.techreborn.plate.advanced_alloy.name=Advanced Alloy -item.techreborn.plate.lazurite.name=Lazurite Plate +item.techreborn:plate.aluminum.name=Aluminium Plate +item.techreborn:plate.brass.name=Brass Plate +item.techreborn:plate.bronze.name=Bronze Plate +item.techreborn:plate.carbon.name=Carbon Plate +item.techreborn:plate.coal.name=Coal Plate +item.techreborn:plate.chrome.name=Chrome Plate +item.techreborn:plate.copper.name=Copper Plate +item.techreborn:plate.diamond.name=Diamond Plate +item.techreborn:plate.electrum.name=Electrum Plate +item.techreborn:plate.emerald.name=Emerald Plate +item.techreborn:plate.gold.name=Gold Plate +item.techreborn:plate.invar.name=Invar Plate +item.techreborn:plate.iridium.name=Iridium Plate +item.techreborn:plate.iron.name=Iron Plate +item.techreborn:plate.lapis.name=Lapis Lazuli Plate +item.techreborn:plate.lead.name=Lead Plate +item.techreborn:plate.nickel.name=Nickel Plate +item.techreborn:plate.obsidian.name=Obsidian Plate +item.techreborn:plate.peridot.name=Peridot Plate +item.techreborn:plate.platinum.name=Platinum Plate +item.techreborn:plate.red_garnet.name=Red Garnet Plate +item.techreborn:plate.redstone.name=Redstone Plate +item.techreborn:plate.ruby.name=Ruby Plate +item.techreborn:plate.sapphire.name=Sapphire Plate +item.techreborn:plate.silicon.name=Silicon Plate +item.techreborn:plate.silver.name=Silver Plate +item.techreborn:plate.steel.name=Steel Plate +item.techreborn:plate.teslatite.name=Teslatite Plate +item.techreborn:plate.tin.name=Tin Plate +item.techreborn:plate.titanium.name=Titanium Plate +item.techreborn:plate.tungsten.name=Tungsten Plate +item.techreborn:plate.hot_tungstensteel.name=Hot Tungstensteel Plate +item.techreborn:plate.tungstensteel.name=Tungstensteel Plate +item.techreborn:plate.yellow_garnet.name=Yellow Garnet Plate +item.techreborn:plate.zinc.name=Zinc Plate +item.techreborn:plate.refined_iron.name=Refined Iron Plate +item.techreborn:plate.wood.name=Wooden Plate +item.techreborn:plate.advanced_alloy.name=Advanced Alloy +item.techreborn:plate.lazurite.name=Lazurite Plate #Parts -item.techreborn.part.energy_flow_circuit.name=Energy Flow Circuit -item.techreborn.part.data_control_circuit.name=Data Control Circuit -item.techreborn.part.data_orb.name=Data Orb -item.techreborn.part.data_storage_circuit.name=Data Storage Circuit -item.techreborn.part.diamond_grinding_head.name=Diamond Grinding Head -item.techreborn.part.diamond_saw_blade.name=Diamond Saw Blade -item.techreborn.part.tungsten_grinding_head.name=Tungsten Grinding Head -item.techreborn.part.helium_coolant_simple.name=60k Helium Coolant Cell -item.techreborn.part.helium_coolant_triple.name=180k Helium Coolant Cell -item.techreborn.part.helium_coolant_six.name=360k Helium Coolant Cell -item.techreborn.part.nak_coolant_simple.name=60k nak Coolant Cell -item.techreborn.part.nak_coolant_triple.name=180k nak Coolant Cell -item.techreborn.part.nak_coolant_six.name=360k nak Coolant Cell -item.techreborn.part.cupronickel_heating_coil.name=Cupronickel Heating Coil -item.techreborn.part.nichrome_heating_coil.name=Nichrome Heating Coil -item.techreborn.part.kanthal_heating_coil.name=Kanthal Heating Coil -item.techreborn.part.super_conductor.name=Superconductor -item.techreborn.part.thorium_cell.name=Fuel Rod (Thorium) -item.techreborn.part.double_thorium_cell.name=Dual Fuel Rod (Thorium) -item.techreborn.part.quad_thorium_cell.name=Quad Fuel Rod (Thorium) -item.techreborn.part.plutonium_cell.name=Fuel Rod (Plutonium) -item.techreborn.part.double_plutonium_cell.name=Dual Fuel Rod (Plutonium) -item.techreborn.part.quad_plutonium_cell.name=Quad Fuel Rod (Plutonium) -item.techreborn.part.iridium_neutron_reflector.name=Iridium Neutron Reflector -item.techreborn.part.computer_monitor.name=Computer Monitor -item.techreborn.part.machine_parts.name=Machine Parts -item.techreborn.part.neutron_reflector.name=Neutron Reflector -item.techreborn.part.thick_neutron_reflector.name=Thick Neutron Reflector -item.techreborn.part.sap.name=Sap -item.techreborn.part.rubber.name=Rubber -item.techreborn.part.scrap.name=Scrap -item.techreborn.part.electronic_circuit.name=Electronic Circuit -item.techreborn.part.advanced_circuit.name=Advanced Electronic Circuit -item.techreborn.part.coolant_simple.name=10k Coolant Cell -item.techreborn.part.coolant_triple.name=30k Coolant Cell -item.techreborn.part.coolant_six.name=60k Coolant Cell +item.techreborn:part.energy_flow_circuit.name=Energy Flow Circuit +item.techreborn:part.data_control_circuit.name=Data Control Circuit +item.techreborn:part.data_orb.name=Data Orb +item.techreborn:part.data_storage_circuit.name=Data Storage Circuit +item.techreborn:part.diamond_grinding_head.name=Diamond Grinding Head +item.techreborn:part.diamond_saw_blade.name=Diamond Saw Blade +item.techreborn:part.tungsten_grinding_head.name=Tungsten Grinding Head +item.techreborn:part.helium_coolant_simple.name=60k Helium Coolant Cell +item.techreborn:part.helium_coolant_triple.name=180k Helium Coolant Cell +item.techreborn:part.helium_coolant_six.name=360k Helium Coolant Cell +item.techreborn:part.nak_coolant_simple.name=60k nak Coolant Cell +item.techreborn:part.nak_coolant_triple.name=180k nak Coolant Cell +item.techreborn:part.nak_coolant_six.name=360k nak Coolant Cell +item.techreborn:part.cupronickel_heating_coil.name=Cupronickel Heating Coil +item.techreborn:part.nichrome_heating_coil.name=Nichrome Heating Coil +item.techreborn:part.kanthal_heating_coil.name=Kanthal Heating Coil +item.techreborn:part.super_conductor.name=Superconductor +item.techreborn:part.thorium_cell.name=Fuel Rod (Thorium) +item.techreborn:part.double_thorium_cell.name=Dual Fuel Rod (Thorium) +item.techreborn:part.quad_thorium_cell.name=Quad Fuel Rod (Thorium) +item.techreborn:part.plutonium_cell.name=Fuel Rod (Plutonium) +item.techreborn:part.double_plutonium_cell.name=Dual Fuel Rod (Plutonium) +item.techreborn:part.quad_plutonium_cell.name=Quad Fuel Rod (Plutonium) +item.techreborn:part.iridium_neutron_reflector.name=Iridium Neutron Reflector +item.techreborn:part.computer_monitor.name=Computer Monitor +item.techreborn:part.machine_parts.name=Machine Parts +item.techreborn:part.neutron_reflector.name=Neutron Reflector +item.techreborn:part.thick_neutron_reflector.name=Thick Neutron Reflector +item.techreborn:part.sap.name=Sap +item.techreborn:part.rubber.name=Rubber +item.techreborn:part.scrap.name=Scrap +item.techreborn:part.electronic_circuit.name=Electronic Circuit +item.techreborn:part.advanced_circuit.name=Advanced Electronic Circuit +item.techreborn:part.coolant_simple.name=10k Coolant Cell +item.techreborn:part.coolant_triple.name=30k Coolant Cell +item.techreborn:part.coolant_six.name=60k Coolant Cell -item.techreborn.frequencyTransmitter.name=Frequency Transmitter +item.techreborn:frequencyTransmitter.name=Frequency Transmitter #Tools -item.techreborn.rockcutter.name=Rockcutter -item.techreborn.lithiumbatpack.name=Lithium Batpack -item.techreborn.lapotronpack.name=Lapotronic Orbpack -item.techreborn.omniTool.name=Omni-Tool -item.techreborn.ironDrill.name=Steel Drill -item.techreborn.diamondDrill.name=Diamond Drill -item.techreborn.advancedDrill.name=Advanced Drill -item.techreborn.ironChainsaw.name=Steel Chainsaw -item.techreborn.diamondChainsaw.name=Diamond Chainsaw -item.techreborn.advancedChainsaw.name=Advanced Chainsaw -item.techreborn.lapotronicorb.name=Lapotronic Energy Orb -item.techreborn.cloakingdevice.name=Cloaking Device -item.techreborn.steelJackhammer.name=Steel Jackhammer -item.techreborn.diamondJackhammer.name=Diamond Jackhammer -item.techreborn.advancedJackhammer.name=Advanced Jackhammer +item.techreborn:rockcutter.name=Rockcutter +item.techreborn:lithiumbatpack.name=Lithium Batpack +item.techreborn:lapotronpack.name=Lapotronic Orbpack +item.techreborn:omniTool.name=Omni-Tool +item.techreborn:ironDrill.name=Steel Drill +item.techreborn:diamondDrill.name=Diamond Drill +item.techreborn:advancedDrill.name=Advanced Drill +item.techreborn:ironChainsaw.name=Steel Chainsaw +item.techreborn:diamondChainsaw.name=Diamond Chainsaw +item.techreborn:advancedChainsaw.name=Advanced Chainsaw +item.techreborn:lapotronicorb.name=Lapotronic Energy Orb +item.techreborn:cloakingdevice.name=Cloaking Device +item.techreborn:steelJackhammer.name=Steel Jackhammer +item.techreborn:diamondJackhammer.name=Diamond Jackhammer +item.techreborn:advancedJackhammer.name=Advanced Jackhammer item.bronzeSword.name=Bronze Sword item.bronzePickaxe.name=Bronze Pickaxe @@ -620,251 +613,251 @@ fluid.fluidtritium=Tritium fluid.fluidwolframium=Wolframium #Items -item.techreborn.uuMatter.name=UU-Matter -item.techreborn.manual.name=Tech Manual -item.techreborn.debug.name=Debug Tool +item.techreborn:uuMatter.name=UU-Matter +item.techreborn:manual.name=Tech Manual +item.techreborn:debug.name=Debug Tool #Configs -config.techreborn.allow.galenaOre=Allow Galena Ore -config.techreborn.allow.galenaOre.tooltip=Decide whether Galena Ore spawns or not -config.techreborn.allow.iridiumOre=Allow Iridium Ore -config.techreborn.allow.iridiumOre.tooltip=Decide whether Iridium Ore spawns or not -config.techreborn.allow.rubyOre=Allow Ruby Ore -config.techreborn.allow.rubyOre.tooltip=Decide whether Ruby Ore spawns or not -config.techreborn.allow.sapphireOre=Allow Sapphire Ore -config.techreborn.allow.sapphireOre.tooltip=Decide whether Sapphire Ore spawns or not -config.techreborn.allow.bauxiteOre=Allow Bauxite Ore -config.techreborn.allow.bauxiteOre.tooltip=Decide whether Bauxite Ore spawns or not -config.techreborn.allow.copperOre=Allow Copper Ore -config.techreborn.allow.copperOre.tooltip=Decide whether Copper Ore spawns or not -config.techreborn.allow.tinOre=Allow Tin Ore -config.techreborn.allow.tinOre.tooltip=Decide whether Tin Ore spawns or not -config.techreborn.allow.leadOre=Allow Lead Ore -config.techreborn.allow.leadOre.tooltip=Decide whether Lead Ore spawns or not -config.techreborn.allow.silverOre=Allow Silver Ore -config.techreborn.allow.silverOre.tooltip=Decide whether Silver Ore spawns or not -config.techreborn.allow.pyriteOre=Allow Pyrite Ore -config.techreborn.allow.pyriteOre.tooltip=Decide whether Pyrite Ore spawns or not -config.techreborn.allow.cinnabarOre=Allow Cinnabar Ore -config.techreborn.allow.cinnabarOre.tooltip=Decide whether Cinnabar Ore spawns or not -config.techreborn.allow.sphaleriteOre=Allow Sphalerite Ore -config.techreborn.allow.sphaleriteOre.tooltip=Decide whether Sphalerite Ore spawns or not -config.techreborn.allow.tungstenOre=Allow Tungsten Ore -config.techreborn.allow.tungstenOre.tooltip=Decide whether Tungsten Ore spawns or not -config.techreborn.allow.sheldoniteOre=Allow Sheldonite Ore -config.techreborn.allow.sheldoniteOre.tooltip=Decide whether Sheldonite Ore spawns or not -config.techreborn.allow.olivineOre=Allow Olivine Ore -config.techreborn.allow.olivineOre.tooltip=Decide whether Olivine Ore spawns or not -config.techreborn.allow.sodaliteOre=Allow Sodalite Ore -config.techreborn.allow.sodaliteOre.tooltip=Decide whether Sodalite Ore spawns or not +config.techreborn:allow.galenaOre=Allow Galena Ore +config.techreborn:allow.galenaOre.tooltip=Decide whether Galena Ore spawns or not +config.techreborn:allow.iridiumOre=Allow Iridium Ore +config.techreborn:allow.iridiumOre.tooltip=Decide whether Iridium Ore spawns or not +config.techreborn:allow.rubyOre=Allow Ruby Ore +config.techreborn:allow.rubyOre.tooltip=Decide whether Ruby Ore spawns or not +config.techreborn:allow.sapphireOre=Allow Sapphire Ore +config.techreborn:allow.sapphireOre.tooltip=Decide whether Sapphire Ore spawns or not +config.techreborn:allow.bauxiteOre=Allow Bauxite Ore +config.techreborn:allow.bauxiteOre.tooltip=Decide whether Bauxite Ore spawns or not +config.techreborn:allow.copperOre=Allow Copper Ore +config.techreborn:allow.copperOre.tooltip=Decide whether Copper Ore spawns or not +config.techreborn:allow.tinOre=Allow Tin Ore +config.techreborn:allow.tinOre.tooltip=Decide whether Tin Ore spawns or not +config.techreborn:allow.leadOre=Allow Lead Ore +config.techreborn:allow.leadOre.tooltip=Decide whether Lead Ore spawns or not +config.techreborn:allow.silverOre=Allow Silver Ore +config.techreborn:allow.silverOre.tooltip=Decide whether Silver Ore spawns or not +config.techreborn:allow.pyriteOre=Allow Pyrite Ore +config.techreborn:allow.pyriteOre.tooltip=Decide whether Pyrite Ore spawns or not +config.techreborn:allow.cinnabarOre=Allow Cinnabar Ore +config.techreborn:allow.cinnabarOre.tooltip=Decide whether Cinnabar Ore spawns or not +config.techreborn:allow.sphaleriteOre=Allow Sphalerite Ore +config.techreborn:allow.sphaleriteOre.tooltip=Decide whether Sphalerite Ore spawns or not +config.techreborn:allow.tungstenOre=Allow Tungsten Ore +config.techreborn:allow.tungstenOre.tooltip=Decide whether Tungsten Ore spawns or not +config.techreborn:allow.sheldoniteOre=Allow Sheldonite Ore +config.techreborn:allow.sheldoniteOre.tooltip=Decide whether Sheldonite Ore spawns or not +config.techreborn:allow.olivineOre=Allow Olivine Ore +config.techreborn:allow.olivineOre.tooltip=Decide whether Olivine Ore spawns or not +config.techreborn:allow.sodaliteOre=Allow Sodalite Ore +config.techreborn:allow.sodaliteOre.tooltip=Decide whether Sodalite Ore spawns or not -config.techreborn.fortuneSecondaryOreMultiplierPerLevel=Fortune's Effect on Secondaries -config.techreborn.fortuneSecondaryOreMultiplierPerLevel.tooltip=How much of an increase should each level of fortune have on secondary ore drops? +config.techreborn:fortuneSecondaryOreMultiplierPerLevel=Fortune's Effect on Secondaries +config.techreborn:fortuneSecondaryOreMultiplierPerLevel.tooltip=How much of an increase should each level of fortune have on secondary ore drops? -config.techreborn.allowExpensiveMacerator=Allow Expensive Macerator -config.techreborn.allowExpensiveMacerator.tooltip= -config.techreborn.allowExpensiveDrill=Allow Expensive Drill -config.techreborn.allowExpensiveDrill.tooltip= -config.techreborn.allowExpensiveDiamondDrill=Allow Expensive Diamond Drill -config.techreborn.allowExpensiveDiamondDrill.tooltip= -config.techreborn.allowExpensiveSolarPanels=Allow Expensive Solar Panels -config.techreborn.allowExpensiveSolarPanels.tooltip= +config.techreborn:allowExpensiveMacerator=Allow Expensive Macerator +config.techreborn:allowExpensiveMacerator.tooltip= +config.techreborn:allowExpensiveDrill=Allow Expensive Drill +config.techreborn:allowExpensiveDrill.tooltip= +config.techreborn:allowExpensiveDiamondDrill=Allow Expensive Diamond Drill +config.techreborn:allowExpensiveDiamondDrill.tooltip= +config.techreborn:allowExpensiveSolarPanels=Allow Expensive Solar Panels +config.techreborn:allowExpensiveSolarPanels.tooltip= -config.techreborn.advancedDrillTier=Advanced Drill Power Tier -config.techreborn.advancedDrillTier.tooltip= -config.techreborn.lapotronPackTier=Lapotron Pack Power Tier -config.techreborn.lapotronPackTier.tooltip= -config.techreborn.lithiumBatpackTier=Lithium Batpack Power Tier -config.techreborn.lithiumBatpackTier.tooltip= -config.techreborn.omniToolTier=OmniTool Tier -config.techreborn.omniToolTier.tooltip= -config.techreborn.rockCutterTier=Rock Cutter Power Tier -config.techreborn.rockCutterTier.tooltip= -config.techreborn.gravityChestplateTier=Gravity Chestplates Power Tier -config.techreborn.gravityChestplateTier.tooltip= -config.techreborn.centrifugeTier=Centrifuge Power Tier -config.techreborn.centrifugeTier.tooltip= -config.techreborn.thermalGeneratorTier=Thermal Generator Power Tier -config.techreborn.thermalGeneratorTier.tooltip= +config.techreborn:advancedDrillTier=Advanced Drill Power Tier +config.techreborn:advancedDrillTier.tooltip= +config.techreborn:lapotronPackTier=Lapotron Pack Power Tier +config.techreborn:lapotronPackTier.tooltip= +config.techreborn:lithiumBatpackTier=Lithium Batpack Power Tier +config.techreborn:lithiumBatpackTier.tooltip= +config.techreborn:omniToolTier=OmniTool Tier +config.techreborn:omniToolTier.tooltip= +config.techreborn:rockCutterTier=Rock Cutter Power Tier +config.techreborn:rockCutterTier.tooltip= +config.techreborn:gravityChestplateTier=Gravity Chestplates Power Tier +config.techreborn:gravityChestplateTier.tooltip= +config.techreborn:centrifugeTier=Centrifuge Power Tier +config.techreborn:centrifugeTier.tooltip= +config.techreborn:thermalGeneratorTier=Thermal Generator Power Tier +config.techreborn:thermalGeneratorTier.tooltip= -config.techreborn.thermalGeneratorPower=Thermal Generator Output -config.techreborn.thermalGeneratorPower.tooltip= -config.techreborn.centrifugePowerUsage=Centrifuge Input per tick -config.techreborn.centrifugePowerUsage.tooltip= +config.techreborn:thermalGeneratorPower=Thermal Generator Output +config.techreborn:thermalGeneratorPower.tooltip= +config.techreborn:centrifugePowerUsage=Centrifuge Input per tick +config.techreborn:centrifugePowerUsage.tooltip= -config.techreborn.advancedDrillMaxCharge=Maximum charge for Advanced Drill -config.techreborn.advancedDrillMaxCharge.tooltip= -config.techreborn.lapotronPackMaxCharge=Maximum charge for -config.techreborn.lapotronPackMaxCharge.tooltip= -config.techreborn.omniToolMaxCharge=Maximum charge for -config.techreborn.omniToolMaxCharge.tooltip= -config.techreborn.lithiumBatpackMaxCharge=Maximum charge for Lithium Batpack -config.techreborn.lithiumBatpackMaxCharge.tooltip= -config.techreborn.rockCutterMaxCharge=Maximum charge for Rock Cutter -config.techreborn.rockCutterMaxCharge.tooltip= -config.techreborn.gravityChestplateMaxCharge=Maximum charge for Gravity Chestplate -config.techreborn.gravityChestplateMaxCharge.tooltip= -config.techreborn.centrifugeMaxCharge=Maximum charge for Centrifuge -config.techreborn.centrifugeMaxCharge.tooltip= -config.techreborn.thermalGeneratorMaxCharge=Maximum charge for Thermal Generator -config.techreborn.thermalGeneratorMaxCharge.tooltip= -config.techreborn.aveargeEuOutTickTim=Eu out time -config.techreborn.aveargeEuOutTickTime.tooltip=How often in ticks to update the eu out -config.techreborn.euPerRF=EU Conversion -config.techreborn.euPerRF.tooltip=The amount of RF that equal 1 EU. 4 by default, so 4RF == 1EU and .25EU == 1RF -config.techreborn.farmeu=Farm EU per Tick -config.techreborn.farmeu.tooltip=Amount of eu used per tick by the farm -config.techreborn.enableRF=Enable RF support -config.techreborn.enableRF.tooltip= Enable RF support for all machines. -config.techreborn.enableEU=Enable EU support -config.techreborn.enableEU.tooltip= Enable EU support for all machines. -config.techreborn.connectTextures=Enable Connected textures -config.techreborn.connectTextures.tooltip= Enable Connected textures -config.techreborn.rainExplosions=Enable machine explosions when rain hits -config.techreborn.rainExplosions.tooltip= When this is enabled machines will explode when they come in contact with rain. -config.techreborn.allowExpensiveWatermill.tooltip= Allow Expensive Watermill -config.techreborn.allowExpensiveWindmill.tooltip= Allow Expensive Watermill -config.techreborn.allowBopRecipes.tooltip= Allow BOP Recipes -config.techreborn.allowForestryRecipes.tooltip= Allow Forestry Recipes -config.techreborn.allowNaturaRecipes.tooltip= Allow Natura Recipes -config.techreborn.aesuMaxOutput.tooltip= AESU max output -config.techreborn.aesuMaxStorage.tooltip= AESU max storage -config.techreborn.baseLesuOutput.tooltip= Base LESU output -config.techreborn.cloakingDeviceEUTick.tooltip= Cloaking Device Eu/Tick -config.techreborn.cloakingDeviceMaxCharge.tooltip= Cloaking Device Max Charge -config.techreborn.cloakingDeviceTier.tooltip= Cloaking Device Tier -config.techreborn.dragoneggsiphonerPower.tooltip=Dragon Egg Siphoner Eu/Tick -config.techreborn.extraOutputPerLesuBlock.tooltip= LESU Storage Block extra output -config.techreborn.lapotronicOrbMaxCharge= Lapotronic Orb Max Charge -config.techreborn.lapotronicOrbTier.tooltip= Lapatronic Orb Tier -config.techreborn.lesuStoragePerBlock.tooltip= LESU Storage Block extra output -config.techreborn.showChargehud.tooltip=Show Charge Hud +config.techreborn:advancedDrillMaxCharge=Maximum charge for Advanced Drill +config.techreborn:advancedDrillMaxCharge.tooltip= +config.techreborn:lapotronPackMaxCharge=Maximum charge for +config.techreborn:lapotronPackMaxCharge.tooltip= +config.techreborn:omniToolMaxCharge=Maximum charge for +config.techreborn:omniToolMaxCharge.tooltip= +config.techreborn:lithiumBatpackMaxCharge=Maximum charge for Lithium Batpack +config.techreborn:lithiumBatpackMaxCharge.tooltip= +config.techreborn:rockCutterMaxCharge=Maximum charge for Rock Cutter +config.techreborn:rockCutterMaxCharge.tooltip= +config.techreborn:gravityChestplateMaxCharge=Maximum charge for Gravity Chestplate +config.techreborn:gravityChestplateMaxCharge.tooltip= +config.techreborn:centrifugeMaxCharge=Maximum charge for Centrifuge +config.techreborn:centrifugeMaxCharge.tooltip= +config.techreborn:thermalGeneratorMaxCharge=Maximum charge for Thermal Generator +config.techreborn:thermalGeneratorMaxCharge.tooltip= +config.techreborn:aveargeEuOutTickTim=Eu out time +config.techreborn:aveargeEuOutTickTime.tooltip=How often in ticks to update the eu out +config.techreborn:euPerRF=EU Conversion +config.techreborn:euPerRF.tooltip=The amount of RF that equal 1 EU. 4 by default, so 4RF == 1EU and .25EU == 1RF +config.techreborn:farmeu=Farm EU per Tick +config.techreborn:farmeu.tooltip=Amount of eu used per tick by the farm +config.techreborn:enableRF=Enable RF support +config.techreborn:enableRF.tooltip= Enable RF support for all machines. +config.techreborn:enableEU=Enable EU support +config.techreborn:enableEU.tooltip= Enable EU support for all machines. +config.techreborn:connectTextures=Enable Connected textures +config.techreborn:connectTextures.tooltip= Enable Connected textures +config.techreborn:rainExplosions=Enable machine explosions when rain hits +config.techreborn:rainExplosions.tooltip= When this is enabled machines will explode when they come in contact with rain. +config.techreborn:allowExpensiveWatermill.tooltip= Allow Expensive Watermill +config.techreborn:allowExpensiveWindmill.tooltip= Allow Expensive Watermill +config.techreborn:allowBopRecipes.tooltip= Allow BOP Recipes +config.techreborn:allowForestryRecipes.tooltip= Allow Forestry Recipes +config.techreborn:allowNaturaRecipes.tooltip= Allow Natura Recipes +config.techreborn:aesuMaxOutput.tooltip= AESU max output +config.techreborn:aesuMaxStorage.tooltip= AESU max storage +config.techreborn:baseLesuOutput.tooltip= Base LESU output +config.techreborn:cloakingDeviceEUTick.tooltip= Cloaking Device Eu/Tick +config.techreborn:cloakingDeviceMaxCharge.tooltip= Cloaking Device Max Charge +config.techreborn:cloakingDeviceTier.tooltip= Cloaking Device Tier +config.techreborn:dragoneggsiphonerPower.tooltip=Dragon Egg Siphoner Eu/Tick +config.techreborn:extraOutputPerLesuBlock.tooltip= LESU Storage Block extra output +config.techreborn:lapotronicOrbMaxCharge= Lapotronic Orb Max Charge +config.techreborn:lapotronicOrbTier.tooltip= Lapatronic Orb Tier +config.techreborn:lesuStoragePerBlock.tooltip= LESU Storage Block extra output +config.techreborn:showChargehud.tooltip=Show Charge Hud #Config UU -config.techreborn.allow.UUrecipesAluminumDust= Allow UU recipes for AluminiumDust -config.techreborn.allow.UUrecipesCoal= Allow UU recipes for Coal -config.techreborn.allow.UUrecipesCopperDust= Allow UU recipes for Copper Dust -config.techreborn.allow.UUrecipesDiamond= Allow UU recipes for Diamond -config.techreborn.allow.UUrecipesEmerald= Allow UU recipes for Emerald -config.techreborn.allow.UUrecipesEmeraldOre= Allow UU recipes for Emerald Ore -config.techreborn.allow.UUrecipesGoldDust= Allow UU recipes for Gold Dust -config.techreborn.allow.UUrecipesGoldOre= Allow UU recipes for Gold Ore -config.techreborn.allow.UUrecipesIronDust= Allow UU recipes for Iron Dust -config.techreborn.allow.UUrecipesIronOre= Allow UU recipes for Iron Ore -config.techreborn.allow.UUrecipesLapis= Allow UU recipes for Lapis -config.techreborn.allow.UUrecipesLeadDust= Allow UU recipes for Lapis dust -config.techreborn.allow.UUrecipesPlatinumDust= Allow UU recipes for Platinum Dust -config.techreborn.allow.UUrecipesRedStone= Allow UU recipes for Redstone -config.techreborn.allow.UUrecipesResin= Allow UU recipes for Sticky Resin -config.techreborn.allow.UUrecipesTinDust= Allow UU recipes for Tin Dust -config.techreborn.allow.UUrecipesTitaniumDust= Allow UU recipes for Titanium Dust -config.techreborn.allow.UUrecipesTungstenDust= Allow UU recipes for Tungsten Dust -config.techreborn.allow.uurecipesBone= Allow UU recipes for Bone -config.techreborn.allow.uurecipesCactus= Allow UU recipes for Cactus -config.techreborn.allow.uurecipesCocoa= Allow UU recipes for Cocoa -config.techreborn.allow.uurecipesEnderPearl= Allow UU recipes for Ender Pearl -config.techreborn.allow.uurecipesFeather= Allow UU recipes for Feather -config.techreborn.allow.uurecipesGlass= Allow UU recipes for Glass -config.techreborn.allow.uurecipesGlowstoneBlock= Allow UU recipes for Glowstone Blocks -config.techreborn.allow.uurecipesGrass= Allow UU recipes for Grass -config.techreborn.allow.uurecipesInk= Allow UU recipes for Ink Sacks -config.techreborn.allow.uurecipesIridiamOre= Allow UU recipes for IridiamOre -config.techreborn.allow.uurecipesLava= Allow UU recipes for Lava -config.techreborn.allow.uurecipesLilypad= Allow UU recipes for Lilypad -config.techreborn.allow.uurecipesObsidian= Allow UU recipes for Obsidian -config.techreborn.allow.uurecipesSnowBall= Allow UU recipes for Snowball -config.techreborn.allow.uurecipesSnowBlock= Allow UU recipes for SnowBlock -config.techreborn.allow.uurecipesStone= Allow UU recipes for Stone -config.techreborn.allow.uurecipesSugarCane= Allow UU recipes for SugarCane -config.techreborn.allow.uurecipesVine= Allow UU recipes for Vine -config.techreborn.allow.uurecipesWater= Allow UU recipes for Water -config.techreborn.allow.uurecipesWood= Allow UU recipes for Wood +config.techreborn:allow.UUrecipesAluminumDust= Allow UU recipes for AluminiumDust +config.techreborn:allow.UUrecipesCoal= Allow UU recipes for Coal +config.techreborn:allow.UUrecipesCopperDust= Allow UU recipes for Copper Dust +config.techreborn:allow.UUrecipesDiamond= Allow UU recipes for Diamond +config.techreborn:allow.UUrecipesEmerald= Allow UU recipes for Emerald +config.techreborn:allow.UUrecipesEmeraldOre= Allow UU recipes for Emerald Ore +config.techreborn:allow.UUrecipesGoldDust= Allow UU recipes for Gold Dust +config.techreborn:allow.UUrecipesGoldOre= Allow UU recipes for Gold Ore +config.techreborn:allow.UUrecipesIronDust= Allow UU recipes for Iron Dust +config.techreborn:allow.UUrecipesIronOre= Allow UU recipes for Iron Ore +config.techreborn:allow.UUrecipesLapis= Allow UU recipes for Lapis +config.techreborn:allow.UUrecipesLeadDust= Allow UU recipes for Lapis dust +config.techreborn:allow.UUrecipesPlatinumDust= Allow UU recipes for Platinum Dust +config.techreborn:allow.UUrecipesRedStone= Allow UU recipes for Redstone +config.techreborn:allow.UUrecipesResin= Allow UU recipes for Sticky Resin +config.techreborn:allow.UUrecipesTinDust= Allow UU recipes for Tin Dust +config.techreborn:allow.UUrecipesTitaniumDust= Allow UU recipes for Titanium Dust +config.techreborn:allow.UUrecipesTungstenDust= Allow UU recipes for Tungsten Dust +config.techreborn:allow.uurecipesBone= Allow UU recipes for Bone +config.techreborn:allow.uurecipesCactus= Allow UU recipes for Cactus +config.techreborn:allow.uurecipesCocoa= Allow UU recipes for Cocoa +config.techreborn:allow.uurecipesEnderPearl= Allow UU recipes for Ender Pearl +config.techreborn:allow.uurecipesFeather= Allow UU recipes for Feather +config.techreborn:allow.uurecipesGlass= Allow UU recipes for Glass +config.techreborn:allow.uurecipesGlowstoneBlock= Allow UU recipes for Glowstone Blocks +config.techreborn:allow.uurecipesGrass= Allow UU recipes for Grass +config.techreborn:allow.uurecipesInk= Allow UU recipes for Ink Sacks +config.techreborn:allow.uurecipesIridiamOre= Allow UU recipes for IridiamOre +config.techreborn:allow.uurecipesLava= Allow UU recipes for Lava +config.techreborn:allow.uurecipesLilypad= Allow UU recipes for Lilypad +config.techreborn:allow.uurecipesObsidian= Allow UU recipes for Obsidian +config.techreborn:allow.uurecipesSnowBall= Allow UU recipes for Snowball +config.techreborn:allow.uurecipesSnowBlock= Allow UU recipes for SnowBlock +config.techreborn:allow.uurecipesStone= Allow UU recipes for Stone +config.techreborn:allow.uurecipesSugarCane= Allow UU recipes for SugarCane +config.techreborn:allow.uurecipesVine= Allow UU recipes for Vine +config.techreborn:allow.uurecipesWater= Allow UU recipes for Water +config.techreborn:allow.uurecipesWood= Allow UU recipes for Wood #Config Tooltips UU -config.techreborn.allow.UUrecipesAluminumDust.tooltip= Allow UU recipes for AluminiumDust -config.techreborn.allow.UUrecipesCoal.tooltip= Allow UU recipes for Coal -config.techreborn.allow.UUrecipesCopperDust.tooltip= Allow UU recipes for Copper Dust -config.techreborn.allow.UUrecipesDiamond.tooltip= Allow UU recipes for Diamond -config.techreborn.allow.UUrecipesEmerald.tooltip= Allow UU recipes for Emerald -config.techreborn.allow.UUrecipesEmeraldOre.tooltip= Allow UU recipes for Emerald Ore -config.techreborn.allow.UUrecipesGoldDust.tooltip= Allow UU recipes for Gold Dust -config.techreborn.allow.UUrecipesGoldOre.tooltip= Allow UU recipes for Gold Ore -config.techreborn.allow.UUrecipesIronDust.tooltip= Allow UU recipes for Iron Dust -config.techreborn.allow.UUrecipesIronOre.tooltip= Allow UU recipes for Iron Ore -config.techreborn.allow.UUrecipesLapis.tooltip= Allow UU recipes for Lapis -config.techreborn.allow.UUrecipesLeadDust.tooltip= Allow UU recipes for Lapis dust -config.techreborn.allow.UUrecipesPlatinumDust.tooltip= Allow UU recipes for Platinum Dust -config.techreborn.allow.UUrecipesRedStone.tooltip= Allow UU recipes for Redstone -config.techreborn.allow.UUrecipesResin.tooltip= Allow UU recipes for Sticky Resin -config.techreborn.allow.UUrecipesTinDust.tooltip= Allow UU recipes for Tin Dust -config.techreborn.allow.UUrecipesTitaniumDust.tooltip= Allow UU recipes for Titanium Dust -config.techreborn.allow.UUrecipesTungstenDust.tooltip= Allow UU recipes for Tungsten Dust -config.techreborn.allow.hiderecipes.tooltip= Hide UU recipes from NEI -config.techreborn.allow.uurecipesBone.tooltip= Allow UU recipes for Bone -config.techreborn.allow.uurecipesCactus.tooltip= Allow UU recipes for Cactus -config.techreborn.allow.uurecipesCocoa.tooltip= Allow UU recipes for Cocoa -config.techreborn.allow.uurecipesEnderPearl.tooltip= Allow UU recipes for Ender Pearl -config.techreborn.allow.uurecipesFeather.tooltip= Allow UU recipes for Feather -config.techreborn.allow.uurecipesGlass.tooltip= Allow UU recipes for Glass -config.techreborn.allow.uurecipesGlowstoneBlock.tooltip= Allow UU recipes for Glowstone Blocks -config.techreborn.allow.uurecipesGrass.tooltip= Allow UU recipes for Grass -config.techreborn.allow.uurecipesInk.tooltip= Allow UU recipes for Ink Sacks -config.techreborn.allow.uurecipesIridiamOre.tooltip= Allow UU recipes for IridiamOre -config.techreborn.allow.uurecipesLava.tooltip= Allow UU recipes for Lava -config.techreborn.allow.uurecipesLilypad.tooltip= Allow UU recipes for Lilypad -config.techreborn.allow.uurecipesObsidian.tooltip= Allow UU recipes for Obsidian -config.techreborn.allow.uurecipesSnowBall.tooltip= Allow UU recipes for Snowball -config.techreborn.allow.uurecipesSnowBlock.tooltip= Allow UU recipes for SnowBlock -config.techreborn.allow.uurecipesStone.tooltip= Allow UU recipes for Stone -config.techreborn.allow.uurecipesSugarCane.tooltip= Allow UU recipes for SugarCane -config.techreborn.allow.uurecipesVine.tooltip= Allow UU recipes for Vine -config.techreborn.allow.uurecipesWater.tooltip= Allow UU recipes for Water -config.techreborn.allow.uurecipesWood.tooltip= Allow UU recipes for Wood +config.techreborn:allow.UUrecipesAluminumDust.tooltip= Allow UU recipes for AluminiumDust +config.techreborn:allow.UUrecipesCoal.tooltip= Allow UU recipes for Coal +config.techreborn:allow.UUrecipesCopperDust.tooltip= Allow UU recipes for Copper Dust +config.techreborn:allow.UUrecipesDiamond.tooltip= Allow UU recipes for Diamond +config.techreborn:allow.UUrecipesEmerald.tooltip= Allow UU recipes for Emerald +config.techreborn:allow.UUrecipesEmeraldOre.tooltip= Allow UU recipes for Emerald Ore +config.techreborn:allow.UUrecipesGoldDust.tooltip= Allow UU recipes for Gold Dust +config.techreborn:allow.UUrecipesGoldOre.tooltip= Allow UU recipes for Gold Ore +config.techreborn:allow.UUrecipesIronDust.tooltip= Allow UU recipes for Iron Dust +config.techreborn:allow.UUrecipesIronOre.tooltip= Allow UU recipes for Iron Ore +config.techreborn:allow.UUrecipesLapis.tooltip= Allow UU recipes for Lapis +config.techreborn:allow.UUrecipesLeadDust.tooltip= Allow UU recipes for Lapis dust +config.techreborn:allow.UUrecipesPlatinumDust.tooltip= Allow UU recipes for Platinum Dust +config.techreborn:allow.UUrecipesRedStone.tooltip= Allow UU recipes for Redstone +config.techreborn:allow.UUrecipesResin.tooltip= Allow UU recipes for Sticky Resin +config.techreborn:allow.UUrecipesTinDust.tooltip= Allow UU recipes for Tin Dust +config.techreborn:allow.UUrecipesTitaniumDust.tooltip= Allow UU recipes for Titanium Dust +config.techreborn:allow.UUrecipesTungstenDust.tooltip= Allow UU recipes for Tungsten Dust +config.techreborn:allow.hiderecipes.tooltip= Hide UU recipes from NEI +config.techreborn:allow.uurecipesBone.tooltip= Allow UU recipes for Bone +config.techreborn:allow.uurecipesCactus.tooltip= Allow UU recipes for Cactus +config.techreborn:allow.uurecipesCocoa.tooltip= Allow UU recipes for Cocoa +config.techreborn:allow.uurecipesEnderPearl.tooltip= Allow UU recipes for Ender Pearl +config.techreborn:allow.uurecipesFeather.tooltip= Allow UU recipes for Feather +config.techreborn:allow.uurecipesGlass.tooltip= Allow UU recipes for Glass +config.techreborn:allow.uurecipesGlowstoneBlock.tooltip= Allow UU recipes for Glowstone Blocks +config.techreborn:allow.uurecipesGrass.tooltip= Allow UU recipes for Grass +config.techreborn:allow.uurecipesInk.tooltip= Allow UU recipes for Ink Sacks +config.techreborn:allow.uurecipesIridiamOre.tooltip= Allow UU recipes for IridiamOre +config.techreborn:allow.uurecipesLava.tooltip= Allow UU recipes for Lava +config.techreborn:allow.uurecipesLilypad.tooltip= Allow UU recipes for Lilypad +config.techreborn:allow.uurecipesObsidian.tooltip= Allow UU recipes for Obsidian +config.techreborn:allow.uurecipesSnowBall.tooltip= Allow UU recipes for Snowball +config.techreborn:allow.uurecipesSnowBlock.tooltip= Allow UU recipes for SnowBlock +config.techreborn:allow.uurecipesStone.tooltip= Allow UU recipes for Stone +config.techreborn:allow.uurecipesSugarCane.tooltip= Allow UU recipes for SugarCane +config.techreborn:allow.uurecipesVine.tooltip= Allow UU recipes for Vine +config.techreborn:allow.uurecipesWater.tooltip= Allow UU recipes for Water +config.techreborn:allow.uurecipesWood.tooltip= Allow UU recipes for Wood -config.techreborn.allow.tungstonOre.tooltip= Allow UU recipes for Tungston Ore -config.techreborn.bauxiteOre.rare.tooltip=rarity of Bauxite Ore -config.techreborn.cinnabarOre.rare.tooltip=rarity of Cinnabar Ore -config.techreborn.copperOre.rare.tooltip=rarity of Copper Ore -config.techreborn.galenaOre.rare.tooltip=rarity of Galena Ore -config.techreborn.iridiumOre.rare.tooltip=rarity of Iridium Ore -config.techreborn.leadOre.rare.tooltip=rarity of Lead Ore -config.techreborn.olivineOre.rare.tooltip=rarity of Olivine Ore -config.techreborn.pyriteOre.rare.tooltip=rarity of Pyrite Ore -config.techreborn.rubyOre.rare.tooltip=rarity of Ruby Ore -config.techreborn.sapphireOre.rare.tooltip=rarity of Sapphire Ore -config.techreborn.sheldoniteOre.rare.tooltip=rarity of Sheldonite Ore -config.techreborn.silverOre.rare.tooltip=rarity of Silver Ore -config.techreborn.sodaliteOre.rare.tooltip=rarity of Sodalite Ore -config.techreborn.sphaleriteOre.rare.tooltip=rarity of Sphalerite Ore -config.techreborn.tinOre.rare.tooltip=rarity of Tin Ore -config.techreborn.tungstenOre.rare.tooltip=rarity of Tungsten Ore +config.techreborn:allow.tungstonOre.tooltip= Allow UU recipes for Tungston Ore +config.techreborn:bauxiteOre.rare.tooltip=rarity of Bauxite Ore +config.techreborn:cinnabarOre.rare.tooltip=rarity of Cinnabar Ore +config.techreborn:copperOre.rare.tooltip=rarity of Copper Ore +config.techreborn:galenaOre.rare.tooltip=rarity of Galena Ore +config.techreborn:iridiumOre.rare.tooltip=rarity of Iridium Ore +config.techreborn:leadOre.rare.tooltip=rarity of Lead Ore +config.techreborn:olivineOre.rare.tooltip=rarity of Olivine Ore +config.techreborn:pyriteOre.rare.tooltip=rarity of Pyrite Ore +config.techreborn:rubyOre.rare.tooltip=rarity of Ruby Ore +config.techreborn:sapphireOre.rare.tooltip=rarity of Sapphire Ore +config.techreborn:sheldoniteOre.rare.tooltip=rarity of Sheldonite Ore +config.techreborn:silverOre.rare.tooltip=rarity of Silver Ore +config.techreborn:sodaliteOre.rare.tooltip=rarity of Sodalite Ore +config.techreborn:sphaleriteOre.rare.tooltip=rarity of Sphalerite Ore +config.techreborn:tinOre.rare.tooltip=rarity of Tin Ore +config.techreborn:tungstenOre.rare.tooltip=rarity of Tungsten Ore -config.techreborn.oreUnifer=Ore Unification -config.techreborn.oreUnifer.tooltip=Enable/Disable the auto ore unification +config.techreborn:oreUnifer=Ore Unification +config.techreborn:oreUnifer.tooltip=Enable/Disable the auto ore unification -config.techreborn.aesuMaxOutput=AESU max output -config.techreborn.aesuMaxStorage=AESU max storage -config.techreborn.aveargeEuOutTickTime=Time to calculate average output -config.techreborn.baseLesuOutput=Base lesu output -config.techreborn.cloakingDeviceEUTick=Clocking Device EU usage per tick -config.techreborn.cloakingDeviceMaxCharge=Cloaking Device Max Charge -config.techreborn.cloakingDeviceTier=Cloaking Device Tier -config.techreborn.dragoneggsiphonerPower=Dragon Egg Siphoner EU output -config.techreborn.extraOutputPerLesuBlock=LESU block power -config.techreborn.lapotronicOrbTier=Lapotronic Orb Tier -config.techreborn.lesuStoragePerBlock=Lesu Storage Per Block -config.techreborn.showChargehud=Show charge HUD -config.techreborn.allowExpensiveWatermill=Allow Expensive Watermill -config.techreborn.allowExpensiveWindmill=Allow Expensive Windmill +config.techreborn:aesuMaxOutput=AESU max output +config.techreborn:aesuMaxStorage=AESU max storage +config.techreborn:aveargeEuOutTickTime=Time to calculate average output +config.techreborn:baseLesuOutput=Base lesu output +config.techreborn:cloakingDeviceEUTick=Clocking Device EU usage per tick +config.techreborn:cloakingDeviceMaxCharge=Cloaking Device Max Charge +config.techreborn:cloakingDeviceTier=Cloaking Device Tier +config.techreborn:dragoneggsiphonerPower=Dragon Egg Siphoner EU output +config.techreborn:extraOutputPerLesuBlock=LESU block power +config.techreborn:lapotronicOrbTier=Lapotronic Orb Tier +config.techreborn:lesuStoragePerBlock=Lesu Storage Per Block +config.techreborn:showChargehud=Show charge HUD +config.techreborn:allowExpensiveWatermill=Allow Expensive Watermill +config.techreborn:allowExpensiveWindmill=Allow Expensive Windmill #ConfigGui -config.techreborn.category.general=General Configs -config.techreborn.category.world=World Configs -config.techreborn.category.power=Power Configs -config.techreborn.category.crafting=Crafting Configs -config.techreborn.category.uu=UU Configs -config.techreborn.category.emc=EMC Configs -config.techreborn.category.integration=Integration +config.techreborn:category.general=General Configs +config.techreborn:category.world=World Configs +config.techreborn:category.power=Power Configs +config.techreborn:category.crafting=Crafting Configs +config.techreborn:category.uu=UU Configs +config.techreborn:category.emc=EMC Configs +config.techreborn:category.integration=Integration tr.configgui.category.trGeneral.tooltip=General tr.configgui.category.trWorld.tooltip=World @@ -875,36 +868,36 @@ tr.configgui.category.tremc.tooltip=EMC tr.configgui.category.treinter.tooltip=Mod Integration #Recipe Handlers -techreborn.recipe.alloysmelter=Alloy Furnace Recipe -techreborn.recipe.ironalloysmelter=Iron Alloy Furnace Recipe -techreborn.recipe.assemblingmachine=Assembling Machine Recipe -techreborn.recipe.blastfurnace=Blast Furnace Recipe -techreborn.recipe.centrifuge=Centrifuge Recipe -techreborn.recipe.grinder=Industrial Grinder Recipe -techreborn.recipe.industrialelectrolyzer=Industrial Electrolyzer Recipe -techreborn.recipe.industrialsawmill=Industrial Sawmill Recipe -techreborn.recipe.lathe=Lathe Recipe -techreborn.recipe.platecuttingmachine=Plate Cutting Machine Recipe -techreborn.recipe.chemicalReactor=Chemical Reactor Recipe -techreborn.recipe.implosioncompressor=Implosion Compressor +techreborn:recipe.alloysmelter=Alloy Furnace Recipe +techreborn:recipe.ironalloysmelter=Iron Alloy Furnace Recipe +techreborn:recipe.assemblingmachine=Assembling Machine Recipe +techreborn:recipe.blastfurnace=Blast Furnace Recipe +techreborn:recipe.centrifuge=Centrifuge Recipe +techreborn:recipe.grinder=Industrial Grinder Recipe +techreborn:recipe.industrialelectrolyzer=Industrial Electrolyzer Recipe +techreborn:recipe.industrialsawmill=Industrial Sawmill Recipe +techreborn:recipe.lathe=Lathe Recipe +techreborn:recipe.platecuttingmachine=Plate Cutting Machine Recipe +techreborn:recipe.chemicalReactor=Chemical Reactor Recipe +techreborn:recipe.implosioncompressor=Implosion Compressor #Message -techreborn.message.missingmultiblock=Incomplete Multiblock -techreborn.message.setTo=Set to -techreborn.message.in=in -techreborn.message.noCoordsSet=No Coordinates Set -techreborn.message.coordsHaveBeen=Coordinates have been -techreborn.message.cleared=Cleared -techreborn.message.detects=Detects -techreborn.message.allPlayers=All Players -techreborn.message.onlyOtherPlayers=Only Other Players -techreborn.message.onlyYou=Only You -techreborn.message.nanosaberActive=Active -techreborn.message.nanosaberActivate=Activate -techreborn.message.nanosaberDeactivating=Deactivating -techreborn.message.nanosaberInactive=Inactive -techreborn.message.nanosaberEnergyErrorTo=Not Enough Energy to -techreborn.message.nanosaberEnergyError=Not Enough Energy: +techreborn:message.missingmultiblock=Incomplete Multiblock +techreborn:message.setTo=Set to +techreborn:message.in=in +techreborn:message.noCoordsSet=No Coordinates Set +techreborn:message.coordsHaveBeen=Coordinates have been +techreborn:message.cleared=Cleared +techreborn:message.detects=Detects +techreborn:message.allPlayers=All Players +techreborn:message.onlyOtherPlayers=Only Other Players +techreborn:message.onlyYou=Only You +techreborn:message.nanosaberActive=Active +techreborn:message.nanosaberActivate=Activate +techreborn:message.nanosaberDeactivating=Deactivating +techreborn:message.nanosaberInactive=Inactive +techreborn:message.nanosaberEnergyErrorTo=Not Enough Energy to +techreborn:message.nanosaberEnergyError=Not Enough Energy: #Cables Cable.copperCable.name=Copper Cable @@ -926,25 +919,25 @@ desc.tier=Tier: #Manual -techreborn.manual.contents=Contents Page -techreborn.manual.gettingstarted=Getting Started -techreborn.manual.generatingpower=Generating Power -techreborn.manual.basicmachines=Basic Machines -techreborn.manual.advancedmachines=Advanced Machines -techreborn.manual.tools=Tools +techreborn:manual.contents=Contents Page +techreborn:manual.gettingstarted=Getting Started +techreborn:manual.generatingpower=Generating Power +techreborn:manual.basicmachines=Basic Machines +techreborn:manual.advancedmachines=Advanced Machines +techreborn:manual.tools=Tools -techreborn.manual.gettingrubber=Collecting Rubber -techreborn.manual.backbutton=Back -techreborn.manual.gettingplates=Crafting Plates +techreborn:manual.gettingrubber=Collecting Rubber +techreborn:manual.backbutton=Back +techreborn:manual.gettingplates=Crafting Plates -item.techreborn.advancedDrill.description=This Tool is a advanced version of the mining drill, when this item is activated it will dig out a 3x3. -tile.techreborn.alloyfurnace.description=This Machine is your first step into TechReborn with this you can fuse metals into other metals. These other metals can be used to craft the higher tier machines. -tile.techreborn.alloysmelter.description=This machine is a upgraded version of the Alloy Furnace, This block requires EU or RF. -tile.techreborn.assemblingmachine.description=This block is used to craft some of the more complex machines that can't be crafted in a normal crafting table. -tile.techreborn.blastfurnace.description=This Machine needs a 3x4x3 of machine casings behind it to increase its internal heat, The hotter the machine is the more recipes will open up to you. This machine also needs EU/RF. +item.techreborn:advancedDrill.description=This Tool is a advanced version of the mining drill, when this item is activated it will dig out a 3x3. +tile.techreborn:alloyfurnace.description=This Machine is your first step into TechReborn with this you can fuse metals into other metals. These other metals can be used to craft the higher tier machines. +tile.techreborn:alloysmelter.description=This machine is a upgraded version of the Alloy Furnace, This block requires EU or RF. +tile.techreborn:assemblingmachine.description=This block is used to craft some of the more complex machines that can't be crafted in a normal crafting table. +tile.techreborn:blastfurnace.description=This Machine needs a 3x4x3 of machine casings behind it to increase its internal heat, The hotter the machine is the more recipes will open up to you. This machine also needs EU/RF. -keys.techreborn.category=TechReborn Category -keys.techreborn.config=Config +keys.techreborn:category=TechReborn Category +keys.techreborn:config=Config achievement.TechReborn:ore_PickUp=New Ore! achievement.TechReborn:ore_PickUp.desc=Mine a TechReborn ore @@ -952,20 +945,20 @@ achievement.TechReborn:centrifuge_Craft=Time to Spin achievement.TechReborn:thermalgen_Craft=Time to Heat # JEI Integration -techreborn.jei.recipe.start.cost=Start: %sEU -techreborn.jei.recipe.running.cost=EU/t: %s -techreborn.jei.recipe.processing.time.1=Time: %s ticks -techreborn.jei.recipe.processing.time.2=(%s seconds) -jei.techreborn.scrapbox.name=Opening Scrapboxes -techreborn.desc.rubberSap=In order to get sap, you need to find a rubber tree or obtain a rubber tree sapling and proceed to grow it. Once you have obtained a rubber tree, search around for little yellowish spots on the tree. If you don't see any, just wait a bit and eventually these yellow "sap" spots. To harvest the sap, use a treetap and use it on the log. -techreborn.desc.scrapBox=Scrapboxes can be opened by either a simple use in hand, or by dispensers. That's right, just throw your scrapboxes into dispensers and give them a redstone signal, and boom! Random item! -techreborn.desc.scrapBoxNoDispenser=Scrapboxes can be opened by a simple use in hand! +techreborn:jei.recipe.start.cost=Start: %sEU +techreborn:jei.recipe.running.cost=EU/t: %s +techreborn:jei.recipe.processing.time.1=Time: %s ticks +techreborn:jei.recipe.processing.time.2=(%s seconds) +jei.techreborn:scrapbox.name=Opening Scrapboxes +techreborn:desc.rubberSap=In order to get sap, you need to find a rubber tree or obtain a rubber tree sapling and proceed to grow it. Once you have obtained a rubber tree, search around for little yellowish spots on the tree. If you don't see any, just wait a bit and eventually these yellow "sap" spots. To harvest the sap, use a treetap and use it on the log. +techreborn:desc.scrapBox=Scrapboxes can be opened by either a simple use in hand, or by dispensers. That's right, just throw your scrapboxes into dispensers and give them a redstone signal, and boom! Random item! +techreborn:desc.scrapBoxNoDispenser=Scrapboxes can be opened by a simple use in hand! -techreborn.jei.category.alloy.furnace=Alloy Furnace -techreborn.jei.category.generator.gas=Gas Generator -techreborn.jei.category.generator.semifluid=Semifluid Generator -techreborn.jei.category.generator.diesel=Diesel Generator -techreborn.jei.category.generator.thermal=Thermal Generator +techreborn:jei.category.alloy.furnace=Alloy Furnace +techreborn:jei.category.generator.gas=Gas Generator +techreborn:jei.category.generator.semifluid=Semifluid Generator +techreborn:jei.category.generator.diesel=Diesel Generator +techreborn:jei.category.generator.thermal=Thermal Generator #Death Messages death.attack.shock=%s was electrocuted