diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 17f8afa53..dc31d2168 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -112,13 +112,13 @@ public class BlockMachineCasing extends BlockMultiblockBase { public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired){ if (state.getValue(TYPE) == "reinforced") { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); } else if (state.getValue(TYPE) == "advanced") { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 2)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE)); } else { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); } } else { diff --git a/src/main/java/techreborn/blocks/BlockMachineFrames.java b/src/main/java/techreborn/blocks/BlockMachineFrames.java index 8928b25eb..02ddf1e23 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrames.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrames.java @@ -24,96 +24,71 @@ 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.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseBlock; -import reborncore.common.blocks.PropertyString; -import reborncore.common.util.ArrayUtils; -import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; import techreborn.utils.TechRebornCreativeTab; -import java.security.InvalidParameterException; -import java.util.List; - 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 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 BlockMachineFrames() { super(Material.IRON); setCreativeTab(TechRebornCreativeTab.instance); setHardness(1f); - this.setDefaultState(this.getDefaultState().withProperty(TYPE, "basic")); - for (int i = 0; i < types.length; i++) { - RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant("type=" + types[i])); - } + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure")); } - public static ItemStack getFrameByName(String name, int count) { - name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); - if (name.equals("machine")) { - return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 0); - } - if (name.equals("advanced_machine")) { - return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 1); - } - if (name.equals("highly_advanced_machine")) { - return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 2); - } +// public static ItemStack getFrameByName(String name, int count) { +// name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); +// if (name.equals("machine")) { +// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 0); +// } +// if (name.equals("advanced_machine")) { +// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 1); +// } +// if (name.equals("highly_advanced_machine")) { +// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, 2); +// } +// +// for (int i = 0; i < types.length; i++) { +// if (types[i].equalsIgnoreCase(name)) { +// return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i); +// } +// } +// throw new InvalidParameterException("The part " + name + " could not be found."); +// } +// +// public static ItemStack getFrameByName(String name) { +// return getFrameByName(name, 1); +// } - for (int i = 0; i < types.length; i++) { - if (types[i].equalsIgnoreCase(name)) { - return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i); - } - } - throw new InvalidParameterException("The part " + name + " could not be found."); - } - public static ItemStack getFrameByName(String name) { - return getFrameByName(name, 1); - } +// @Override +// public int damageDropped(IBlockState state) { +// return getMetaFromState(state); +// } +// +// @Override +// public IBlockState getStateFromMeta(int meta) { +// if (meta > types.length) { +// meta = 0; +// } +// return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); +// } +// +// @Override +// public int getMetaFromState(IBlockState state) { +// return typesList.indexOf(state.getValue(TYPE)); +// } - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { - for (int meta = 0; meta < types.length; meta++) { - list.add(new ItemStack(this, 1, meta)); - } - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta > types.length) { - meta = 0; - } - return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return typesList.indexOf(state.getValue(TYPE)); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, TYPE); - } +// @Override +// 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 ccf2de8ab..4b3726297 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -27,14 +27,11 @@ package techreborn.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; import reborncore.common.blocks.PropertyString; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -42,12 +39,10 @@ import reborncore.common.util.OreDrop; import techreborn.init.TRIngredients; import techreborn.lib.ModInfo; import techreborn.utils.TechRebornCreativeTab; -import techreborn.world.config.IOreNameProvider; - import java.util.Random; @RebornRegistry(modID = ModInfo.MOD_ID) -public class BlockOre extends Block implements IOreNameProvider { +public class BlockOre extends Block { public static final PropertyString VARIANTS = getVarients(); @ConfigRegistry(config = "misc", category = "blocks", key = "rubyMinQuatity", comment = "Minimum quantity of Ruby gems per Ruby ore") @@ -149,46 +144,22 @@ public class BlockOre extends Block implements IOreNameProvider { } // @Override -// @SideOnly(Side.CLIENT) -// public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { -// for (int meta = 0; meta < ores.length; meta++) { -// list.add(new ItemStack(this, 1, meta)); -// } +// public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { +// return new ItemStack(this, 1, getMetaFromState(state)); // } - - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(state)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - +// // @Override -// public IBlockState getStateFromMeta(int meta) { -// if (meta > ores.length) { -// meta = 0; -// } -// return getBlockState().getBaseState().withProperty(VARIANTS, oreNamesList.get(meta)); +// public int damageDropped(IBlockState state) { +// return getMetaFromState(state); // } -// @Override -// public int getMetaFromState(IBlockState state) { -// return oreNamesList.indexOf(state.getValue(VARIANTS)); -// } // // @Override // protected BlockStateContainer createBlockState() { // return new BlockStateContainer(this, VARIANTS); // } - @Override - public String getUserLoclisedName(IBlockState state) { -// return StringUtils.toFirstCapital(oreNamesList.get(getMetaFromState(state))); - return null; - } + public static PropertyString getVarients() { // if (OreBlockStateManager.endOreStone) { diff --git a/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java index 4c6db580e..ac8204020 100644 --- a/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java @@ -83,7 +83,7 @@ public class BlockCreativeSolarPanel extends BaseTileBlock { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java index a90cc458a..8c6af4200 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java @@ -50,7 +50,7 @@ public class BlockAdjustableSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 2)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE)); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java index da9bd3e12..3be609e7c 100644 --- a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java @@ -53,7 +53,7 @@ public class BlockHighVoltageSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java index 078825809..2761804aa 100644 --- a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java @@ -71,7 +71,7 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index 13b575941..be823a6ee 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -113,7 +113,7 @@ public class BlockLSUStorage extends BaseTileBlock { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java index 4323bfaa3..980e5b296 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java @@ -50,7 +50,7 @@ public class BlockLapotronicSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java index a3c0670fa..95b1be1e4 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java @@ -53,7 +53,7 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java index 9f15f578e..5a2333b4b 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java @@ -52,7 +52,7 @@ public class BlockHVTransformer extends BlockTransformer { @Override public void getDrops(NonNullList drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { if (RebornCoreConfig.wrenchRequired){ - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); } else { drops.add(new ItemStack(this)); diff --git a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java index c18b96d82..9361afbf0 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java @@ -52,7 +52,7 @@ public class BlockMVTransformer extends BlockTransformer { @Override public void getDrops(NonNullList drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { if (RebornCoreConfig.wrenchRequired){ - drops.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0)); + drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); } else { drops.add(new ItemStack(this)); diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 22c807bc5..f9c7388e2 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -151,6 +151,7 @@ public class RegisterItemJsons { private static void registerBlocks() { register(ModBlocks.REFINED_IRON_FENCE, "iron_fence"); + } private static void register(Item item, int meta, String name) { diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 0aadd53e2..b32a79090 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -26,14 +26,10 @@ package techreborn.init; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemSlab; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.oredict.OreDictionary; import reborncore.RebornRegistry; -import reborncore.common.util.OreUtil; import techreborn.Core; import techreborn.blocks.*; import techreborn.blocks.cable.BlockCable; @@ -61,7 +57,10 @@ public class ModBlocks { public static Block CABLE; public static Block COMPUTER_CUBE; public static Block FLARE; - public static Block IRON_FURNACE; + public static Block MACHINE_CASINGS; + public static Block MACHINE_BLOCK_ADVANCED; + public static Block MACHINE_BLOCK_BASIC; + public static Block MACHINE_BLOCK_ELITE; public static Block NUKE; public static Block REFINED_IRON_FENCE; public static Block REINFORCED_GLASS; @@ -70,8 +69,8 @@ public class ModBlocks { public static Block RUBBER_LOG_SLAB_HALF; public static Block RUBBER_LOG_SLAB_DOUBLE; public static Block RUBBER_LOG_STAIR; - public static Block RUBBER_SAPLING; public static Block RUBBER_PLANKS; + public static Block RUBBER_SAPLING; // Machines - machines public static Block ALLOY_SMELTER; @@ -91,6 +90,7 @@ public class ModBlocks { public static Block INDUSTRIAL_GRINDER; public static Block INDUSTRIAL_SAWMILL; public static Block IRON_ALLOY_FURNACE; + public static Block IRON_FURNACE; public static Block MATTER_FABRICATOR; public static Block RECYCLER; public static Block ROLLING_MACHINE; @@ -142,167 +142,46 @@ public class ModBlocks { public static Block MAGIC_ENERGY_CONVERTER; public static Block PLAYER_DETECTOR; - - public static Block MACHINE_CASINGS; - public static Block MACHINE_FRAMES; - - /** * Register blocks */ public static void init() { TRIngredients.registerBlocks(); - THERMAL_GENERATOR = new BlockThermalGenerator(); - registerBlock(THERMAL_GENERATOR, "thermal_generator"); - - QUANTUM_TANK = new BlockQuantumTank(); - registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank"); - - CREATIVE_QUANTUM_TANK = new BlockCreativeQuantumTank(); - registerBlock(CREATIVE_QUANTUM_TANK, ItemBlockQuantumTank.class, "creative_quantum_tank"); - - QUANTUM_CHEST = new BlockQuantumChest(); - registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest"); - - CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest(); - registerBlock(CREATIVE_QUANTUM_CHEST, ItemBlockQuantumChest.class, "creative_quantum_chest"); - - DIGITAL_CHEST = new BlockDigitalChest(); - registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest"); - - INDUSTRIAL_CENTRIFUGE = new BlockIndustrialCentrifuge(); - registerBlock(INDUSTRIAL_CENTRIFUGE, "industrial_centrifuge"); - - ROLLING_MACHINE = new BlockRollingMachine(); - registerBlock(ROLLING_MACHINE, "rolling_machine"); - - INDUSTRIAL_BLAST_FURNACE = new BlockIndustrialBlastFurnace(); - registerBlock(INDUSTRIAL_BLAST_FURNACE, "industrial_blast_furnace"); - - ALLOY_SMELTER = new BlockAlloySmelter(); - registerBlock(ALLOY_SMELTER, "alloy_smelter"); - - INDUSTRIAL_GRINDER = new BlockIndustrialGrinder(); - registerBlock(INDUSTRIAL_GRINDER, "industrial_grinder"); - - IMPLOSION_COMPRESSOR = new BlockImplosionCompressor(); - registerBlock(IMPLOSION_COMPRESSOR, "implosion_compressor"); - - MATTER_FABRICATOR = new BlockMatterFabricator(); - registerBlock(MATTER_FABRICATOR, "matter_fabricator"); - - CHUNK_LOADER = new BlockChunkLoader(); - registerBlock(CHUNK_LOADER, "chunk_loader"); - - CHARGE_O_MAT = new BlockChargeOMat(); - registerBlock(CHARGE_O_MAT, "charge_o_mat"); - - PLAYER_DETECTOR = new BlockPlayerDetector(); - registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector"); - + // Misc. blocks + COMPUTER_CUBE = new BlockComputerCube(); + registerBlock(COMPUTER_CUBE, "computer_cube"); + CABLE = new BlockCable(); registerBlock(CABLE, ItemBlockCable.class, "cable"); - + + MACHINE_BLOCK_ADVANCED = new BlockMachineFrames(); + registerBlock(MACHINE_BLOCK_ADVANCED, "machineBlockAdvanced"); + + MACHINE_BLOCK_BASIC = new BlockMachineFrames(); + registerBlock(MACHINE_BLOCK_BASIC, "machineBlockBasic"); + + MACHINE_BLOCK_ELITE = new BlockMachineFrames(); + registerBlock(MACHINE_BLOCK_ELITE, "machineBlockElite"); + MACHINE_CASINGS = new BlockMachineCasing(); registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machine_casing"); + + NUKE = new BlockNuke(); + registerBlock(NUKE, "nuke"); + + REFINED_IRON_FENCE = new BlockRefinedIronFence(); + registerBlock(REFINED_IRON_FENCE, "refined_iron_fence"); - DRAGON_EGG_SYPHON = new BlockDragonEggSyphon(); - registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon"); - - MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter(); - registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter"); - - ASSEMBLY_MACHINE = new BlockAssemblingMachine(); - registerBlock(ASSEMBLY_MACHINE, "assembly_machine"); - - DIESEL_GENERATOR = new BlockDieselGenerator(); - registerBlock(DIESEL_GENERATOR, "diesel_generator"); - - INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer(); - registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer"); - - MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber(); - registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber"); - - SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator(); - registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator"); - - GAS_TURBINE = new BlockGasTurbine(); - registerBlock(GAS_TURBINE, "gas_turbine"); - - IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace(); - registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace"); - - CHEMICAL_REACTOR = new BlockChemicalReactor(); - registerBlock(CHEMICAL_REACTOR, "chemical_reactor"); - - INTERDIMENSIONAL_SU = new BlockInterdimensionalSU(); - registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su"); - - ADJUSTABLE_SU = new BlockAdjustableSU(); - registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su"); - - LAPOTRONIC_SU = new BlockLapotronicSU(); - registerBlock(LAPOTRONIC_SU, "lapotronic_su"); - - LSU_STORAGE = new BlockLSUStorage(); - registerBlock(LSU_STORAGE, "lsu_storage"); - - DISTILLATION_TOWER = new BlockDistillationTower(); - registerBlock(DISTILLATION_TOWER, "distillation_tower"); - - VACUUM_FREEZER = new BlockVacuumFreezer(); - registerBlock(VACUUM_FREEZER, "vacuum_freezer"); - - FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer(); - registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer"); - - FUSION_COIL = new BlockFusionCoil(); - registerBlock(FUSION_COIL, "fusion_coil"); - - LIGHTNING_ROD = new BlockLightningRod(); - registerBlock(LIGHTNING_ROD, "lightning_rod"); - - INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill(); - registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill"); - - MACHINE_FRAMES = new BlockMachineFrames(); - registerBlock(MACHINE_FRAMES, ItemBlockMachineFrames.class, "machine_frame"); - - GRINDER = new BlockGrinder(); - registerBlock(GRINDER, "grinder"); - - SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator(); - registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator"); - - EXTRACTOR = new BlockExtractor(); - registerBlock(EXTRACTOR, "extractor"); - - COMPRESSOR = new BlockCompressor(); - registerBlock(COMPRESSOR, "compressor"); - - ELECTRIC_FURNACE = new BlockElectricFurnace(); - registerBlock(ELECTRIC_FURNACE, "electric_furnace"); - - SOLAR_PANEL = new BlockSolarPanel(); - registerBlock(SOLAR_PANEL, ItemBlockSolarPanel.class, "solar_panel"); - - CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel(); - registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel"); - - WATER_MILL = new BlockWaterMill(); - registerBlock(WATER_MILL, "water_mill"); - - WIND_MILL = new BlockWindMill(); - registerBlock(WIND_MILL, "wind_mill"); + REINFORCED_GLASS = new BlockReinforcedGlass(); + registerBlock(REINFORCED_GLASS, "reinforced_glass"); + + RUBBER_LEAVES = new BlockRubberLeaves(); + registerBlock(RUBBER_LEAVES, "rubber_leaves"); RUBBER_LOG = new BlockRubberLog(); registerBlock(RUBBER_LOG, "rubber_log"); - RUBBER_PLANKS = new BlockRubberPlank(); - registerBlock(RUBBER_PLANKS, "rubber_planks"); - RUBBER_LOG_SLAB_HALF = new BlockRubberPlankSlab.BlockHalf("rubber_plank"); registerBlockNoItem(RUBBER_LOG_SLAB_HALF, "rubber_plank_slab"); @@ -311,22 +190,158 @@ public class ModBlocks { RUBBER_LOG_STAIR = new BlockRubberPlankStair(RUBBER_LOG.getDefaultState(), "rubber_plank"); registerBlock(RUBBER_LOG_STAIR, "rubber_plank_stair"); - - RUBBER_LEAVES = new BlockRubberLeaves(); - registerBlock(RUBBER_LEAVES, "rubber_leaves"); + + RUBBER_PLANKS = new BlockRubberPlank(); + registerBlock(RUBBER_PLANKS, "rubber_planks"); RUBBER_SAPLING = new BlockRubberSapling(); registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling"); - - REFINED_IRON_FENCE = new BlockRefinedIronFence(); - registerBlock(REFINED_IRON_FENCE, "refined_iron_fence"); - - REINFORCED_GLASS = new BlockReinforcedGlass(); - registerBlock(REINFORCED_GLASS, "reinforced_glass"); - + + // Machines - machines + ALLOY_SMELTER = new BlockAlloySmelter(); + registerBlock(ALLOY_SMELTER, "alloy_smelter"); + + ASSEMBLY_MACHINE = new BlockAssemblingMachine(); + registerBlock(ASSEMBLY_MACHINE, "assembly_machine"); + + AUTO_CRAFTING_TABLE = new BlockAutoCraftingTable(); + registerBlock(AUTO_CRAFTING_TABLE, "auto_crafting_table"); + + COMPRESSOR = new BlockCompressor(); + registerBlock(COMPRESSOR, "compressor"); + + CHEMICAL_REACTOR = new BlockChemicalReactor(); + registerBlock(CHEMICAL_REACTOR, "chemical_reactor"); + + DISTILLATION_TOWER = new BlockDistillationTower(); + registerBlock(DISTILLATION_TOWER, "distillation_tower"); + + ELECTRIC_FURNACE = new BlockElectricFurnace(); + registerBlock(ELECTRIC_FURNACE, "electric_furnace"); + + EXTRACTOR = new BlockExtractor(); + registerBlock(EXTRACTOR, "extractor"); + + FLUID_REPLICATOR = new BlockFluidReplicator(); + registerBlock(FLUID_REPLICATOR, "fluid_replicator"); + + GRINDER = new BlockGrinder(); + registerBlock(GRINDER, "grinder"); + + IMPLOSION_COMPRESSOR = new BlockImplosionCompressor(); + registerBlock(IMPLOSION_COMPRESSOR, "implosion_compressor"); + + INDUSTRIAL_BLAST_FURNACE = new BlockIndustrialBlastFurnace(); + registerBlock(INDUSTRIAL_BLAST_FURNACE, "industrial_blast_furnace"); + + INDUSTRIAL_CENTRIFUGE = new BlockIndustrialCentrifuge(); + registerBlock(INDUSTRIAL_CENTRIFUGE, "industrial_centrifuge"); + + INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer(); + registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer"); + + INDUSTRIAL_GRINDER = new BlockIndustrialGrinder(); + registerBlock(INDUSTRIAL_GRINDER, "industrial_grinder"); + + INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill(); + registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill"); + + IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace(); + registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace"); + + IRON_FURNACE = new BlockIronFurnace(); + registerBlock(IRON_FURNACE, "iron_furnace"); + + MATTER_FABRICATOR = new BlockMatterFabricator(); + registerBlock(MATTER_FABRICATOR, "matter_fabricator"); + RECYCLER = new BlockRecycler(); registerBlock(RECYCLER, "recycler"); + ROLLING_MACHINE = new BlockRollingMachine(); + registerBlock(ROLLING_MACHINE, "rolling_machine"); + + SCRAPBOXINATOR = new BlockScrapboxinator(); + registerBlock(SCRAPBOXINATOR, "scrapboxinator"); + + VACUUM_FREEZER = new BlockVacuumFreezer(); + registerBlock(VACUUM_FREEZER, "vacuum_freezer"); + + // Machines - generators + CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel(); + registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel"); + + DIESEL_GENERATOR = new BlockDieselGenerator(); + registerBlock(DIESEL_GENERATOR, "diesel_generator"); + + DRAGON_EGG_SYPHON = new BlockDragonEggSyphon(); + registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon"); + + FUSION_COIL = new BlockFusionCoil(); + registerBlock(FUSION_COIL, "fusion_coil"); + + FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer(); + registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer"); + + GAS_TURBINE = new BlockGasTurbine(); + registerBlock(GAS_TURBINE, "gas_turbine"); + + LIGHTNING_ROD = new BlockLightningRod(); + registerBlock(LIGHTNING_ROD, "lightning_rod"); + + PLASMA_GENERATOR = new BlockPlasmaGenerator(); + registerBlock(PLASMA_GENERATOR, "plasma_generator"); + + SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator(); + registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator"); + + SOLAR_PANEL = new BlockSolarPanel(); + registerBlock(SOLAR_PANEL, ItemBlockSolarPanel.class, "solar_panel"); + + SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator(); + registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator"); + + THERMAL_GENERATOR = new BlockThermalGenerator(); + registerBlock(THERMAL_GENERATOR, "thermal_generator"); + + WATER_MILL = new BlockWaterMill(); + registerBlock(WATER_MILL, "water_mill"); + + WIND_MILL = new BlockWindMill(); + registerBlock(WIND_MILL, "wind_mill"); + + // Machines - storage + CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest(); + registerBlock(CREATIVE_QUANTUM_CHEST, ItemBlockQuantumChest.class, "creative_quantum_chest"); + + CREATIVE_QUANTUM_TANK = new BlockCreativeQuantumTank(); + registerBlock(CREATIVE_QUANTUM_TANK, ItemBlockQuantumTank.class, "creative_quantum_tank"); + + DIGITAL_CHEST = new BlockDigitalChest(); + registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest"); + + QUANTUM_CHEST = new BlockQuantumChest(); + registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest"); + + QUANTUM_TANK = new BlockQuantumTank(); + registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank"); + + // Machines - energy storage & transformers + ADJUSTABLE_SU = new BlockAdjustableSU(); + registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su"); + + CHARGE_O_MAT = new BlockChargeOMat(); + registerBlock(CHARGE_O_MAT, "charge_o_mat"); + + INTERDIMENSIONAL_SU = new BlockInterdimensionalSU(); + registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su"); + + LAPOTRONIC_SU = new BlockLapotronicSU(); + registerBlock(LAPOTRONIC_SU, "lapotronic_su"); + + LSU_STORAGE = new BlockLSUStorage(); + registerBlock(LSU_STORAGE, "lsu_storage"); + LOW_VOLTAGE_SU = new BlockLowVoltageSU(); registerBlock(LOW_VOLTAGE_SU, "low_voltage_su"); @@ -335,7 +350,7 @@ public class ModBlocks { HIGH_VOLTAGE_SU = new BlockHighVoltageSU(); registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su"); - + LV_TRANSFORMER = new BlockLVTransformer(); registerBlock(LV_TRANSFORMER, "lv_transformer"); @@ -343,37 +358,31 @@ public class ModBlocks { registerBlock(MV_TRANSFORMER, "mv_transformer"); HV_TRANSFORMER = new BlockHVTransformer(); - registerBlock(HV_TRANSFORMER, "hv_transformer"); - - AUTO_CRAFTING_TABLE = new BlockAutoCraftingTable(); - registerBlock(AUTO_CRAFTING_TABLE, "auto_crafting_table"); - - IRON_FURNACE = new BlockIronFurnace(); - registerBlock(IRON_FURNACE, "iron_furnace"); - - NUKE = new BlockNuke(); - registerBlock(NUKE, "nuke"); - - SCRAPBOXINATOR = new BlockScrapboxinator(); - registerBlock(SCRAPBOXINATOR, "scrapboxinator"); - - COMPUTER_CUBE = new BlockComputerCube(); - registerBlock(COMPUTER_CUBE, "computer_cube"); + registerBlock(HV_TRANSFORMER, "hv_transformer"); + + // Machines - misc + ALARM = new BlockAlarm(); + registerBlock(ALARM, "alarm"); + + CHUNK_LOADER = new BlockChunkLoader(); + registerBlock(CHUNK_LOADER, "chunk_loader"); - PLASMA_GENERATOR = new BlockPlasmaGenerator(); - registerBlock(PLASMA_GENERATOR, "plasma_generator"); - LAMP_INCANDESCENT = new BlockLamp( 14, 4, 0.625, 0.25); registerBlock(LAMP_INCANDESCENT, "lamp_incandescent"); LAMP_LED = new BlockLamp( 15, 1, 0.0625, 0.125); registerBlock(LAMP_LED, "lamp_led"); - - ALARM = new BlockAlarm(); - registerBlock(ALARM, "alarm"); - FLUID_REPLICATOR = new BlockFluidReplicator(); - registerBlock(FLUID_REPLICATOR, "fluid_replicator"); + MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber(); + registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber"); + + MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter(); + registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter"); + + PLAYER_DETECTOR = new BlockPlayerDetector(); + registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector"); + + //TODO enable when done // flare = new BlockFlare(); @@ -384,7 +393,6 @@ public class ModBlocks { // GameRegistry.register(itemBlock); // GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR"); - registerOreDict(); Core.logHelper.info("TechReborns Blocks Loaded"); } @@ -422,64 +430,4 @@ public class ModBlocks { block.setTranslationKey(ModInfo.MOD_ID + "." + name); RebornRegistry.registerBlockNoItem(block, new ResourceLocation(ModInfo.MOD_ID, name)); } - - /** - * Register ores and ore blocks - */ - public static void registerOreDict() { - // TODO: Fix block -// for (String ore : BlockOre.ores) { -// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore)); -// } - - -// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); -// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); -// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); -// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); -// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); -// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); -// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); -// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); -// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); -// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc")); -// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum")); -// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten")); -// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel")); -// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar")); -// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium")); -// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze")); -// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); -// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1)); -// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1)); -// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1)); -// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1)); -// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1)); -// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1)); -// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1)); - - OreUtil.registerOre("craftingPiston", Blocks.PISTON); - OreUtil.registerOre("craftingPiston", Blocks.STICKY_PISTON); - OreUtil.registerOre("crafterWood", Blocks.CRAFTING_TABLE); - OreUtil.registerOre("machineBasic", new ItemStack(MACHINE_FRAMES, 1)); - - OreUtil.registerOre("treeSapling", RUBBER_SAPLING); - OreUtil.registerOre("saplingRubber", RUBBER_SAPLING); - OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); - OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); - OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); - OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE)); - OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE)); - OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); - OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); - OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); - - OreUtil.registerOre("fenceIron", REFINED_IRON_FENCE); - - OreUtil.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("basic", 1)); - OreUtil.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advanced", 1)); - OreUtil.registerOre("machineBlockHighlyAdvanced", BlockMachineFrames.getFrameByName("highly_advanced", 1)); - - } - } diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index 538517925..0d1bf261a 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -29,7 +29,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import reborncore.common.util.OreUtil; -import techreborn.blocks.BlockMachineFrames; import techreborn.blocks.cable.BlockCable; public class OreDict { @@ -40,11 +39,27 @@ public class OreDict { "iridium_alloy" //Iridium alloy is plate itself ); + /** + * Register blocks and items + */ public static void init() { // Blocks OreUtil.registerOre("fenceIron", ModBlocks.REFINED_IRON_FENCE); OreUtil.registerOre("woodRubber", ModBlocks.RUBBER_LOG); OreUtil.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS); + OreUtil.registerOre("treeSapling", ModBlocks.RUBBER_SAPLING); + OreUtil.registerOre("saplingRubber", ModBlocks.RUBBER_SAPLING); + +// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); +// OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); +// OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); +// OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE)); +// OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE)); +// OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); +// OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); +// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); + + // Parts OreUtil.registerOre("circuitBasic", TRIngredients.Parts.CIRCUIT_BASIC.getStack()); @@ -60,9 +75,10 @@ public class OreDict { OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack()); // Frames - OreUtil.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("machine", 1)); - OreUtil.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advancedMachine", 1)); - OreUtil.registerOre("machineBlockElite", BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1)); + OreUtil.registerOre("machineBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); + OreUtil.registerOre("machineBlockBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); + OreUtil.registerOre("machineBlockAdvanced", new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); + OreUtil.registerOre("machineBlockElite", new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE)); // Tools&Armor OreUtil.registerOre("reBattery", TRItems.RE_BATTERY); @@ -73,14 +89,47 @@ public class OreDict { // Misc OreUtil.registerOre("industrialTnt", Blocks.TNT); + OreUtil.registerOre("craftingPiston", Blocks.PISTON); + OreUtil.registerOre("craftingPiston", Blocks.STICKY_PISTON); + OreUtil.registerOre("crafterWood", Blocks.CRAFTING_TABLE); OreUtil.registerOre("craftingIndustrialDiamond", Items.DIAMOND); - OreUtil.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold")); OreUtil.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15)); + OreUtil.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold")); OreUtil.registerOre("pulpWood", TRIngredients.Dusts.SAW.getStack()); //OreUtil.registerOre("uran235", nothing); //OreUtil.registerOre("uran238", nothing); //OreUtil.registerOre("smallUran235", nothing); + +// for (String ore : BlockOre.ores) { +// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore)); +// } + + +// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); +// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); +// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); +// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); +// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); +// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); +// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); +// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); +// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); +// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc")); +// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum")); +// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten")); +// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel")); +// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar")); +// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium")); +// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze")); +// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); +// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1)); +// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1)); +// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1)); +// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1)); +// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1)); +// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1)); +// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1)); // TODO: fix recipe diff --git a/src/main/java/techreborn/init/TRItems.java b/src/main/java/techreborn/init/TRItems.java index f22bf8358..79d239dff 100644 --- a/src/main/java/techreborn/init/TRItems.java +++ b/src/main/java/techreborn/init/TRItems.java @@ -26,13 +26,13 @@ package techreborn.init; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import reborncore.RebornRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.BucketHandler; import techreborn.Core; import techreborn.api.Reference; -import techreborn.blocks.BlockMachineFrames; import techreborn.config.ConfigTechReborn; import techreborn.events.TRRecipeHandler; import techreborn.items.*; @@ -317,8 +317,9 @@ public class TRItems { } Core.logHelper.info("TechReborns Items Loaded"); - BlockMachineBase.advancedFrameStack = BlockMachineFrames.getFrameByName("advanced", 1); - BlockMachineBase.basicFrameStack = BlockMachineFrames.getFrameByName("basic", 1); + // TODO: do we need this at all? + BlockMachineBase.advancedFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED); + BlockMachineBase.basicFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC); } public static void registerItem(Item item, String name) { diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index dd61e6752..08fb721f5 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -62,8 +62,8 @@ public abstract class RecipeMethods { // return ItemParts.getPartByName(name, count); } else if (type == Type.CABLE) { return BlockCable.getCableByName(name, count); - } else if (type == Type.MACHINE_FRAME) { - return BlockMachineFrames.getFrameByName(name, count); +// } else if (type == Type.MACHINE_FRAME) { +// 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/ItemBlockMachineFrames.java b/src/main/java/techreborn/itemblocks/ItemBlockMachineFrames.java deleted file mode 100644 index e3f5b6ef2..000000000 --- a/src/main/java/techreborn/itemblocks/ItemBlockMachineFrames.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.itemblocks; - -import net.minecraft.block.Block; -import reborncore.common.itemblock.ItemBlockBase; -import techreborn.blocks.BlockMachineFrames; -import techreborn.init.ModBlocks; - -public class ItemBlockMachineFrames extends ItemBlockBase { - - public ItemBlockMachineFrames(Block block) { - super(ModBlocks.MACHINE_FRAMES, ModBlocks.MACHINE_FRAMES, BlockMachineFrames.types); - } - -} diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index 467c680e5..3e01c162b 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -119,7 +119,7 @@ public class TileChargeOMat extends TilePowerAcceptor // ItemHandlerProvider @Override - public Inventory getInventory() { + public Inventory getInventory() { return inventory; } diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 3f7eb707c..ada03d94f 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -93,7 +93,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, Ite } @Override - public Inventory getInventory() { + public Inventory getInventory() { return this.inventory; } diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 09d39fe7a..643a2d201 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -113,7 +113,7 @@ public class TileQuantumTank extends TileLegacyMachineBase // ItemHandlerProvider @Override - public Inventory getInventory() { + public Inventory getInventory() { return this.inventory; } diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index 8ff6f3d10..352c0aa0a 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -364,7 +364,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor // ItemHandlerProvider @Override - public Inventory getInventory() { + public Inventory getInventory() { return inventory; } diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java index ae6f5fe28..236c497ed 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java @@ -121,7 +121,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor // ItemHandlerProvider @Override - public Inventory getInventory() { + public Inventory getInventory() { return inventory; } } diff --git a/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java index bd369ce72..5eea1aab6 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java @@ -151,7 +151,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr } @Override - public Inventory getInventory() { + public Inventory getInventory() { return inventory; } diff --git a/src/main/java/techreborn/tiles/multiblock/TileFluidReplicator.java b/src/main/java/techreborn/tiles/multiblock/TileFluidReplicator.java index 05295358d..012226d21 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileFluidReplicator.java +++ b/src/main/java/techreborn/tiles/multiblock/TileFluidReplicator.java @@ -25,10 +25,8 @@ package techreborn.tiles.multiblock; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -133,6 +131,13 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine return true; }; } + + // TileLegacyMachineBase + @Nullable + @Override + public Tank getTank() { + return tank; + } // IContainerProvider @Override @@ -142,10 +147,4 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine .outputSlot(2, 124, 55).energySlot(3, 8, 72).syncEnergyValue().syncCrafterValue().addInventory() .create(this); } - - @Nullable - @Override - public Tank getTank() { - return tank; - } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index ccc108107..5e05682eb 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -28,7 +28,6 @@ import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -49,7 +48,6 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; -import techreborn.init.TRIngredients; import techreborn.lib.ModInfo; import techreborn.tiles.TileGenericMachine; @@ -92,6 +90,15 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai return down && center && blade && up; } + private static IInventoryAccess getInventoryAccess(){ + return (slotID, stack, face, direction, tile) -> { + if(slotID == 1){ + return stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); + } + return true; + }; + } + // TilePowerAcceptor @Override public void update() { @@ -129,14 +136,12 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai tank.writeToNBT(tagCompound); return tagCompound; } - - private static IInventoryAccess getInventoryAccess(){ - return (slotID, stack, face, direction, tile) -> { - if(slotID == 1){ - return stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); - } - return true; - }; + + // TileLegacyMachineBase + @Nullable + @Override + public Tank getTank() { + return tank; } // IContainerProvider @@ -195,10 +200,4 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai } return false; } - - @Nullable - @Override - public Tank getTank() { - return tank; - } } \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index 2f009a55c..cbc97961e 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -28,10 +28,8 @@ import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; @@ -52,8 +50,6 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; import techreborn.tiles.TileGenericMachine; -import techreborn.tiles.tier1.TileAutoCraftingTable; - import javax.annotation.Nullable; @RebornRegistry(modID = ModInfo.MOD_ID) @@ -118,6 +114,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai tank.compareAndUpdate(); } + // TilePowerAcceptor @Override public void readFromNBT(final NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); @@ -130,6 +127,13 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai tank.writeToNBT(tagCompound); return tagCompound; } + + // TileLegacyMachineBase + @Nullable + @Override + public Tank getTank() { + return tank; + } private static IInventoryAccess getInventoryAccess(){ return (slotID, stack, face, direction, tile) -> { @@ -195,10 +199,4 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai } return false; } - - @Nullable - @Override - public Tank getTank() { - return tank; - } } \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index a614a5a9a..fa9919439 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -44,7 +44,7 @@ import techreborn.blocks.storage.BlockEnergyStorage; public class TileEnergyStorage extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider { - public Inventory inventory; + public Inventory inventory; public String name; public Block wrenchDrop; public EnumPowerTier tier; @@ -141,7 +141,7 @@ public class TileEnergyStorage extends TilePowerAcceptor // ItemHandlerProvider @Override - public Inventory getInventory() { + public Inventory getInventory() { return inventory; } } diff --git a/src/main/java/techreborn/tiles/tier0/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/tier0/TileIronAlloyFurnace.java index b2cdfc23a..be96d8c16 100644 --- a/src/main/java/techreborn/tiles/tier0/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/tier0/TileIronAlloyFurnace.java @@ -305,7 +305,7 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase } @Override - public Inventory getInventory() { + public Inventory getInventory() { return this.inventory; } diff --git a/src/main/java/techreborn/tiles/tier0/TileIronFurnace.java b/src/main/java/techreborn/tiles/tier0/TileIronFurnace.java index 6c19d6342..304cea533 100644 --- a/src/main/java/techreborn/tiles/tier0/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/tier0/TileIronFurnace.java @@ -29,7 +29,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.EnumFacing; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.tile.TileLegacyMachineBase; @@ -166,7 +165,7 @@ public class TileIronFurnace extends TileLegacyMachineBase } @Override - public Inventory getInventory() { + public Inventory getInventory() { return this.inventory; } diff --git a/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java index e6c24e368..b6c3a4eae 100644 --- a/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java @@ -41,7 +41,6 @@ import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; -import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; diff --git a/src/main/java/techreborn/tiles/tier1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/tier1/TileElectricFurnace.java index b3ec1a3c4..6cfdcc8cc 100644 --- a/src/main/java/techreborn/tiles/tier1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/tier1/TileElectricFurnace.java @@ -209,7 +209,7 @@ public class TileElectricFurnace extends TilePowerAcceptor // ItemHandlerProvider @Override - public Inventory getInventory() { + public Inventory getInventory() { return inventory; } diff --git a/src/main/java/techreborn/tiles/tier1/TileRecycler.java b/src/main/java/techreborn/tiles/tier1/TileRecycler.java index 3787ccbd2..09b7b09b0 100644 --- a/src/main/java/techreborn/tiles/tier1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/tier1/TileRecycler.java @@ -51,7 +51,7 @@ public class TileRecycler extends TilePowerAcceptor @ConfigRegistry(config = "machines", category = "recycler", key = "RecyclerMaxEnergy", comment = "Recycler Max Energy (Value in EU)") public static int maxEnergy = 1000; - private final Inventory inventory = new Inventory<>(3, "TileRecycler", 64, this).withConfiguredAccess(); + private final Inventory inventory = new Inventory<>(3, "TileRecycler", 64, this).withConfiguredAccess(); private final int cost = 2; private final int time = 15; private final int chance = 6; @@ -193,7 +193,7 @@ public class TileRecycler extends TilePowerAcceptor // ItemHandlerProvider @Override - public Inventory getInventory() { + public Inventory getInventory() { return this.inventory; } diff --git a/src/main/java/techreborn/tiles/tier1/TileRollingMachine.java b/src/main/java/techreborn/tiles/tier1/TileRollingMachine.java index 3be6ec4be..30f637dee 100644 --- a/src/main/java/techreborn/tiles/tier1/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/tier1/TileRollingMachine.java @@ -295,7 +295,7 @@ public class TileRollingMachine extends TilePowerAcceptor } @Override - public Inventory getInventory() { + public Inventory getInventory() { return inventory; } diff --git a/src/main/resources/assets/techreborn/advancements/root.json b/src/main/resources/assets/techreborn/advancements/root.json index b49e5b4b2..b289cc641 100644 --- a/src/main/resources/assets/techreborn/advancements/root.json +++ b/src/main/resources/assets/techreborn/advancements/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "techreborn:ore" + "item": "techreborn:orecopper" }, "title": { "translate": "itemGroup.techreborn" @@ -19,7 +19,7 @@ "conditions": { "items": [ { - "item": "techreborn:ore2" + "item": "techreborn:orecopper" } ] } @@ -29,7 +29,7 @@ "conditions": { "items": [ { - "item": "techreborn:ore2" + "item": "techreborn:orelead" } ] } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockadvanced.json b/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockadvanced.json new file mode 100644 index 000000000..0c0de2468 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockadvanced.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_all", + "textures": { + "all": "techreborn:blocks/machines/structure/tier2_machine_block" + } + }, + "variants": { + "inventory": [ + { + + } + ], + "normal": [ + { + + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockbasic.json b/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockbasic.json new file mode 100644 index 000000000..a42325320 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockbasic.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_all", + "textures": { + "all": "techreborn:blocks/machines/structure/tier1_machine_block" + } + }, + "variants": { + "inventory": [ + { + + } + ], + "normal": [ + { + + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockelite.json b/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockelite.json new file mode 100644 index 000000000..b2ae4a772 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/machines/structure/machineblockelite.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_all", + "textures": { + "all": "techreborn:blocks/machines/structure/tier3_machine_block" + } + }, + "variants": { + "inventory": [ + { + + } + ], + "normal": [ + { + + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 75e6dc0fd..f991f7196 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -53,9 +53,9 @@ 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.machineblockelite.name=Highly Advanced Machine Frame +tile.techreborn.machineblockadvanced.name=Advanced Machine Frame +tile.techreborn.machineblockbasic.name=Basic Machine Frame tile.techreborn.solar_panel.basic.name=Basic Solar Panel tile.techreborn.solar_panel.hybrid.name=Hybrid Solar Panel tile.techreborn.solar_panel.advanced.name=Advanced Solar Panel diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json b/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json index 9641d7e90..bd793af09 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json @@ -126,15 +126,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockbasic", "entryName": "basic_frame", - "weight": 5, - "functions": [ - { - "function": "set_data", - "data": 0 - } - ] + "weight": 5 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json b/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json index 9641d7e90..bd793af09 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json @@ -126,15 +126,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockbasic", "entryName": "basic_frame", - "weight": 5, - "functions": [ - { - "function": "set_data", - "data": 0 - } - ] + "weight": 5 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json b/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json index 89b86409b..fce0173d7 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json @@ -99,15 +99,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", - "entryName": "advanced_frame", - "weight": 30, - "functions": [ - { - "function": "set_data", - "data": 2 - } - ] + "name": "techreborn:machineblockelite", + "entryName": "highly_advanced_frame", + "weight": 30 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json b/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json index 9641d7e90..bd793af09 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json @@ -126,15 +126,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockbasic", "entryName": "basic_frame", - "weight": 5, - "functions": [ - { - "function": "set_data", - "data": 0 - } - ] + "weight": 5 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json b/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json index 9641d7e90..bd793af09 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json @@ -126,15 +126,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockbasic", "entryName": "basic_frame", - "weight": 5, - "functions": [ - { - "function": "set_data", - "data": 0 - } - ] + "weight": 5 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json b/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json index 33c8c6e91..025d25b4e 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json @@ -114,15 +114,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockadvanced", "entryName": "reinforced_frame", - "weight": 30, - "functions": [ - { - "function": "set_data", - "data": 1 - } - ] + "weight": 30 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json b/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json index 9641d7e90..bd793af09 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json @@ -126,15 +126,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockbasic", "entryName": "basic_frame", - "weight": 5, - "functions": [ - { - "function": "set_data", - "data": 0 - } - ] + "weight": 5 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json index 33c8c6e91..025d25b4e 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json @@ -114,15 +114,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockadvanced", "entryName": "reinforced_frame", - "weight": 30, - "functions": [ - { - "function": "set_data", - "data": 1 - } - ] + "weight": 30 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json index 33c8c6e91..025d25b4e 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json @@ -114,15 +114,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockadvanced", "entryName": "reinforced_frame", - "weight": 30, - "functions": [ - { - "function": "set_data", - "data": 1 - } - ] + "weight": 30 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json index 33c8c6e91..025d25b4e 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json @@ -114,15 +114,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockadvanced", "entryName": "reinforced_frame", - "weight": 30, - "functions": [ - { - "function": "set_data", - "data": 1 - } - ] + "weight": 30 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json b/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json index 9641d7e90..bd793af09 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json @@ -126,15 +126,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockbasic", "entryName": "basic_frame", - "weight": 5, - "functions": [ - { - "function": "set_data", - "data": 0 - } - ] + "weight": 5 }, { "type": "item", diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json b/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json index 89b86409b..f7fe2b76d 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json @@ -99,15 +99,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:machineblockelite", "entryName": "advanced_frame", - "weight": 30, - "functions": [ - { - "function": "set_data", - "data": 2 - } - ] + "weight": 30 }, { "type": "item",