Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class.
This commit is contained in:
parent
6d931b232d
commit
6a70424252
133 changed files with 1579 additions and 1622 deletions
|
@ -164,7 +164,7 @@ public class Core {
|
|||
//MinecraftForge.EVENT_BUS.register(worldGen.retroGen);
|
||||
// Scrapbox
|
||||
if (config.ScrapboxDispenser) {
|
||||
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox());
|
||||
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.SCRAP_BOX, new BehaviorDispenseScrapbox());
|
||||
}
|
||||
logHelper.info("Initialization Complete");
|
||||
}
|
||||
|
|
|
@ -17,9 +17,9 @@ public class TRAchievements {
|
|||
public static Achievement centrifuge_Craft;
|
||||
|
||||
public static void init() {
|
||||
ore_PickUp = new AchievementMod("ore_PickUp", 0, 0, new ItemStack(ModBlocks.ore, 1, 0), null);
|
||||
centrifuge_Craft = new AchievementMod("centrifuge_Craft", 1, 1, ModBlocks.centrifuge, ore_PickUp);
|
||||
thermalgen_Craft = new AchievementMod("thermalgen_Craft", 2, 1, ModBlocks.thermalGenerator, ore_PickUp);
|
||||
ore_PickUp = new AchievementMod("ore_PickUp", 0, 0, new ItemStack(ModBlocks.ORE, 1, 0), null);
|
||||
centrifuge_Craft = new AchievementMod("centrifuge_Craft", 1, 1, ModBlocks.INDUSTRIAL_CENTRIFUGE, ore_PickUp);
|
||||
thermalgen_Craft = new AchievementMod("thermalgen_Craft", 2, 1, ModBlocks.THERMAL_GENERATOR, ore_PickUp);
|
||||
|
||||
pageIndex = AchievementPage.getAchievementPages().size();
|
||||
techrebornPage = new AchievementPage(ModInfo.MOD_NAME,
|
||||
|
|
|
@ -8,7 +8,7 @@ public class ScrapboxRecipe extends BaseRecipe {
|
|||
|
||||
public ScrapboxRecipe(ItemStack output) {
|
||||
super(Reference.scrapboxRecipe, 0, 0);
|
||||
addInput(new ItemStack(TechRebornAPI.getItem("scrapBox")));
|
||||
addInput(new ItemStack(TechRebornAPI.getItem("SCRAP_BOX")));
|
||||
addOutput(output);
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ public class BlockMachineFrame extends BaseBlock {
|
|||
public static ItemStack getFrameByName(String name, int count) {
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModBlocks.machineframe, count, i);
|
||||
return new ItemStack(ModBlocks.MACHINE_FRAMES, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The part " + name + " could not be found.");
|
||||
|
|
|
@ -56,7 +56,7 @@ public class BlockOre extends Block implements IOreNameProvider {
|
|||
public static ItemStack getOreByName(String name, int count) {
|
||||
for (int i = 0; i < ores.length; i++) {
|
||||
if (ores[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModBlocks.ore, count, i);
|
||||
return new ItemStack(ModBlocks.ORE, count, i);
|
||||
}
|
||||
}
|
||||
return BlockOre2.getOreByName(name, count);
|
||||
|
@ -75,7 +75,7 @@ public class BlockOre extends Block implements IOreNameProvider {
|
|||
}
|
||||
}
|
||||
if (index == -1) {
|
||||
return ModBlocks.ore2.getBlockStateFromName(name);
|
||||
return ModBlocks.ORE2.getBlockStateFromName(name);
|
||||
}
|
||||
return getStateFromMeta(index);
|
||||
}
|
||||
|
|
|
@ -43,7 +43,7 @@ public class BlockOre2 extends Block implements IOreNameProvider {
|
|||
public static ItemStack getOreByName(String name, int count) {
|
||||
for (int i = 0; i < ores.length; i++) {
|
||||
if (ores[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModBlocks.ore2, count, i);
|
||||
return new ItemStack(ModBlocks.ORE2, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The ore block " + name + " could not be found.");
|
||||
|
|
|
@ -123,6 +123,6 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
|
|||
|
||||
@Override
|
||||
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
|
||||
return Item.getItemFromBlock(ModBlocks.rubberSapling);
|
||||
return Item.getItemFromBlock(ModBlocks.RUBBER_SAPLING);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -157,7 +157,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock {
|
|||
worldIn.setBlockState(pos,
|
||||
state.withProperty(HAS_SAP, false).withProperty(SAP_SIDE, EnumFacing.getHorizontal(0)));
|
||||
worldIn.playSound(null, pos.getX(), pos.getY(),
|
||||
pos.getZ(), ModSounds.extract,
|
||||
pos.getZ(), ModSounds.SAP_EXTRACT,
|
||||
SoundCategory.BLOCKS, 0.6F, 1F);
|
||||
if (!worldIn.isRemote) {
|
||||
if (stack.getItem() instanceof ItemElectricTreetap) {
|
||||
|
|
|
@ -35,7 +35,7 @@ public class BlockStorage extends BaseBlock implements ITexturedBlock {
|
|||
public static ItemStack getStorageBlockByName(String name, int count) {
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equals(name)) {
|
||||
return new ItemStack(ModBlocks.storage, count, i);
|
||||
return new ItemStack(ModBlocks.STORAGE, count, i);
|
||||
}
|
||||
}
|
||||
return BlockStorage2.getStorageBlockByName(name, count);
|
||||
|
|
|
@ -37,7 +37,7 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock {
|
|||
public static ItemStack getStorageBlockByName(String name, int count) {
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equals(name)) {
|
||||
return new ItemStack(ModBlocks.storage2, count, i);
|
||||
return new ItemStack(ModBlocks.STORAGE2, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The storage block " + name + " could not be found.");
|
||||
|
|
|
@ -26,7 +26,7 @@ public class BlockAESU extends BlockEnergyStorage {
|
|||
@Override
|
||||
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
list.add(new ItemStack(ModBlocks.machineframe, 1, 2));
|
||||
list.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 2));
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ public class BlockMFE extends BlockEnergyStorage {
|
|||
@Override
|
||||
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
list.add(new ItemStack(ModBlocks.machineframe, 1, 1));
|
||||
list.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ public class BlockMFSU extends BlockEnergyStorage {
|
|||
@Override
|
||||
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
list.add(new ItemStack(ModBlocks.machineframe, 1, 1));
|
||||
list.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ public class BlockHVTransformer extends BlockTransformer {
|
|||
@Override
|
||||
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
list.add(new ItemStack(ModBlocks.machineframe, 1, 1));
|
||||
list.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
|
||||
return list;
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ public class BlockMVTransformer extends BlockTransformer {
|
|||
@Override
|
||||
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
list.add(new ItemStack(ModBlocks.machineframe, 1, 0));
|
||||
list.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0));
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ public class ClientMultiBlocks {
|
|||
}
|
||||
|
||||
private static boolean isCoil(int x, int y, int z) {
|
||||
reactor.addComponent(new BlockPos(x, y, z), ModBlocks.fusionCoil.getDefaultState());
|
||||
reactor.addComponent(new BlockPos(x, y, z), ModBlocks.FUSION_COIL.getDefaultState());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -44,7 +44,7 @@ public class ClientMultiBlocks {
|
|||
BlockPos pos = new BlockPos(xDir + i, yDir + j, zDir + k);
|
||||
int meta = (((i == 0) && (j == 0) && (k != 0)) || ((i == 0) && (j != 0) && (k == 0))
|
||||
|| ((i != 0) && (j == 0) && (k == 0)) ? 2 : 1);
|
||||
frezzer.addComponent(pos, ModBlocks.machineCasing.getStateFromMeta(meta));
|
||||
frezzer.addComponent(pos, ModBlocks.MACHINE_CASINGS.getStateFromMeta(meta));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,134 +23,134 @@ public class RegisterItemJsons {
|
|||
}
|
||||
|
||||
private static void registerItems() {
|
||||
register(ModItems.reBattery, "battery/re_battery");
|
||||
register(ModItems.lithiumBattery, "battery/lithium_battery");
|
||||
register(ModItems.energyCrystal, "battery/energy_crystal");
|
||||
register(ModItems.lapotronCrystal, "battery/lapotron_crystal");
|
||||
register(ModItems.lapotronicOrb, "battery/lapotronic_orb");
|
||||
register(ModItems.RE_BATTERY, "battery/re_battery");
|
||||
register(ModItems.LITHIUM_BATTERY, "battery/lithium_battery");
|
||||
register(ModItems.ENERGY_CRYSTAL, "battery/energy_crystal");
|
||||
register(ModItems.LAPOTRONIC_CRYSTAL, "battery/lapotron_crystal");
|
||||
register(ModItems.LAPOTRONIC_ORB, "battery/lapotronic_orb");
|
||||
|
||||
register(ModItems.frequencyTransmitter, "misc/frequency_transmitter");
|
||||
register(ModItems.uuMatter, "misc/uu_matter");
|
||||
register(ModItems.scrapBox, "misc/scrapbox");
|
||||
register(ModItems.manual, "misc/manual");
|
||||
register(ModItems.debug, "misc/debug");
|
||||
register(ModBlocks.rubberSapling, "misc/rubber_sapling");
|
||||
register(ModItems.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter");
|
||||
register(ModItems.UU_MATTER, "misc/uu_matter");
|
||||
register(ModItems.SCRAP_BOX, "misc/scrapbox");
|
||||
register(ModItems.MANUAL, "misc/manual");
|
||||
register(ModItems.DEBUG, "misc/debug");
|
||||
register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling");
|
||||
|
||||
register(ModItems.ironDrill, "tool/steel_drill");
|
||||
register(ModItems.diamondDrill, "tool/diamond_drill");
|
||||
register(ModItems.advancedDrill, "tool/advanced_drill");
|
||||
register(ModItems.ironChainsaw, "tool/steel_chainsaw");
|
||||
register(ModItems.diamondChainsaw, "tool/diamond_chainsaw");
|
||||
register(ModItems.advancedChainsaw, "tool/advanced_chainsaw");
|
||||
register(ModItems.steelJackhammer, "tool/steel_jackhammer");
|
||||
register(ModItems.diamondJackhammer, "tool/diamond_jackhammer");
|
||||
register(ModItems.advancedJackhammer, "tool/advanced_jackhammer");
|
||||
register(ModItems.nanosaber, "tool/nanosaber");
|
||||
register(ModItems.treeTap, "tool/treetap");
|
||||
register(ModItems.electricTreetap, "tool/electric_treetap");
|
||||
register(ModItems.cloakingDevice, "tool/cloaking_device");
|
||||
register(ModItems.omniTool, "tool/omni_tool");
|
||||
register(ModItems.rockCutter, "tool/rock_cutter");
|
||||
register(ModItems.wrench, "tool/wrench");
|
||||
register(ModItems.lapotronpack, "tool/lapotronic_orbpack");
|
||||
register(ModItems.lithiumBatpack, "tool/lithium_batpack");
|
||||
register(ModItems.STEEL_DRILL, "tool/steel_drill");
|
||||
register(ModItems.DIAMOND_DRILL, "tool/diamond_drill");
|
||||
register(ModItems.ADVANCED_DRILL, "tool/advanced_drill");
|
||||
register(ModItems.STEEL_CHAINSAW, "tool/steel_chainsaw");
|
||||
register(ModItems.DIAMOND_CHAINSAW, "tool/diamond_chainsaw");
|
||||
register(ModItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw");
|
||||
register(ModItems.STEEL_JACKHAMMER, "tool/steel_jackhammer");
|
||||
register(ModItems.DIAMOND_JACKHAMMER, "tool/diamond_jackhammer");
|
||||
register(ModItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer");
|
||||
register(ModItems.NANOSABER, "tool/nanosaber");
|
||||
register(ModItems.TREE_TAP, "tool/treetap");
|
||||
register(ModItems.ELECTRIC_TREE_TAP, "tool/electric_treetap");
|
||||
register(ModItems.CLOAKING_DEVICE, "tool/cloaking_device");
|
||||
register(ModItems.OMNI_TOOL, "tool/omni_tool");
|
||||
register(ModItems.ROCK_CUTTER, "tool/rock_cutter");
|
||||
register(ModItems.WRENCH, "tool/wrench");
|
||||
register(ModItems.LAPOTRONIC_ORB_PACK, "tool/lapotronic_orbpack");
|
||||
register(ModItems.LITHIUM_BATTERY_PACK, "tool/lithium_batpack");
|
||||
|
||||
registerBlockstateMultiItem(ModItems.rubyHelmet, "ruby_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.rubyChestplate, "ruby_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.rubyLeggings, "ruby_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.rubyBoots, "ruby_boots", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.sapphireHelmet, "sapphire_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.sapphireChestplate, "sapphire_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.sapphireLeggings, "sapphire_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.sapphireBoots, "sapphire_boots", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.peridotHelmet, "peridot_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.peridotChestplate, "peridot_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.peridotLeggings, "peridot_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.peridotBoots, "peridot_boots", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.bronzeHelmet, "bronze_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.bronzeChestplate, "bronze_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.bronzeLeggings, "bronze_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.bronzeBoots, "bronze_boots", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_HELMET, "ruby_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_LEGGINGS, "ruby_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_BOOTS, "ruby_boots", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_CHSTPLATE, "sapphire_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_HELMET, "peridot_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_BOOTS, "peridot_boots", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_HELMET, "bronze_helmet", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_LEGGINGS, "bronze_leggings", "items/tool/armour");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_BOOTS, "bronze_boots", "items/tool/armour");
|
||||
|
||||
registerBlockstateMultiItem(ModItems.rubyPickaxe, "ruby_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.rubySword, "ruby_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.rubyAxe, "ruby_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.rubySpade, "ruby_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.rubyHoe, "ruby_hoe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.sapphirePickaxe, "sapphire_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.sapphireSword, "sapphire_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.sapphireAxe, "sapphire_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.sapphireSpade, "sapphire_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.sapphireHoe, "sapphire_hoe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.peridotPickaxe, "peridot_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.peridotSword, "peridot_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.peridotAxe, "peridot_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.peridotSpade, "peridot_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.peridotHoe, "peridot_hoe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.bronzePickaxe, "bronze_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.bronzeSword, "bronze_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.bronzeAxe, "bronze_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.bronzeSpade, "bronze_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.bronzeHoe, "bronze_hoe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_SWORD, "ruby_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_AXE, "ruby_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_SPADE, "ruby_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.RUBY_HOE, "ruby_hoe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_SWORD, "peridot_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_AXE, "peridot_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_SAPPHIRE, "peridot_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.PERIDOT_HOE, "peridot_hoe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_SWORD, "bronze_sword", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_AXE, "bronze_axe", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_SPADE, "bronze_spade", "items/tool/tool");
|
||||
registerBlockstateMultiItem(ModItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool");
|
||||
|
||||
for (int i = 0; i < ItemIngots.types.length; ++i) {
|
||||
String[] name = ItemIngots.types.clone();
|
||||
registerBlockstate(ModItems.ingots, i, name[i], "items/materials/");
|
||||
registerBlockstate(ModItems.INGOTS, i, name[i], "items/materials/");
|
||||
}
|
||||
|
||||
for (int i = 0; i < ItemGems.types.length; ++i) {
|
||||
String[] name = ItemGems.types.clone();
|
||||
registerBlockstate(ModItems.gems, i, name[i], "items/materials/");
|
||||
registerBlockstate(ModItems.GEMS, i, name[i], "items/materials/");
|
||||
}
|
||||
|
||||
for (int i = 0; i < ItemPlates.types.length; ++i) {
|
||||
String[] name = ItemPlates.types.clone();
|
||||
registerBlockstate(ModItems.plate, i, name[i], "items/materials/");
|
||||
registerBlockstate(ModItems.PLATES, i, name[i], "items/materials/");
|
||||
}
|
||||
|
||||
for (int i = 0; i < ItemNuggets.types.length; ++i) {
|
||||
String[] name = ItemNuggets.types.clone();
|
||||
registerBlockstate(ModItems.nuggets, i, name[i], "items/materials/");
|
||||
registerBlockstate(ModItems.NUGGETS, i, name[i], "items/materials/");
|
||||
}
|
||||
|
||||
for (int i = 0; i < ItemDusts.types.length; ++i) {
|
||||
String[] name = ItemDusts.types.clone();
|
||||
registerBlockstate(ModItems.dusts, i, name[i], "items/materials/");
|
||||
registerBlockstate(ModItems.DUSTS, i, name[i], "items/materials/");
|
||||
}
|
||||
|
||||
for (int i = 0; i < ItemDustsSmall.types.length; ++i) {
|
||||
String[] name = ItemDustsSmall.types.clone();
|
||||
registerBlockstate(ModItems.smallDusts, i, name[i], "items/materials/");
|
||||
registerBlockstate(ModItems.SMALL_DUSTS, i, name[i], "items/materials/");
|
||||
}
|
||||
|
||||
for (int i = 0; i < ItemParts.types.length; ++i) {
|
||||
String[] name = ItemParts.types.clone();
|
||||
registerBlockstate(ModItems.parts, i, name[i], "items/materials/");
|
||||
registerBlockstate(ModItems.PARTS, i, name[i], "items/materials/");
|
||||
}
|
||||
|
||||
for (int i = 0; i < ItemUpgrades.types.length; ++i) {
|
||||
String[] name = ItemUpgrades.types.clone();
|
||||
registerBlockstate(ModItems.upgrades, i, name[i], "items/misc/");
|
||||
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]);
|
||||
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]);
|
||||
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]);
|
||||
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]);
|
||||
registerBlockstate(ModBlocks.STORAGE2, i, name[i]);
|
||||
}
|
||||
|
||||
if (Loader.isModLoaded("reborncore-mcmultipart"))
|
||||
|
@ -161,7 +161,7 @@ public class RegisterItemJsons {
|
|||
}
|
||||
|
||||
private static void registerBlocks() {
|
||||
register(ModBlocks.ironFence, "iron_fence");
|
||||
register(ModBlocks.REFINED_IRON_FENCE, "iron_fence");
|
||||
}
|
||||
|
||||
private static void register(Item item, int meta, String name) {
|
||||
|
|
|
@ -14,6 +14,6 @@ public class TechRebornCreativeTab extends CreativeTabs {
|
|||
|
||||
@Override
|
||||
public ItemStack getTabIconItem() {
|
||||
return new ItemStack(ModBlocks.thermalGenerator);
|
||||
return new ItemStack(ModBlocks.THERMAL_GENERATOR);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@ public class TechRebornCreativeTabMisc extends CreativeTabs {
|
|||
|
||||
@Override
|
||||
public ItemStack getTabIconItem() {
|
||||
return new ItemStack(ModItems.dynamicCell);
|
||||
return new ItemStack(ModItems.CELL);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ public class ContainerDestructoPack extends RebornContainer {
|
|||
|
||||
private void buildContainer() {
|
||||
this.addSlotToContainer(
|
||||
new SlotFilteredVoid(inv, 0, 80, 36, new ItemStack[] { new ItemStack(ModItems.parts, 1, 37) }));
|
||||
new SlotFilteredVoid(inv, 0, 80, 36, new ItemStack[] { new ItemStack(ModItems.PARTS, 1, 37) }));
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 3; ++i) {
|
||||
|
|
|
@ -12,7 +12,7 @@ public class SlotScrapbox extends BaseSlot {
|
|||
}
|
||||
|
||||
public boolean isItemValid(ItemStack par1ItemStack) {
|
||||
return par1ItemStack.getItem() == ModItems.scrapBox;
|
||||
return par1ItemStack.getItem() == ModItems.SCRAP_BOX;
|
||||
}
|
||||
|
||||
public int getSlotStackLimit() {
|
||||
|
|
|
@ -109,43 +109,43 @@ public class GuiBlastFurnace extends GuiContainer {
|
|||
{// This code here makes a basic multiblock and then sets to the
|
||||
// selected one.
|
||||
Multiblock multiblock = new Multiblock();
|
||||
addComponent(0, 0, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 0, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 0, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 0, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 0, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 0, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 0, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 0, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 0, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 0, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 0, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 0, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 0, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 0, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 0, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 0, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 0, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 0, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
|
||||
addComponent(1, 1, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 1, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 1, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 1, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 1, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 1, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 1, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 1, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 1, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 1, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 1, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 1, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 1, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 1, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 1, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 1, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
|
||||
addComponent(1, 2, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 2, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 2, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 2, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 2, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 2, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 2, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 2, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 2, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 2, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 2, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 2, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 2, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 2, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 2, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 2, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
|
||||
addComponent(0, 3, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 3, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 3, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 3, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 3, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 3, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(-1, 3, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 3, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(1, 3, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
|
||||
addComponent(0, 3, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 3, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 3, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 3, 0, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(0, 3, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 3, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(-1, 3, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 3, -1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
addComponent(1, 3, 1, ModBlocks.MACHINE_CASINGS.getDefaultState(), multiblock);
|
||||
|
||||
MultiblockSet set = new MultiblockSet(multiblock);
|
||||
ClientProxy.multiblockRenderEvent.setMultiblock(set);
|
||||
|
|
|
@ -46,8 +46,8 @@ public class ModelDynamicCell implements IModel {
|
|||
private static final float SOUTH_Z_FLUID = 8.4f / 16f;
|
||||
|
||||
public static void init() {
|
||||
ModelLoader.setCustomMeshDefinition(ModItems.dynamicCell, stack -> MODEL_LOCATION);
|
||||
ModelBakery.registerItemVariants(ModItems.dynamicCell, MODEL_LOCATION);
|
||||
ModelLoader.setCustomMeshDefinition(ModItems.CELL, stack -> MODEL_LOCATION);
|
||||
ModelBakery.registerItemVariants(ModItems.CELL, MODEL_LOCATION);
|
||||
ModelLoaderRegistry.registerLoader(new DynamicCellLoader());
|
||||
}
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
|
|||
float f2 = (1.0F - ((float) entity.fuse - partialTicks + 1.0F) / 100.0F) * 0.8F;
|
||||
this.bindEntityTexture(entity);
|
||||
GlStateManager.translate(-0.5F, -0.5F, 0.5F);
|
||||
blockrendererdispatcher.renderBlockBrightness(ModBlocks.nuke.getDefaultState(),
|
||||
blockrendererdispatcher.renderBlockBrightness(ModBlocks.NUKE.getDefaultState(),
|
||||
entity.getBrightness(partialTicks));
|
||||
GlStateManager.translate(0.0F, 0.0F, 1.0F);
|
||||
if (entity.fuse / 5 % 2 == 0) {
|
||||
|
@ -49,7 +49,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
|
|||
GlStateManager.doPolygonOffset(-3.0F, -3.0F);
|
||||
GlStateManager.enablePolygonOffset();
|
||||
blockrendererdispatcher.renderBlockBrightness(
|
||||
ModBlocks.nuke.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
|
||||
ModBlocks.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
|
||||
GlStateManager.doPolygonOffset(0.0F, 0.0F);
|
||||
GlStateManager.disablePolygonOffset();
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
|
|
@ -29,7 +29,7 @@ public class RecipesIC2 implements ICompatModule {
|
|||
|
||||
@Override
|
||||
public void init(FMLInitializationEvent event) {
|
||||
recipeDuplicateList.add(new RecipeDuplicate(new ItemStack(ModBlocks.machineframe, 0, 1), IC2Items.getItem("resource", "machine")));
|
||||
recipeDuplicateList.add(new RecipeDuplicate(new ItemStack(ModBlocks.MACHINE_FRAMES, 0, 1), IC2Items.getItem("resource", "machine")));
|
||||
|
||||
for (RecipeDuplicate duplicate : recipeDuplicateList) {
|
||||
duplicate.add();
|
||||
|
@ -41,7 +41,7 @@ public class RecipesIC2 implements ICompatModule {
|
|||
CraftingHelper.addShapelessRecipe(ItemParts.getPartByName("rubber"), IC2Items.getItem("crafting", "rubber"));
|
||||
CraftingHelper.addShapelessRecipe(IC2Items.getItem("crafting", "rubber"), ItemParts.getPartByName("rubber"));
|
||||
|
||||
CraftingHelper.addShapelessRecipe(IC2Items.getItem("electric_wrench"), new ItemStack(ModItems.wrench), IC2Items.getItem("crafting", "small_power_unit"));
|
||||
CraftingHelper.addShapelessRecipe(IC2Items.getItem("electric_wrench"), new ItemStack(ModItems.WRENCH), IC2Items.getItem("crafting", "small_power_unit"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -6,6 +6,7 @@ import mezz.jei.api.IJeiHelpers;
|
|||
import mezz.jei.api.IModRegistry;
|
||||
import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
|
||||
import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;
|
||||
import mezz.jei.config.Config;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
|
@ -60,8 +61,6 @@ import techreborn.init.ModItems;
|
|||
import techreborn.items.ItemParts;
|
||||
import techreborn.parts.TechRebornParts;
|
||||
import techreborn.parts.powerCables.EnumCableType;
|
||||
import techreborn.parts.powerCables.ItemCables;
|
||||
import techreborn.world.TechRebornWorldGen;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.ArrayList;
|
||||
|
@ -95,39 +94,39 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
|||
IJeiHelpers jeiHelpers = registry.getJeiHelpers();
|
||||
IGuiHelper guiHelper = jeiHelpers.getGuiHelper();
|
||||
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidBerylium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCalcium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCalciumCarbonate));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidChlorite));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidDeuterium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidGlyceryl));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHelium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHelium3));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHeliumplasma));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHydrogen));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidLithium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidMercury));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidMethane));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrocoalfuel));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrofuel));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrogen));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrogendioxide));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidPotassium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSilicon));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodiumpersulfate));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidTritium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidWolframium));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSulfur));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSulfuricAcid));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCarbon));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCarbonFiber));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitroCarbon));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodiumSulfide));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidDiesel));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitroDiesel));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidOil));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.missingRecipe));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_BERYLLIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_CALCIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_CALCIUM_CARBONATE));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_CHLORITE));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_DEUTERIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_GLYCERYL));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_HELIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_HELIUM_3));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_HELIUMPLASMA));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_HYDROGEN));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_LITHIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_MERCURY));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_METHANE));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITROCOAL_FUEL));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITROFUEL));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITROGEN));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITROGENDIOXIDE));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_POTASSIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_SILICON));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_SODIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_SODIUMPERSULFATE));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_TRITIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_WOLFRAMIUM));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_SULFUR));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_SULFURIC_ACID));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_CARBON));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_CARBON_FIBER));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITRO_CARBON));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_SODIUM_SULFIDE));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_DIESEL));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITRO_DIESEL));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_OIL));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.MISSING_RECIPE_PLACEHOLDER));
|
||||
|
||||
if(IC2Duplicates.deduplicate()){
|
||||
for(IC2Duplicates duplicate : IC2Duplicates.values()){
|
||||
|
@ -145,12 +144,12 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
|||
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("electronicCircuit"));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("advancedCircuit"));
|
||||
if(!Core.worldGen.config.rubberTreeConfig.shouldSpawn){
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberSapling));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberLog));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberPlanks));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberLeaves));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.treeTap));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.electricTreetap));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.RUBBER_SAPLING));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.RUBBER_LOG));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.RUBBER_PLANKS));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.RUBBER_LEAVES));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.TREE_TAP));
|
||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.ELECTRIC_TREE_TAP));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -189,17 +188,17 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
|||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if (mezz.jei.config.Config.isDebugModeEnabled()) {
|
||||
if (Config.isDebugModeEnabled()) {
|
||||
addDebugRecipes(registry);
|
||||
}
|
||||
|
||||
registry.addDescription(ItemParts.getPartByName("rubberSap"),
|
||||
I18n.translateToLocal("techreborn.desc.rubberSap"));
|
||||
if (!ConfigTechReborn.ScrapboxDispenser) {
|
||||
registry.addDescription(new ItemStack(ModItems.scrapBox),
|
||||
registry.addDescription(new ItemStack(ModItems.SCRAP_BOX),
|
||||
I18n.translateToLocal("techreborn.desc.scrapBoxNoDispenser"));
|
||||
} else {
|
||||
registry.addDescription(new ItemStack(ModItems.scrapBox),
|
||||
registry.addDescription(new ItemStack(ModItems.SCRAP_BOX),
|
||||
I18n.translateToLocal("techreborn.desc.scrapBox"));
|
||||
}
|
||||
|
||||
|
@ -237,36 +236,36 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
|||
registry.addRecipeClickArea(GuiThermalGenerator.class, 79, 34, 18, 18,
|
||||
EFluidGenerator.THERMAL.getRecipeID());
|
||||
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.compressor), RecipeCategoryUids.COMPRESSOR);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.alloyFurnace), RecipeCategoryUids.ALLOY_SMELTER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.alloySmelter), RecipeCategoryUids.ALLOY_SMELTER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.assemblyMachine),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.COMPRESSOR), RecipeCategoryUids.COMPRESSOR);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IRON_ALLOY_FURNACE), RecipeCategoryUids.ALLOY_SMELTER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ALLOY_SMELTER), RecipeCategoryUids.ALLOY_SMELTER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ASSEMBLY_MACHINE),
|
||||
RecipeCategoryUids.ASSEMBLING_MACHINE);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.blastFurnace), RecipeCategoryUids.BLAST_FURNACE);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.centrifuge), RecipeCategoryUids.CENTRIFUGE);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.chemicalReactor),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), RecipeCategoryUids.BLAST_FURNACE);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), RecipeCategoryUids.CENTRIFUGE);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.CHEMICAL_REACTOR),
|
||||
RecipeCategoryUids.CHEMICAL_REACTOR);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.extractor), RecipeCategoryUids.EXTRACTOR);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.fusionControlComputer),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.EXTRACTOR), RecipeCategoryUids.EXTRACTOR);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.FUSION_CONTROL_COMPUTER),
|
||||
RecipeCategoryUids.FUSION_REACTOR);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.grinder), RecipeCategoryUids.GRINDER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.implosionCompressor),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.GRINDER), RecipeCategoryUids.GRINDER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR),
|
||||
RecipeCategoryUids.IMPLOSION_COMPRESSOR);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.industrialElectrolyzer),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER),
|
||||
RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.industrialGrinder),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER),
|
||||
RecipeCategoryUids.INDUSTRIAL_GRINDER);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.rollingMachine),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ROLLING_MACHINE),
|
||||
RecipeCategoryUids.ROLLING_MACHINE);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.scrapBox), RecipeCategoryUids.SCRAPBOX);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX);
|
||||
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.semiFluidGenerator),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR),
|
||||
EFluidGenerator.SEMIFLUID.getRecipeID());
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.gasTurbine),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.GAS_TURBINE),
|
||||
EFluidGenerator.GAS.getRecipeID());
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.dieselGenerator),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.DIESEL_GENERATOR),
|
||||
EFluidGenerator.DIESEL.getRecipeID());
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.thermalGenerator),
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.THERMAL_GENERATOR),
|
||||
EFluidGenerator.THERMAL.getRecipeID());
|
||||
|
||||
IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry();
|
||||
|
@ -308,8 +307,8 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
|||
.addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1, 2, 36);
|
||||
|
||||
if (CompatManager.isQuantumStorageLoaded) {
|
||||
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.quantumChest));
|
||||
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.quantumTank));
|
||||
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.QUANTUM_CHEST));
|
||||
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.QUANTUM_TANK));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ public class TRTickHandler {
|
|||
Item chestslot = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != ItemStack.EMPTY
|
||||
? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null;
|
||||
|
||||
if (previouslyWearing != chestslot && previouslyWearing == ModItems.cloakingDevice && player.isInvisible()
|
||||
if (previouslyWearing != chestslot && previouslyWearing == ModItems.CLOAKING_DEVICE && player.isInvisible()
|
||||
&& !player.isPotionActive(MobEffects.INVISIBILITY)) {
|
||||
player.setInvisible(false);
|
||||
}
|
||||
|
|
|
@ -7,27 +7,26 @@ import techreborn.items.ItemIngots;
|
|||
import techreborn.items.ItemParts;
|
||||
import techreborn.items.ItemUpgrades;
|
||||
import techreborn.parts.powerCables.EnumStandaloneCableType;
|
||||
import techreborn.parts.powerCables.ItemStandaloneCables;
|
||||
|
||||
/**
|
||||
* Created by Mark on 18/12/2016.
|
||||
*/
|
||||
public enum IC2Duplicates {
|
||||
|
||||
GRINDER(new ItemStack(ModBlocks.grinder)),
|
||||
ELECTRICAL_FURNACE(new ItemStack(ModBlocks.electricFurnace)),
|
||||
IRON_FURNACE(new ItemStack(ModBlocks.ironFurnace)),
|
||||
GENERATOR(new ItemStack(ModBlocks.generator)),
|
||||
EXTRACTOR(new ItemStack(ModBlocks.extractor)),
|
||||
SOLAR_PANEL(new ItemStack(ModBlocks.solarPanel)),
|
||||
RECYCLER(new ItemStack(ModBlocks.recycler)),
|
||||
COMPRESSOR(new ItemStack(ModBlocks.compressor)),
|
||||
BAT_BOX(new ItemStack(ModBlocks.batBox)),
|
||||
MFE(new ItemStack(ModBlocks.MFE)),
|
||||
MFSU(new ItemStack(ModBlocks.MFSU)),
|
||||
LVT(new ItemStack(ModBlocks.LVT)),
|
||||
MVT(new ItemStack(ModBlocks.MVT)),
|
||||
HVT(new ItemStack(ModBlocks.HVT)),
|
||||
GRINDER(new ItemStack(ModBlocks.GRINDER)),
|
||||
ELECTRICAL_FURNACE(new ItemStack(ModBlocks.ELECTRIC_FURNACE)),
|
||||
IRON_FURNACE(new ItemStack(ModBlocks.IRON_FURNACE)),
|
||||
GENERATOR(new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR)),
|
||||
EXTRACTOR(new ItemStack(ModBlocks.EXTRACTOR)),
|
||||
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)),
|
||||
LVT(new ItemStack(ModBlocks.LV_TRANSFORMER)),
|
||||
MVT(new ItemStack(ModBlocks.MV_TRANSFORMER)),
|
||||
HVT(new ItemStack(ModBlocks.HV_TRANSFORMER)),
|
||||
CABLE_COPPER(EnumStandaloneCableType.COPPER.getStack()),
|
||||
CABLE_GLASSFIBER(EnumStandaloneCableType.GLASSFIBER.getStack()),
|
||||
CABLE_GOLD(EnumStandaloneCableType.GOLD.getStack()),
|
||||
|
|
|
@ -41,385 +41,385 @@ import java.lang.reflect.InvocationTargetException;
|
|||
|
||||
public class ModBlocks {
|
||||
|
||||
public static Block thermalGenerator;
|
||||
public static Block quantumTank;
|
||||
public static Block quantumChest;
|
||||
public static Block digitalChest;
|
||||
public static Block centrifuge;
|
||||
public static Block rollingMachine;
|
||||
public static Block machineCasing;
|
||||
public static Block blastFurnace;
|
||||
public static Block alloySmelter;
|
||||
public static Block industrialGrinder;
|
||||
public static Block implosionCompressor;
|
||||
public static Block matterFabricator;
|
||||
public static Block chunkLoader;
|
||||
public static Block dragonEggEnergySiphoner;
|
||||
public static Block magicEnergeyConverter;
|
||||
public static Block assemblyMachine;
|
||||
public static Block dieselGenerator;
|
||||
public static Block industrialElectrolyzer;
|
||||
public static Block magicalAbsorber;
|
||||
public static Block semiFluidGenerator;
|
||||
public static Block gasTurbine;
|
||||
public static Block alloyFurnace;
|
||||
public static Block chemicalReactor;
|
||||
public static Block IDSU;
|
||||
public static Block AESU;
|
||||
public static Block LESU;
|
||||
public static Block LESUStorage;
|
||||
public static Block distillationTower;
|
||||
public static Block vacuumFreezer;
|
||||
public static Block fusionControlComputer;
|
||||
public static Block fusionCoil;
|
||||
public static Block lightningRod;
|
||||
public static Block heatGenerator;
|
||||
public static Block industrialSawmill;
|
||||
public static Block chargeBench;
|
||||
public static Block playerDetector;
|
||||
public static Block grinder;
|
||||
public static Block generator;
|
||||
public static Block compressor;
|
||||
public static Block extractor;
|
||||
public static Block electricFurnace;
|
||||
public static Block solarPanel;
|
||||
public static Block waterMill;
|
||||
public static Block windMill;
|
||||
public static Block recycler;
|
||||
public static Block batBox;
|
||||
public static Block MFE;
|
||||
public static Block MFSU;
|
||||
public static Block scrapboxinator;
|
||||
public static Block LVT;
|
||||
public static Block MVT;
|
||||
public static Block HVT;
|
||||
public static Block THERMAL_GENERATOR;
|
||||
public static Block QUANTUM_TANK;
|
||||
public static Block QUANTUM_CHEST;
|
||||
public static Block DIGITAL_CHEST;
|
||||
public static Block INDUSTRIAL_CENTRIFUGE;
|
||||
public static Block ROLLING_MACHINE;
|
||||
public static Block MACHINE_CASINGS;
|
||||
public static Block INDUSTRIAL_BLAST_FURNACE;
|
||||
public static Block ALLOY_SMELTER;
|
||||
public static Block INDUSTRIAL_GRINDER;
|
||||
public static Block IMPLOSION_COMPRESSOR;
|
||||
public static Block MATTER_FABRICATOR;
|
||||
public static Block CHUNK_LOADER;
|
||||
public static Block DRAGON_EGG_SIPHONER;
|
||||
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 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 DISTILLATION_TOWER;
|
||||
public static Block VACUUM_FREEZER;
|
||||
public static Block FUSION_CONTROL_COMPUTER;
|
||||
public static Block FUSION_COIL;
|
||||
public static Block LIGHTNING_ROD;
|
||||
public static Block HEAT_GENERATOR;
|
||||
public static Block INDUSTRIAL_SAWMILL;
|
||||
public static Block CHARGE_O_MAT;
|
||||
public static Block PLAYER_DETECTOR;
|
||||
public static Block GRINDER;
|
||||
public static Block SOLID_FUEL_GENEREATOR;
|
||||
public static Block COMPRESSOR;
|
||||
public static Block EXTRACTOR;
|
||||
public static Block ELECTRIC_FURNACE;
|
||||
public static Block 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 SCRAPBOXINATOR;
|
||||
public static Block LV_TRANSFORMER;
|
||||
public static Block MV_TRANSFORMER;
|
||||
public static Block HV_TRANSFORMER;
|
||||
|
||||
public static BlockOre ore;
|
||||
public static BlockOre2 ore2;
|
||||
public static Block storage;
|
||||
public static Block storage2;
|
||||
public static Block machineframe;
|
||||
public static Block reinforcedglass;
|
||||
public static Block ironFurnace;
|
||||
public static Block nuke;
|
||||
public static BlockOre ORE;
|
||||
public static BlockOre2 ORE2;
|
||||
public static Block STORAGE;
|
||||
public static Block STORAGE2;
|
||||
public static Block MACHINE_FRAMES;
|
||||
public static Block REINFORCED_GLASS;
|
||||
public static Block IRON_FURNACE;
|
||||
public static Block NUKE;
|
||||
|
||||
public static Block rubberLog;
|
||||
public static Block rubberLeaves;
|
||||
public static Block rubberSapling;
|
||||
public static Block rubberPlanks;
|
||||
public static Block RUBBER_LOG;
|
||||
public static Block RUBBER_LEAVES;
|
||||
public static Block RUBBER_SAPLING;
|
||||
public static Block RUBBER_PLANKS;
|
||||
|
||||
public static Block ironFence;
|
||||
public static Block flare;
|
||||
public static Block REFINED_IRON_FENCE;
|
||||
public static Block FLARE;
|
||||
|
||||
public static void init() {
|
||||
thermalGenerator = new BlockThermalGenerator();
|
||||
registerBlock(thermalGenerator, "techreborn.thermalGenerator");
|
||||
THERMAL_GENERATOR = new BlockThermalGenerator();
|
||||
registerBlock(THERMAL_GENERATOR, "techreborn.thermalGenerator");
|
||||
GameRegistry.registerTileEntity(TileThermalGenerator.class, "TileThermalGeneratorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(thermalGenerator, "machines/generators/thermal_generator");
|
||||
Core.proxy.registerCustomBlockStateLocation(THERMAL_GENERATOR, "machines/generators/thermal_generator");
|
||||
|
||||
quantumTank = new BlockQuantumTank();
|
||||
registerBlock(quantumTank, ItemBlockQuantumTank.class, "techreborn.quantumTank");
|
||||
QUANTUM_TANK = new BlockQuantumTank();
|
||||
registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "techreborn.quantumTank");
|
||||
GameRegistry.registerTileEntity(TileQuantumTank.class, "TileQuantumTankTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(quantumTank, "machines/tier3_machines/quantum_tank");
|
||||
Core.proxy.registerCustomBlockStateLocation(QUANTUM_TANK, "machines/tier3_machines/quantum_tank");
|
||||
|
||||
quantumChest = new BlockQuantumChest();
|
||||
registerBlock(quantumChest, ItemBlockQuantumChest.class, "techreborn.quantumChest");
|
||||
QUANTUM_CHEST = new BlockQuantumChest();
|
||||
registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "techreborn.quantumChest");
|
||||
GameRegistry.registerTileEntity(TileQuantumChest.class, "TileQuantumChestTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(quantumChest, "machines/tier3_machines/quantum_chest");
|
||||
Core.proxy.registerCustomBlockStateLocation(QUANTUM_CHEST, "machines/tier3_machines/quantum_chest");
|
||||
|
||||
digitalChest = new BlockDigitalChest();
|
||||
registerBlock(digitalChest, ItemBlockDigitalChest.class, "techreborn.digitalChest");
|
||||
DIGITAL_CHEST = new BlockDigitalChest();
|
||||
registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "techreborn.digitalChest");
|
||||
GameRegistry.registerTileEntity(TileDigitalChest.class, "TileDigitalChestTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(digitalChest, "machines/tier2_machines/digital_chest");
|
||||
Core.proxy.registerCustomBlockStateLocation(DIGITAL_CHEST, "machines/tier2_machines/digital_chest");
|
||||
|
||||
centrifuge = new BlockCentrifuge();
|
||||
registerBlock(centrifuge, "techreborn.centrifuge");
|
||||
INDUSTRIAL_CENTRIFUGE = new BlockCentrifuge();
|
||||
registerBlock(INDUSTRIAL_CENTRIFUGE, "techreborn.centrifuge");
|
||||
GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(centrifuge, "machines/tier2_machines/industrial_centrifuge");
|
||||
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_CENTRIFUGE, "machines/tier2_machines/industrial_centrifuge");
|
||||
|
||||
rollingMachine = new BlockRollingMachine(Material.ROCK);
|
||||
registerBlock(rollingMachine, "rollingmachine");
|
||||
ROLLING_MACHINE = new BlockRollingMachine(Material.ROCK);
|
||||
registerBlock(ROLLING_MACHINE, "rollingmachine");
|
||||
GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(rollingMachine, "machines/tier1_machines/rolling_machine");
|
||||
Core.proxy.registerCustomBlockStateLocation(ROLLING_MACHINE, "machines/tier1_machines/rolling_machine");
|
||||
|
||||
blastFurnace = new BlockBlastFurnace(Material.ROCK);
|
||||
registerBlock(blastFurnace, "blastFurnace");
|
||||
INDUSTRIAL_BLAST_FURNACE = new BlockBlastFurnace(Material.ROCK);
|
||||
registerBlock(INDUSTRIAL_BLAST_FURNACE, "blastFurnace");
|
||||
GameRegistry.registerTileEntity(TileBlastFurnace.class, "TileBlastFurnaceTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(blastFurnace, "machines/tier2_machines/industrial_blast_furnace");
|
||||
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_BLAST_FURNACE, "machines/tier2_machines/industrial_blast_furnace");
|
||||
|
||||
alloySmelter = new BlockAlloySmelter(Material.ROCK);
|
||||
registerBlock(alloySmelter, "alloySmelter");
|
||||
ALLOY_SMELTER = new BlockAlloySmelter(Material.ROCK);
|
||||
registerBlock(ALLOY_SMELTER, "alloySmelter");
|
||||
GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(alloySmelter, "machines/tier1_machines/electric_alloy_smelter");
|
||||
Core.proxy.registerCustomBlockStateLocation(ALLOY_SMELTER, "machines/tier1_machines/electric_alloy_smelter");
|
||||
|
||||
industrialGrinder = new BlockIndustrialGrinder(Material.ROCK);
|
||||
registerBlock(industrialGrinder, "grinder");
|
||||
INDUSTRIAL_GRINDER = new BlockIndustrialGrinder(Material.ROCK);
|
||||
registerBlock(INDUSTRIAL_GRINDER, "grinder");
|
||||
GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(industrialGrinder, "machines/tier2_machines/industrial_grinder");
|
||||
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_GRINDER, "machines/tier2_machines/industrial_grinder");
|
||||
|
||||
implosionCompressor = new BlockImplosionCompressor(Material.ROCK);
|
||||
registerBlock(implosionCompressor, "implosioncompressor");
|
||||
IMPLOSION_COMPRESSOR = new BlockImplosionCompressor(Material.ROCK);
|
||||
registerBlock(IMPLOSION_COMPRESSOR, "implosioncompressor");
|
||||
GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(implosionCompressor, "machines/tier2_machines/implosion_compressor");
|
||||
Core.proxy.registerCustomBlockStateLocation(IMPLOSION_COMPRESSOR, "machines/tier2_machines/implosion_compressor");
|
||||
|
||||
matterFabricator = new BlockMatterFabricator(Material.ROCK);
|
||||
registerBlock(matterFabricator, "matterfabricator");
|
||||
MATTER_FABRICATOR = new BlockMatterFabricator(Material.ROCK);
|
||||
registerBlock(MATTER_FABRICATOR, "matterfabricator");
|
||||
GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(matterFabricator, "machines/tier3_machines/matter_fabricator");
|
||||
Core.proxy.registerCustomBlockStateLocation(MATTER_FABRICATOR, "machines/tier3_machines/matter_fabricator");
|
||||
|
||||
chunkLoader = new BlockChunkLoader(Material.ROCK);
|
||||
registerBlock(chunkLoader, "chunkloader");
|
||||
CHUNK_LOADER = new BlockChunkLoader(Material.ROCK);
|
||||
registerBlock(CHUNK_LOADER, "chunkloader");
|
||||
GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(chunkLoader, "machines/tier3_machines/industrial_chunk_loader");
|
||||
Core.proxy.registerCustomBlockStateLocation(CHUNK_LOADER, "machines/tier3_machines/industrial_chunk_loader");
|
||||
|
||||
chargeBench = new BlockChargeBench(Material.ROCK);
|
||||
registerBlock(chargeBench, "chargebench");
|
||||
CHARGE_O_MAT = new BlockChargeBench(Material.ROCK);
|
||||
registerBlock(CHARGE_O_MAT, "chargebench");
|
||||
GameRegistry.registerTileEntity(TileChargeBench.class, "TileChargeBench");
|
||||
Core.proxy.registerCustomBlockStateLocation(chargeBench, "machines/tier2_machines/charge_bench");
|
||||
Core.proxy.registerCustomBlockStateLocation(CHARGE_O_MAT, "machines/tier2_machines/charge_bench");
|
||||
|
||||
playerDetector = new BlockPlayerDetector();
|
||||
registerBlock(playerDetector, ItemBlockPlayerDetector.class, "playerDetector");
|
||||
PLAYER_DETECTOR = new BlockPlayerDetector();
|
||||
registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "playerDetector");
|
||||
GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR");
|
||||
|
||||
machineCasing = new BlockMachineCasing(Material.ROCK);
|
||||
registerBlock(machineCasing, ItemBlockMachineCasing.class, "machinecasing");
|
||||
MACHINE_CASINGS = new BlockMachineCasing(Material.ROCK);
|
||||
registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machinecasing");
|
||||
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
|
||||
if (Core.proxy.isCTMAvailable()) {
|
||||
Core.proxy.registerCustomBlockStateLocation(machineCasing, "machines/structure/machine_casing_ctm");
|
||||
Core.proxy.registerCustomBlockStateLocation(MACHINE_CASINGS, "machines/structure/machine_casing_ctm");
|
||||
} else {
|
||||
Core.proxy.registerCustomBlockStateLocation(machineCasing, "machines/structure/machine_casing");
|
||||
Core.proxy.registerCustomBlockStateLocation(MACHINE_CASINGS, "machines/structure/machine_casing");
|
||||
}
|
||||
|
||||
ore = new BlockOre(Material.ROCK);
|
||||
registerBlock(ore, ItemBlockOre.class, "techreborn.ore");
|
||||
ORE = new BlockOre(Material.ROCK);
|
||||
registerBlock(ORE, ItemBlockOre.class, "techreborn.ore");
|
||||
for (int i = 0; i < BlockOre.ores.length; i++) {
|
||||
Core.proxy.registerSubBlockInventoryLocation(ore, i, "storage/ores", BlockOre.ores[i]);
|
||||
Core.proxy.registerSubBlockInventoryLocation(ORE, i, "storage/ores", BlockOre.ores[i]);
|
||||
}
|
||||
|
||||
ore2 = new BlockOre2(Material.ROCK);
|
||||
registerBlock(ore2, ItemBlockOre2.class, "techreborn.ore2");
|
||||
ORE2 = new BlockOre2(Material.ROCK);
|
||||
registerBlock(ORE2, ItemBlockOre2.class, "techreborn.ore2");
|
||||
for (int i = 0; i < BlockOre2.ores.length; i++) {
|
||||
Core.proxy.registerSubBlockInventoryLocation(ore2, i, "storage/ores", BlockOre2.ores[i]);
|
||||
Core.proxy.registerSubBlockInventoryLocation(ORE2, i, "storage/ores", BlockOre2.ores[i]);
|
||||
}
|
||||
|
||||
storage = new BlockStorage(Material.IRON);
|
||||
registerBlock(storage, ItemBlockStorage.class, "techreborn.storage");
|
||||
STORAGE = new BlockStorage(Material.IRON);
|
||||
registerBlock(STORAGE, ItemBlockStorage.class, "techreborn.storage");
|
||||
for (int i = 0; i < BlockStorage.types.length; i++) {
|
||||
Core.proxy.registerSubBlockInventoryLocation(storage, i, "storage/storage", BlockStorage.types[i]);
|
||||
Core.proxy.registerSubBlockInventoryLocation(STORAGE, i, "storage/storage", BlockStorage.types[i]);
|
||||
}
|
||||
|
||||
storage2 = new BlockStorage2(Material.IRON);
|
||||
registerBlock(storage2, ItemBlockStorage2.class, "techreborn.storage2");
|
||||
STORAGE2 = new BlockStorage2(Material.IRON);
|
||||
registerBlock(STORAGE2, ItemBlockStorage2.class, "techreborn.storage2");
|
||||
for (int i = 0; i < BlockStorage2.types.length; i++) {
|
||||
Core.proxy.registerSubBlockInventoryLocation(storage2, i, "storage/storage", BlockStorage2.types[i]);
|
||||
Core.proxy.registerSubBlockInventoryLocation(STORAGE2, i, "storage/storage", BlockStorage2.types[i]);
|
||||
}
|
||||
|
||||
dragonEggEnergySiphoner = new BlockDragonEggSiphoner(Material.ROCK);
|
||||
registerBlock(dragonEggEnergySiphoner, "dragoneggenergsiphon");
|
||||
DRAGON_EGG_SIPHONER = new BlockDragonEggSiphoner(Material.ROCK);
|
||||
registerBlock(DRAGON_EGG_SIPHONER, "dragoneggenergsiphon");
|
||||
GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(dragonEggEnergySiphoner, "machines/generators/dragon_egg_syphon");
|
||||
Core.proxy.registerCustomBlockStateLocation(DRAGON_EGG_SIPHONER, "machines/generators/dragon_egg_syphon");
|
||||
|
||||
magicEnergeyConverter = new BlockMagicEnergyConverter(Material.ROCK);
|
||||
registerBlock(magicEnergeyConverter, "magicenergyconverter");
|
||||
Core.proxy.registerCustomBlockStateLocation(magicEnergeyConverter, "machines/generators/magic_energy_converter");
|
||||
MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter(Material.ROCK);
|
||||
registerBlock(MAGIC_ENERGY_CONVERTER, "magicenergyconverter");
|
||||
Core.proxy.registerCustomBlockStateLocation(MAGIC_ENERGY_CONVERTER, "machines/generators/magic_energy_converter");
|
||||
|
||||
assemblyMachine = new BlockAssemblingMachine(Material.ROCK);
|
||||
registerBlock(assemblyMachine, "assemblymachine");
|
||||
ASSEMBLY_MACHINE = new BlockAssemblingMachine(Material.ROCK);
|
||||
registerBlock(ASSEMBLY_MACHINE, "assemblymachine");
|
||||
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(assemblyMachine, "machines/tier1_machines/assembly_machine");
|
||||
Core.proxy.registerCustomBlockStateLocation(ASSEMBLY_MACHINE, "machines/tier1_machines/assembly_machine");
|
||||
|
||||
dieselGenerator = new BlockDieselGenerator(Material.ROCK);
|
||||
registerBlock(dieselGenerator, "dieselgenerator");
|
||||
DIESEL_GENERATOR = new BlockDieselGenerator(Material.ROCK);
|
||||
registerBlock(DIESEL_GENERATOR, "dieselgenerator");
|
||||
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(dieselGenerator, "machines/generators/diesel_generator");
|
||||
Core.proxy.registerCustomBlockStateLocation(DIESEL_GENERATOR, "machines/generators/diesel_generator");
|
||||
|
||||
industrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK);
|
||||
registerBlock(industrialElectrolyzer, "industrialelectrolyzer");
|
||||
INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer(Material.ROCK);
|
||||
registerBlock(INDUSTRIAL_ELECTROLYZER, "industrialelectrolyzer");
|
||||
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(industrialElectrolyzer, "machines/tier1_machines/industrial_electrolyzer");
|
||||
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_ELECTROLYZER, "machines/tier1_machines/industrial_electrolyzer");
|
||||
|
||||
magicalAbsorber = new BlockMagicEnergyAbsorber(Material.ROCK);
|
||||
registerBlock(magicalAbsorber, "magicrnergyabsorber");
|
||||
Core.proxy.registerCustomBlockStateLocation(magicalAbsorber, "machines/generators/magic_energy_absorber");
|
||||
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber(Material.ROCK);
|
||||
registerBlock(MAGICAL_ABSORBER, "magicrnergyabsorber");
|
||||
Core.proxy.registerCustomBlockStateLocation(MAGICAL_ABSORBER, "machines/generators/magic_energy_absorber");
|
||||
|
||||
semiFluidGenerator = new BlockSemiFluidGenerator(Material.ROCK);
|
||||
registerBlock(semiFluidGenerator, "semifluidgenerator");
|
||||
SEMIFLUID_GENERATOR = new BlockSemiFluidGenerator(Material.ROCK);
|
||||
registerBlock(SEMIFLUID_GENERATOR, "semifluidgenerator");
|
||||
GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(semiFluidGenerator, "machines/generators/semi_fluid_generator");
|
||||
Core.proxy.registerCustomBlockStateLocation(SEMIFLUID_GENERATOR, "machines/generators/semi_fluid_generator");
|
||||
|
||||
gasTurbine = new BlockGasTurbine(Material.ROCK);
|
||||
registerBlock(gasTurbine, "gasturbine");
|
||||
GAS_TURBINE = new BlockGasTurbine(Material.ROCK);
|
||||
registerBlock(GAS_TURBINE, "gasturbine");
|
||||
GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(gasTurbine, "machines/generators/gas_turbine");
|
||||
Core.proxy.registerCustomBlockStateLocation(GAS_TURBINE, "machines/generators/gas_turbine");
|
||||
|
||||
alloyFurnace = new BlockAlloyFurnace(Material.ROCK);
|
||||
registerBlock(alloyFurnace, "alloyfurnace");
|
||||
IRON_ALLOY_FURNACE = new BlockAlloyFurnace(Material.ROCK);
|
||||
registerBlock(IRON_ALLOY_FURNACE, "alloyfurnace");
|
||||
GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(alloyFurnace, "machines/tier0_machines/alloy_furnace");
|
||||
Core.proxy.registerCustomBlockStateLocation(IRON_ALLOY_FURNACE, "machines/tier0_machines/alloy_furnace");
|
||||
|
||||
chemicalReactor = new BlockChemicalReactor(Material.ROCK);
|
||||
registerBlock(chemicalReactor, "chemicalreactor");
|
||||
CHEMICAL_REACTOR = new BlockChemicalReactor(Material.ROCK);
|
||||
registerBlock(CHEMICAL_REACTOR, "chemicalreactor");
|
||||
GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(chemicalReactor, "machines/tier1_machines/chemical_reactor");
|
||||
Core.proxy.registerCustomBlockStateLocation(CHEMICAL_REACTOR, "machines/tier1_machines/chemical_reactor");
|
||||
|
||||
IDSU = new BlockIDSU();
|
||||
registerBlock(IDSU, "idsu");
|
||||
INTERDIMENSIONAL_SU = new BlockIDSU();
|
||||
registerBlock(INTERDIMENSIONAL_SU, "idsu");
|
||||
GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR");
|
||||
|
||||
AESU = new BlockAESU();
|
||||
registerBlock(AESU, ItemBlockAesu.class, "aesu");
|
||||
ADJUSTABLE_SU = new BlockAESU();
|
||||
registerBlock(ADJUSTABLE_SU, ItemBlockAesu.class, "aesu");
|
||||
GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR");
|
||||
|
||||
LESU = new BlockLESU();
|
||||
registerBlock(LESU, "lesu");
|
||||
LAPOTRONIC_SU = new BlockLESU();
|
||||
registerBlock(LAPOTRONIC_SU, "lesu");
|
||||
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
|
||||
|
||||
LESUStorage = new BlockLESUStorage(Material.ROCK);
|
||||
registerBlock(LESUStorage, "lesustorage");
|
||||
LSU_STORAGE_BLOCK = new BlockLESUStorage(Material.ROCK);
|
||||
registerBlock(LSU_STORAGE_BLOCK, "lesustorage");
|
||||
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");
|
||||
if (Core.proxy.isCTMAvailable()) {
|
||||
Core.proxy.registerCustomBlockStateLocation(LESUStorage, "machines/energy/ev_multi_storage_ctm");
|
||||
Core.proxy.registerCustomBlockStateLocation(LSU_STORAGE_BLOCK, "machines/energy/ev_multi_storage_ctm");
|
||||
} else {
|
||||
Core.proxy.registerCustomBlockStateLocation(LESUStorage, "machines/energy/ev_multi_storage");
|
||||
Core.proxy.registerCustomBlockStateLocation(LSU_STORAGE_BLOCK, "machines/energy/ev_multi_storage");
|
||||
}
|
||||
|
||||
distillationTower = new BlockDistillationTower(Material.ROCK);
|
||||
registerBlock(distillationTower, "distillationtower");
|
||||
Core.proxy.registerCustomBlockStateLocation(distillationTower, "machines/tier2_machines/distillation_tower");
|
||||
DISTILLATION_TOWER = new BlockDistillationTower(Material.ROCK);
|
||||
registerBlock(DISTILLATION_TOWER, "distillationtower");
|
||||
Core.proxy.registerCustomBlockStateLocation(DISTILLATION_TOWER, "machines/tier2_machines/distillation_tower");
|
||||
|
||||
vacuumFreezer = new BlockVacuumFreezer(Material.ROCK);
|
||||
registerBlock(vacuumFreezer, "vacuumfreezer");
|
||||
VACUUM_FREEZER = new BlockVacuumFreezer(Material.ROCK);
|
||||
registerBlock(VACUUM_FREEZER, "vacuumfreezer");
|
||||
GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(vacuumFreezer, "machines/tier2_machines/vacuum_freezer");
|
||||
Core.proxy.registerCustomBlockStateLocation(VACUUM_FREEZER, "machines/tier2_machines/vacuum_freezer");
|
||||
|
||||
fusionControlComputer = new BlockFusionControlComputer(Material.ROCK);
|
||||
registerBlock(fusionControlComputer, "fusioncontrolcomputer");
|
||||
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer(Material.ROCK);
|
||||
registerBlock(FUSION_CONTROL_COMPUTER, "fusioncontrolcomputer");
|
||||
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(fusionControlComputer, "machines/generators/fusion_reactor");
|
||||
Core.proxy.registerCustomBlockStateLocation(FUSION_CONTROL_COMPUTER, "machines/generators/fusion_reactor");
|
||||
|
||||
fusionCoil = new BlockFusionCoil(Material.ROCK);
|
||||
registerBlock(fusionCoil, "fusioncoil");
|
||||
Core.proxy.registerCustomBlockStateLocation(fusionCoil, "machines/generators/fusion_coil");
|
||||
FUSION_COIL = new BlockFusionCoil(Material.ROCK);
|
||||
registerBlock(FUSION_COIL, "fusioncoil");
|
||||
Core.proxy.registerCustomBlockStateLocation(FUSION_COIL, "machines/generators/fusion_coil");
|
||||
|
||||
lightningRod = new BlockLightningRod(Material.ROCK);
|
||||
registerBlock(lightningRod, "lightningrod");
|
||||
LIGHTNING_ROD = new BlockLightningRod(Material.ROCK);
|
||||
registerBlock(LIGHTNING_ROD, "lightningrod");
|
||||
GameRegistry.registerTileEntity(TileLightningRod.class, "TileLightningRodTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(lightningRod, "machines/generators/lightning_rod");
|
||||
Core.proxy.registerCustomBlockStateLocation(LIGHTNING_ROD, "machines/generators/lightning_rod");
|
||||
|
||||
heatGenerator = new BlockHeatGenerator(Material.ROCK);
|
||||
registerBlock(heatGenerator, "heatgenerator");
|
||||
HEAT_GENERATOR = new BlockHeatGenerator(Material.ROCK);
|
||||
registerBlock(HEAT_GENERATOR, "heatgenerator");
|
||||
GameRegistry.registerTileEntity(TileHeatGenerator.class, "TileHeatGeneratorTR");
|
||||
|
||||
industrialSawmill = new BlockIndustrialSawmill(Material.ROCK);
|
||||
registerBlock(industrialSawmill, "industrialSawmill");
|
||||
INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill(Material.ROCK);
|
||||
registerBlock(INDUSTRIAL_SAWMILL, "industrialSawmill");
|
||||
GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(industrialSawmill, "machines/tier2_machines/industrial_saw_mill");
|
||||
Core.proxy.registerCustomBlockStateLocation(INDUSTRIAL_SAWMILL, "machines/tier2_machines/industrial_saw_mill");
|
||||
|
||||
machineframe = new BlockMachineFrame(Material.IRON);
|
||||
registerBlock(machineframe, ItemBlockMachineFrame.class, "techreborn.machineFrame");
|
||||
Core.proxy.registerCustomBlockStateLocation(machineframe, "machines/storage/machine_blocks");
|
||||
MACHINE_FRAMES = new BlockMachineFrame(Material.IRON);
|
||||
registerBlock(MACHINE_FRAMES, ItemBlockMachineFrame.class, "techreborn.machineFrame");
|
||||
Core.proxy.registerCustomBlockStateLocation(MACHINE_FRAMES, "machines/storage/machine_blocks");
|
||||
|
||||
grinder = new BlockGrinder(Material.IRON);
|
||||
registerBlock(grinder, "techreborn.grinder");
|
||||
GRINDER = new BlockGrinder(Material.IRON);
|
||||
registerBlock(GRINDER, "techreborn.grinder");
|
||||
GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(grinder, "machines/tier1_machines/grinder");
|
||||
Core.proxy.registerCustomBlockStateLocation(GRINDER, "machines/tier1_machines/grinder");
|
||||
|
||||
generator = new BlockGenerator();
|
||||
registerBlock(generator, "techreborn.generator");
|
||||
SOLID_FUEL_GENEREATOR = new BlockGenerator();
|
||||
registerBlock(SOLID_FUEL_GENEREATOR, "techreborn.generator");
|
||||
GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(generator, "machines/generators/generator");
|
||||
Core.proxy.registerCustomBlockStateLocation(SOLID_FUEL_GENEREATOR, "machines/generators/generator");
|
||||
|
||||
extractor = new BlockExtractor(Material.IRON);
|
||||
registerBlock(extractor, "techreborn.extractor");
|
||||
EXTRACTOR = new BlockExtractor(Material.IRON);
|
||||
registerBlock(EXTRACTOR, "techreborn.extractor");
|
||||
GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(extractor, "machines/tier1_machines/extractor");
|
||||
Core.proxy.registerCustomBlockStateLocation(EXTRACTOR, "machines/tier1_machines/extractor");
|
||||
|
||||
compressor = new BlockCompressor(Material.IRON);
|
||||
registerBlock(compressor, "techreborn.compressor");
|
||||
COMPRESSOR = new BlockCompressor(Material.IRON);
|
||||
registerBlock(COMPRESSOR, "techreborn.compressor");
|
||||
GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(compressor, "machines/tier1_machines/compressor");
|
||||
Core.proxy.registerCustomBlockStateLocation(COMPRESSOR, "machines/tier1_machines/compressor");
|
||||
|
||||
electricFurnace = new BlockElectricFurnace(Material.IRON);
|
||||
registerBlock(electricFurnace, "techreborn.electricfurnace");
|
||||
ELECTRIC_FURNACE = new BlockElectricFurnace(Material.IRON);
|
||||
registerBlock(ELECTRIC_FURNACE, "techreborn.electricfurnace");
|
||||
GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(electricFurnace, "machines/tier1_machines/electric_furnace");
|
||||
Core.proxy.registerCustomBlockStateLocation(ELECTRIC_FURNACE, "machines/tier1_machines/electric_furnace");
|
||||
|
||||
solarPanel = new BlockSolarPanel();
|
||||
registerBlock(solarPanel, "techreborn.solarpanel");
|
||||
SOLAR_PANEL = new BlockSolarPanel();
|
||||
registerBlock(SOLAR_PANEL, "techreborn.solarpanel");
|
||||
GameRegistry.registerTileEntity(TileSolarPanel.class, "TileSolarPanel");
|
||||
Core.proxy.registerCustomBlockStateLocation(solarPanel, "machines/generators/solar_panel");
|
||||
Core.proxy.registerCustomBlockStateLocation(SOLAR_PANEL, "machines/generators/solar_panel");
|
||||
|
||||
waterMill = new BlockWaterMill();
|
||||
registerBlock(waterMill, "techreborn.watermill");
|
||||
WATER_MILL = new BlockWaterMill();
|
||||
registerBlock(WATER_MILL, "techreborn.watermill");
|
||||
GameRegistry.registerTileEntity(TileWaterMill.class, "TileWaterMill");
|
||||
Core.proxy.registerCustomBlockStateLocation(waterMill, "machines/generators/water_mill");
|
||||
Core.proxy.registerCustomBlockStateLocation(WATER_MILL, "machines/generators/water_mill");
|
||||
|
||||
windMill = new BlockWindMill();
|
||||
registerBlock(windMill, "techreborn.windmill");
|
||||
WIND_MILL = new BlockWindMill();
|
||||
registerBlock(WIND_MILL, "techreborn.windmill");
|
||||
GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMill");
|
||||
Core.proxy.registerCustomBlockStateLocation(windMill, "machines/generators/wind_mill");
|
||||
Core.proxy.registerCustomBlockStateLocation(WIND_MILL, "machines/generators/wind_mill");
|
||||
|
||||
GameRegistry.registerTileEntity(TileMachineBase.class, "TileMachineBaseTR");
|
||||
|
||||
rubberLog = new BlockRubberLog();
|
||||
registerBlock(rubberLog, "rubberLog");
|
||||
RUBBER_LOG = new BlockRubberLog();
|
||||
registerBlock(RUBBER_LOG, "rubberLog");
|
||||
|
||||
rubberPlanks = new BlockRubberPlank();
|
||||
registerBlock(rubberPlanks, "rubberPlanks");
|
||||
RUBBER_PLANKS = new BlockRubberPlank();
|
||||
registerBlock(RUBBER_PLANKS, "rubberPlanks");
|
||||
|
||||
rubberLeaves = new BlockRubberLeaves();
|
||||
registerBlock(rubberLeaves, "rubberLeaves");
|
||||
RUBBER_LEAVES = new BlockRubberLeaves();
|
||||
registerBlock(RUBBER_LEAVES, "rubberLeaves");
|
||||
|
||||
rubberSapling = new BlockRubberSapling();
|
||||
registerBlock(rubberSapling, ItemBlockRubberSapling.class, "rubberSapling");
|
||||
RUBBER_SAPLING = new BlockRubberSapling();
|
||||
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubberSapling");
|
||||
|
||||
ironFence = new BlockIronFence();
|
||||
registerBlock(ironFence, "ironFence");
|
||||
REFINED_IRON_FENCE = new BlockIronFence();
|
||||
registerBlock(REFINED_IRON_FENCE, "ironFence");
|
||||
|
||||
reinforcedglass = new BlockReinforcedGlass(Material.GLASS);
|
||||
registerBlock(reinforcedglass, "reinforcedglass");
|
||||
REINFORCED_GLASS = new BlockReinforcedGlass(Material.GLASS);
|
||||
registerBlock(REINFORCED_GLASS, "reinforcedglass");
|
||||
|
||||
recycler = new BlockRecycler(Material.IRON);
|
||||
registerBlock(recycler, "recycler");
|
||||
RECYCLER = new BlockRecycler(Material.IRON);
|
||||
registerBlock(RECYCLER, "recycler");
|
||||
GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(recycler, "machines/tier1_machines/recycler");
|
||||
Core.proxy.registerCustomBlockStateLocation(RECYCLER, "machines/tier1_machines/recycler");
|
||||
|
||||
batBox = new BlockBatBox();
|
||||
registerBlock(batBox, "batBox");
|
||||
BATTERY_BOX = new BlockBatBox();
|
||||
registerBlock(BATTERY_BOX, "batBox");
|
||||
GameRegistry.registerTileEntity(TileBatBox.class, "TileBatBox");
|
||||
|
||||
MFE = new BlockMFE();
|
||||
registerBlock(MFE, "MFE");
|
||||
MVSU = new BlockMFE();
|
||||
registerBlock(MVSU, "MFE");
|
||||
GameRegistry.registerTileEntity(TileMFE.class, "TileMFE");
|
||||
|
||||
MFSU = new BlockMFSU();
|
||||
registerBlock(MFSU, "MFSU");
|
||||
HVSU = new BlockMFSU();
|
||||
registerBlock(HVSU, "MFSU");
|
||||
GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU");
|
||||
|
||||
LVT = new BlockLVTransformer();
|
||||
registerBlock(LVT, "LVT");
|
||||
LV_TRANSFORMER = new BlockLVTransformer();
|
||||
registerBlock(LV_TRANSFORMER, "LVT");
|
||||
GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformer");
|
||||
|
||||
MVT = new BlockMVTransformer();
|
||||
registerBlock(MVT, "MVT");
|
||||
MV_TRANSFORMER = new BlockMVTransformer();
|
||||
registerBlock(MV_TRANSFORMER, "MVT");
|
||||
GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformer");
|
||||
|
||||
HVT = new BlockHVTransformer();
|
||||
registerBlock(HVT, "HVT");
|
||||
HV_TRANSFORMER = new BlockHVTransformer();
|
||||
registerBlock(HV_TRANSFORMER, "HVT");
|
||||
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer");
|
||||
|
||||
ironFurnace = new BlockIronFurnace();
|
||||
registerBlock(ironFurnace, "ironfurnace");
|
||||
IRON_FURNACE = new BlockIronFurnace();
|
||||
registerBlock(IRON_FURNACE, "ironfurnace");
|
||||
GameRegistry.registerTileEntity(TileIronFurnace.class, "TileIronFurnaceTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(ironFurnace, "machines/tier0_machines/furnace");
|
||||
Core.proxy.registerCustomBlockStateLocation(IRON_FURNACE, "machines/tier0_machines/furnace");
|
||||
|
||||
nuke = new BlockNuke();
|
||||
registerBlock(nuke, "nuke");
|
||||
NUKE = new BlockNuke();
|
||||
registerBlock(NUKE, "nuke");
|
||||
|
||||
scrapboxinator = new BlockScrapboxinator(Material.IRON);
|
||||
registerBlock(scrapboxinator, "scrapboxinator");
|
||||
SCRAPBOXINATOR = new BlockScrapboxinator(Material.IRON);
|
||||
registerBlock(SCRAPBOXINATOR, "scrapboxinator");
|
||||
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(scrapboxinator, "machines/tier1_machines/scrapboxinator");
|
||||
Core.proxy.registerCustomBlockStateLocation(SCRAPBOXINATOR, "machines/tier1_machines/scrapboxinator");
|
||||
|
||||
//TODO enable when done
|
||||
// flare = new BlockFlare();
|
||||
|
@ -492,18 +492,18 @@ public class ModBlocks {
|
|||
OreDictionary.registerOre("craftingPiston", Blocks.PISTON);
|
||||
OreDictionary.registerOre("craftingPiston", Blocks.STICKY_PISTON);
|
||||
OreDictionary.registerOre("crafterWood", Blocks.CRAFTING_TABLE);
|
||||
OreDictionary.registerOre("machineBasic", new ItemStack(machineframe, 1));
|
||||
OreDictionary.registerOre("machineBasic", new ItemStack(MACHINE_FRAMES, 1));
|
||||
|
||||
OreDictionary.registerOre("treeSapling", rubberSapling);
|
||||
OreDictionary.registerOre("saplingRubber", rubberSapling);
|
||||
OreDictionary.registerOre("logWood", new ItemStack(rubberLog, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("logRubber", new ItemStack(rubberLog, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("plankWood", new ItemStack(rubberPlanks, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("plankRubber", new ItemStack(rubberPlanks, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("treeLeaves", new ItemStack(rubberLeaves, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("leavesRubber", new ItemStack(rubberLeaves, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("treeSapling", RUBBER_SAPLING);
|
||||
OreDictionary.registerOre("saplingRubber", RUBBER_SAPLING);
|
||||
OreDictionary.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
||||
|
||||
OreDictionary.registerOre("fenceIron", ironFence);
|
||||
OreDictionary.registerOre("fenceIron", REFINED_IRON_FENCE);
|
||||
|
||||
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1));
|
||||
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1));
|
||||
|
|
|
@ -14,272 +14,272 @@ import techreborn.lib.ModInfo;
|
|||
|
||||
public class ModFluids {
|
||||
|
||||
public static Fluid fluidberylium = new TechRebornFluid("fluidberylium");
|
||||
public static BlockFluidBase BlockFluidBerylium;
|
||||
public static Fluid BERYLLIUM = new TechRebornFluid("fluidberylium");
|
||||
public static BlockFluidBase BLOCK_BERYLLIUM;
|
||||
|
||||
public static Fluid fluidcalcium = new TechRebornFluid("fluidcalcium");
|
||||
public static BlockFluidBase BlockFluidCalcium;
|
||||
public static Fluid CALCIUM = new TechRebornFluid("fluidcalcium");
|
||||
public static BlockFluidBase BLOCK_CALCIUM;
|
||||
|
||||
public static Fluid fluidcalciumcarbonate = new TechRebornFluid("fluidcalciumcarbonate");
|
||||
public static BlockFluidBase BlockFluidCalciumCarbonate;
|
||||
public static Fluid CALCIUM_CARBONATE = new TechRebornFluid("fluidcalciumcarbonate");
|
||||
public static BlockFluidBase BLOCK_CALCIUM_CARBONATE;
|
||||
|
||||
public static Fluid fluidChlorite = new TechRebornFluid("fluidchlorite");
|
||||
public static BlockFluidBase BlockFluidChlorite;
|
||||
public static Fluid CHLORITE = new TechRebornFluid("fluidchlorite");
|
||||
public static BlockFluidBase BLOCK_CHLORITE;
|
||||
|
||||
public static Fluid fluidDeuterium = new TechRebornFluid("fluiddeuterium");
|
||||
public static BlockFluidBase BlockFluidDeuterium;
|
||||
public static Fluid DEUTERIUM = new TechRebornFluid("fluiddeuterium");
|
||||
public static BlockFluidBase BLOCK_DEUTERIUM;
|
||||
|
||||
public static Fluid fluidGlyceryl = new TechRebornFluid("fluidglyceryl");
|
||||
public static BlockFluidBase BlockFluidGlyceryl;
|
||||
public static Fluid GLYCERYL = new TechRebornFluid("fluidglyceryl");
|
||||
public static BlockFluidBase BLOCK_GLYCERYL;
|
||||
|
||||
public static Fluid fluidHelium = new TechRebornFluid("fluidhelium");
|
||||
public static BlockFluidBase BlockFluidHelium;
|
||||
public static Fluid HELIUM = new TechRebornFluid("fluidhelium");
|
||||
public static BlockFluidBase BLOCK_HELIUM;
|
||||
|
||||
public static Fluid fluidHelium3 = new TechRebornFluid("fluidhelium3");
|
||||
public static BlockFluidBase BlockFluidHelium3;
|
||||
public static Fluid HELIUM_3 = new TechRebornFluid("fluidhelium3");
|
||||
public static BlockFluidBase BLOCK_HELIUM_3;
|
||||
|
||||
public static Fluid fluidHeliumplasma = new TechRebornFluid("fluidheliumplasma");
|
||||
public static BlockFluidBase BlockFluidHeliumplasma;
|
||||
public static Fluid HELIUMPLASMA = new TechRebornFluid("fluidheliumplasma");
|
||||
public static BlockFluidBase BLOCK_HELIUMPLASMA;
|
||||
|
||||
public static Fluid fluidHydrogen = new TechRebornFluid("fluidhydrogen");
|
||||
public static BlockFluidBase BlockFluidHydrogen;
|
||||
public static Fluid HYDROGEN = new TechRebornFluid("fluidhydrogen");
|
||||
public static BlockFluidBase BLOCK_HYDROGEN;
|
||||
|
||||
public static Fluid fluidLithium = new TechRebornFluid("fluidlithium");
|
||||
public static BlockFluidBase BlockFluidLithium;
|
||||
public static Fluid LITHIUM = new TechRebornFluid("fluidlithium");
|
||||
public static BlockFluidBase BLOCK_LITHIUM;
|
||||
|
||||
public static Fluid fluidMercury = new TechRebornFluid("fluidmercury");
|
||||
public static BlockFluidBase BlockFluidMercury;
|
||||
public static Fluid MERCURY = new TechRebornFluid("fluidmercury");
|
||||
public static BlockFluidBase BLOCK_MERCURY;
|
||||
|
||||
public static Fluid fluidMethane = new TechRebornFluid("fluidmethane");
|
||||
public static BlockFluidBase BlockFluidMethane;
|
||||
public static Fluid METHANE = new TechRebornFluid("fluidmethane");
|
||||
public static BlockFluidBase BLOCK_METHANE;
|
||||
|
||||
public static Fluid fluidNitrocoalfuel = new TechRebornFluid("fluidnitrocoalfuel");
|
||||
public static BlockFluidBase BlockFluidNitrocoalfuel;
|
||||
public static Fluid NITROCOAL_FUEL = new TechRebornFluid("fluidnitrocoalfuel");
|
||||
public static BlockFluidBase BLOCK_NITROCOAL_FUEL;
|
||||
|
||||
public static Fluid fluidNitrofuel = new TechRebornFluid("fluidnitrofuel");
|
||||
public static BlockFluidBase BlockFluidNitrofuel;
|
||||
public static Fluid NITROFUEL = new TechRebornFluid("fluidnitrofuel");
|
||||
public static BlockFluidBase BLOCK_NITROFUEL;
|
||||
|
||||
public static Fluid fluidNitrogen = new TechRebornFluid("fluidnitrogen");
|
||||
public static BlockFluidBase BlockFluidNitrogen;
|
||||
public static Fluid FLUID_NITROGEN = new TechRebornFluid("fluidnitrogen");
|
||||
public static BlockFluidBase BLOCK_NITROGEN;
|
||||
|
||||
public static Fluid fluidNitrogendioxide = new TechRebornFluid("fluidnitrogendioxide");
|
||||
public static BlockFluidBase BlockFluidNitrogendioxide;
|
||||
public static Fluid NITROGENDIOXIDE = new TechRebornFluid("fluidnitrogendioxide");
|
||||
public static BlockFluidBase BLOCK_NITROGENDIOXIDE;
|
||||
|
||||
public static Fluid fluidPotassium = new TechRebornFluid("fluidpotassium");
|
||||
public static BlockFluidBase BlockFluidPotassium;
|
||||
public static Fluid POTASSIUM = new TechRebornFluid("fluidpotassium");
|
||||
public static BlockFluidBase BLOCK_POTASSIUM;
|
||||
|
||||
public static Fluid fluidSilicon = new TechRebornFluid("fluidsilicon");
|
||||
public static BlockFluidBase BlockFluidSilicon;
|
||||
public static Fluid SILICON = new TechRebornFluid("fluidsilicon");
|
||||
public static BlockFluidBase BLOCK_SILICON;
|
||||
|
||||
public static Fluid fluidSodium = new TechRebornFluid("fluidsodium");
|
||||
public static BlockFluidBase BlockFluidSodium;
|
||||
public static Fluid SODIUM = new TechRebornFluid("fluidsodium");
|
||||
public static BlockFluidBase BLOCK_SODIUM;
|
||||
|
||||
public static Fluid fluidSodiumpersulfate = new TechRebornFluid("fluidsodiumpersulfate");
|
||||
public static BlockFluidBase BlockFluidSodiumpersulfate;
|
||||
public static Fluid SODIUMPERSULFATE = new TechRebornFluid("fluidsodiumpersulfate");
|
||||
public static BlockFluidBase BLOCK_SODIUMPERSULFATE;
|
||||
|
||||
public static Fluid fluidTritium = new TechRebornFluid("fluidtritium");
|
||||
public static BlockFluidBase BlockFluidTritium;
|
||||
public static Fluid TRITIUM = new TechRebornFluid("fluidtritium");
|
||||
public static BlockFluidBase BLOCK_TRITIUM;
|
||||
|
||||
public static Fluid fluidWolframium = new TechRebornFluid("fluidwolframium");
|
||||
public static BlockFluidBase BlockFluidWolframium;
|
||||
public static Fluid WOLFRAMIUM = new TechRebornFluid("fluidwolframium");
|
||||
public static BlockFluidBase BLOCK_WOLFRAMIUM;
|
||||
|
||||
public static Fluid fluidCarbon = new TechRebornFluid("fluidcarbon");
|
||||
public static BlockFluidBase BlockFluidCarbon;
|
||||
public static Fluid CARBON = new TechRebornFluid("fluidcarbon");
|
||||
public static BlockFluidBase BLOCK_CARBON;
|
||||
|
||||
public static Fluid fluidCarbonFiber = new TechRebornFluid("fluidcarbonfiber");
|
||||
public static BlockFluidBase BlockFluidCarbonFiber;
|
||||
public static Fluid CARBON_FIBER = new TechRebornFluid("fluidcarbonfiber");
|
||||
public static BlockFluidBase BLOCK_CARBON_FIBER;
|
||||
|
||||
public static Fluid fluidNitroCarbon = new TechRebornFluid("fluidnitrocarbon");
|
||||
public static BlockFluidBase BlockFluidNitroCarbon;
|
||||
public static Fluid NITRO_CARBON = new TechRebornFluid("fluidnitrocarbon");
|
||||
public static BlockFluidBase BLOCK_NITRO_CARBON;
|
||||
|
||||
public static Fluid fluidSulfur = new TechRebornFluid("fluidSulfur");
|
||||
public static BlockFluidBase BlockFluidSulfur;
|
||||
public static Fluid SULFUR = new TechRebornFluid("fluidSulfur");
|
||||
public static BlockFluidBase BLOCK_SULFUR;
|
||||
|
||||
public static Fluid fluidSodiumSulfide = new TechRebornFluid("fluidsodiumSulfide");
|
||||
public static BlockFluidBase BlockFluidSodiumSulfide;
|
||||
public static Fluid SODIUM_SULFIDE = new TechRebornFluid("fluidsodiumSulfide");
|
||||
public static BlockFluidBase BLOCK_SODIUM_SULFIDE;
|
||||
|
||||
public static Fluid fluidDiesel = new TechRebornFluid("fluiddiesel");
|
||||
public static BlockFluidBase BlockFluidDiesel;
|
||||
public static Fluid DIESEL = new TechRebornFluid("fluiddiesel");
|
||||
public static BlockFluidBase BLOCK_DIESEL;
|
||||
|
||||
public static Fluid fluidNitroDiesel = new TechRebornFluid("fluidnitrodiesel");
|
||||
public static BlockFluidBase BlockFluidNitroDiesel;
|
||||
public static Fluid NITRO_DIESEL = new TechRebornFluid("fluidnitrodiesel");
|
||||
public static BlockFluidBase BLOCK_NITRO_DIESEL;
|
||||
|
||||
public static Fluid fluidOil = new TechRebornFluid("fluidoil");
|
||||
public static BlockFluidBase BlockFluidOil;
|
||||
public static Fluid OIL = new TechRebornFluid("fluidoil");
|
||||
public static BlockFluidBase BLOCK_OIL;
|
||||
|
||||
public static Fluid fluidSulfuricAcid = new TechRebornFluid("fluidsulfuricacid");
|
||||
public static BlockFluidBase BlockFluidSulfuricAcid;
|
||||
public static Fluid SULFURIC_ACID = new TechRebornFluid("fluidsulfuricacid");
|
||||
public static BlockFluidBase BLOCK_SULFURIC_ACID;
|
||||
|
||||
public static void init() {
|
||||
FluidRegistry.registerFluid(fluidberylium);
|
||||
BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.WATER, "techreborn.berylium");
|
||||
registerBlock(BlockFluidBerylium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(BERYLLIUM);
|
||||
BLOCK_BERYLLIUM = new BlockFluidTechReborn(BERYLLIUM, Material.WATER, "techreborn.berylium");
|
||||
registerBlock(BLOCK_BERYLLIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_BERYLLIUM.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidcalcium);
|
||||
BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.WATER, "techreborn.calcium");
|
||||
registerBlock(BlockFluidCalcium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(CALCIUM);
|
||||
BLOCK_CALCIUM = new BlockFluidTechReborn(CALCIUM, Material.WATER, "techreborn.calcium");
|
||||
registerBlock(BLOCK_CALCIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_CALCIUM.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidcalciumcarbonate);
|
||||
BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.WATER,
|
||||
FluidRegistry.registerFluid(CALCIUM_CARBONATE);
|
||||
BLOCK_CALCIUM_CARBONATE = new BlockFluidTechReborn(CALCIUM_CARBONATE, Material.WATER,
|
||||
"techreborn.calciumcarbonate");
|
||||
registerBlock(BlockFluidCalciumCarbonate,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
|
||||
registerBlock(BLOCK_CALCIUM_CARBONATE,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_CALCIUM_CARBONATE.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidChlorite);
|
||||
BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.WATER, "techreborn.chlorite");
|
||||
registerBlock(BlockFluidChlorite,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(CHLORITE);
|
||||
BLOCK_CHLORITE = new BlockFluidTechReborn(CHLORITE, Material.WATER, "techreborn.chlorite");
|
||||
registerBlock(BLOCK_CHLORITE,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_CHLORITE.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidDeuterium);
|
||||
BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.WATER, "techreborn.deuterium");
|
||||
registerBlock(BlockFluidDeuterium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(DEUTERIUM);
|
||||
BLOCK_DEUTERIUM = new BlockFluidTechReborn(DEUTERIUM, Material.WATER, "techreborn.deuterium");
|
||||
registerBlock(BLOCK_DEUTERIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_DEUTERIUM.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidGlyceryl);
|
||||
BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.WATER, "techreborn.glyceryl");
|
||||
registerBlock(BlockFluidGlyceryl,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(GLYCERYL);
|
||||
BLOCK_GLYCERYL = new BlockFluidTechReborn(GLYCERYL, Material.WATER, "techreborn.glyceryl");
|
||||
registerBlock(BLOCK_GLYCERYL,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_GLYCERYL.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHelium);
|
||||
BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.WATER, "techreborn.helium");
|
||||
registerBlock(BlockFluidHelium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(HELIUM);
|
||||
BLOCK_HELIUM = new BlockFluidTechReborn(HELIUM, Material.WATER, "techreborn.helium");
|
||||
registerBlock(BLOCK_HELIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_HELIUM.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHelium3);
|
||||
BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.WATER, "techreborn.helium3");
|
||||
registerBlock(BlockFluidHelium3,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(HELIUM_3);
|
||||
BLOCK_HELIUM_3 = new BlockFluidTechReborn(HELIUM_3, Material.WATER, "techreborn.helium3");
|
||||
registerBlock(BLOCK_HELIUM_3,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_HELIUM_3.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHeliumplasma);
|
||||
BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.WATER, "techreborn.heliumplasma");
|
||||
registerBlock(BlockFluidHeliumplasma,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(HELIUMPLASMA);
|
||||
BLOCK_HELIUMPLASMA = new BlockFluidTechReborn(HELIUMPLASMA, Material.WATER, "techreborn.heliumplasma");
|
||||
registerBlock(BLOCK_HELIUMPLASMA,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_HELIUMPLASMA.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHydrogen);
|
||||
BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.WATER, "techreborn.hydrogen");
|
||||
registerBlock(BlockFluidHydrogen,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(HYDROGEN);
|
||||
BLOCK_HYDROGEN = new BlockFluidTechReborn(HYDROGEN, Material.WATER, "techreborn.hydrogen");
|
||||
registerBlock(BLOCK_HYDROGEN,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_HYDROGEN.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidLithium);
|
||||
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.WATER, "techreborn.lithium");
|
||||
registerBlock(BlockFluidLithium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(fluidLithium, 24.0);
|
||||
FluidRegistry.registerFluid(LITHIUM);
|
||||
BLOCK_LITHIUM = new BlockFluidTechReborn(LITHIUM, Material.WATER, "techreborn.lithium");
|
||||
registerBlock(BLOCK_LITHIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_LITHIUM.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(LITHIUM, 24.0);
|
||||
|
||||
FluidRegistry.registerFluid(fluidMercury);
|
||||
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.WATER, "techreborn.mercury");
|
||||
registerBlock(BlockFluidMercury,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(MERCURY);
|
||||
BLOCK_MERCURY = new BlockFluidTechReborn(MERCURY, Material.WATER, "techreborn.mercury");
|
||||
registerBlock(BLOCK_MERCURY,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_MERCURY.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidMethane);
|
||||
BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.WATER, "techreborn.methane");
|
||||
registerBlock(BlockFluidMethane,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(METHANE);
|
||||
BLOCK_METHANE = new BlockFluidTechReborn(METHANE, Material.WATER, "techreborn.methane");
|
||||
registerBlock(BLOCK_METHANE,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_METHANE.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrocoalfuel);
|
||||
BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.WATER,
|
||||
FluidRegistry.registerFluid(NITROCOAL_FUEL);
|
||||
BLOCK_NITROCOAL_FUEL = new BlockFluidTechReborn(NITROCOAL_FUEL, Material.WATER,
|
||||
"techreborn.nitrocoalfuel");
|
||||
registerBlock(BlockFluidNitrocoalfuel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(fluidNitrocoalfuel, 48.0);
|
||||
registerBlock(BLOCK_NITROCOAL_FUEL,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_NITROCOAL_FUEL.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(NITROCOAL_FUEL, 48.0);
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrofuel);
|
||||
BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.WATER, "techreborn.nitrofuel");
|
||||
registerBlock(BlockFluidNitrofuel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 42.0);
|
||||
FluidRegistry.registerFluid(NITROFUEL);
|
||||
BLOCK_NITROFUEL = new BlockFluidTechReborn(NITROFUEL, Material.WATER, "techreborn.nitrofuel");
|
||||
registerBlock(BLOCK_NITROFUEL,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_NITROFUEL.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(NITROFUEL, 42.0);
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrogen);
|
||||
BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.WATER, "techreborn.nitrogen");
|
||||
registerBlock(BlockFluidNitrogen,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(FLUID_NITROGEN);
|
||||
BLOCK_NITROGEN = new BlockFluidTechReborn(FLUID_NITROGEN, Material.WATER, "techreborn.nitrogen");
|
||||
registerBlock(BLOCK_NITROGEN,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_NITROGEN.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrogendioxide);
|
||||
BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.WATER,
|
||||
FluidRegistry.registerFluid(NITROGENDIOXIDE);
|
||||
BLOCK_NITROGENDIOXIDE = new BlockFluidTechReborn(NITROGENDIOXIDE, Material.WATER,
|
||||
"techreborn.nitrogendioxide");
|
||||
registerBlock(BlockFluidNitrogendioxide,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5));
|
||||
registerBlock(BLOCK_NITROGENDIOXIDE,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_NITROGENDIOXIDE.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidPotassium);
|
||||
BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.WATER, "techreborn.potassium");
|
||||
registerBlock(BlockFluidPotassium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(POTASSIUM);
|
||||
BLOCK_POTASSIUM = new BlockFluidTechReborn(POTASSIUM, Material.WATER, "techreborn.potassium");
|
||||
registerBlock(BLOCK_POTASSIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_POTASSIUM.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSilicon);
|
||||
BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.WATER, "techreborn.silicon");
|
||||
registerBlock(BlockFluidSilicon,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(SILICON);
|
||||
BLOCK_SILICON = new BlockFluidTechReborn(SILICON, Material.WATER, "techreborn.silicon");
|
||||
registerBlock(BLOCK_SILICON,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_SILICON.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodium);
|
||||
BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.WATER, "techreborn.sodium");
|
||||
registerBlock(BlockFluidSodium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 22.0);
|
||||
FluidRegistry.registerFluid(SODIUM);
|
||||
BLOCK_SODIUM = new BlockFluidTechReborn(SODIUM, Material.WATER, "techreborn.sodium");
|
||||
registerBlock(BLOCK_SODIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_SODIUM.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(NITROFUEL, 22.0);
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodiumpersulfate);
|
||||
BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.WATER,
|
||||
FluidRegistry.registerFluid(SODIUMPERSULFATE);
|
||||
BLOCK_SODIUMPERSULFATE = new BlockFluidTechReborn(SODIUMPERSULFATE, Material.WATER,
|
||||
"techreborn.sodiumpersulfate");
|
||||
registerBlock(BlockFluidSodiumpersulfate,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5));
|
||||
registerBlock(BLOCK_SODIUMPERSULFATE,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_SODIUMPERSULFATE.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidTritium);
|
||||
BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.WATER, "techreborn.tritium");
|
||||
registerBlock(BlockFluidTritium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(TRITIUM);
|
||||
BLOCK_TRITIUM = new BlockFluidTechReborn(TRITIUM, Material.WATER, "techreborn.tritium");
|
||||
registerBlock(BLOCK_TRITIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_TRITIUM.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidWolframium);
|
||||
BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.WATER, "techreborn.wolframium");
|
||||
registerBlock(BlockFluidWolframium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(WOLFRAMIUM);
|
||||
BLOCK_WOLFRAMIUM = new BlockFluidTechReborn(WOLFRAMIUM, Material.WATER, "techreborn.wolframium");
|
||||
registerBlock(BLOCK_WOLFRAMIUM,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_WOLFRAMIUM.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidCarbon);
|
||||
BlockFluidCarbon = new BlockFluidTechReborn(fluidCarbon, Material.WATER, "techreborn.carbon");
|
||||
registerBlock(BlockFluidCarbon,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCarbon.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(CARBON);
|
||||
BLOCK_CARBON = new BlockFluidTechReborn(CARBON, Material.WATER, "techreborn.carbon");
|
||||
registerBlock(BLOCK_CARBON,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_CARBON.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidCarbonFiber);
|
||||
BlockFluidCarbonFiber = new BlockFluidTechReborn(fluidCarbonFiber, Material.WATER, "techreborn.carbonfiber");
|
||||
registerBlock(BlockFluidCarbonFiber,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCarbonFiber.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(CARBON_FIBER);
|
||||
BLOCK_CARBON_FIBER = new BlockFluidTechReborn(CARBON_FIBER, Material.WATER, "techreborn.carbonfiber");
|
||||
registerBlock(BLOCK_CARBON_FIBER,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_CARBON_FIBER.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitroCarbon);
|
||||
BlockFluidNitroCarbon = new BlockFluidTechReborn(fluidNitroCarbon, Material.WATER, "techreborn.nitrocarbon");
|
||||
registerBlock(BlockFluidNitroCarbon,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitroCarbon.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(NITRO_CARBON);
|
||||
BLOCK_NITRO_CARBON = new BlockFluidTechReborn(NITRO_CARBON, Material.WATER, "techreborn.nitrocarbon");
|
||||
registerBlock(BLOCK_NITRO_CARBON,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_NITRO_CARBON.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSulfur);
|
||||
BlockFluidSulfur = new BlockFluidTechReborn(fluidSulfur, Material.WATER, "techreborn.sulfur");
|
||||
registerBlock(BlockFluidSulfur,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSulfur.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(SULFUR);
|
||||
BLOCK_SULFUR = new BlockFluidTechReborn(SULFUR, Material.WATER, "techreborn.sulfur");
|
||||
registerBlock(BLOCK_SULFUR,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_SULFUR.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodiumSulfide);
|
||||
BlockFluidSodiumSulfide = new BlockFluidTechReborn(fluidSodiumSulfide, Material.WATER, "techreborn.sodiumsulfide");
|
||||
registerBlock(BlockFluidSodiumSulfide,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodiumSulfide.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(SODIUM_SULFIDE);
|
||||
BLOCK_SODIUM_SULFIDE = new BlockFluidTechReborn(SODIUM_SULFIDE, Material.WATER, "techreborn.sodiumsulfide");
|
||||
registerBlock(BLOCK_SODIUM_SULFIDE,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_SODIUM_SULFIDE.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidDiesel);
|
||||
BlockFluidDiesel = new BlockFluidTechReborn(fluidDiesel, Material.WATER, "techreborn.diesel");
|
||||
registerBlock(BlockFluidDiesel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidDiesel.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(DIESEL);
|
||||
BLOCK_DIESEL = new BlockFluidTechReborn(DIESEL, Material.WATER, "techreborn.diesel");
|
||||
registerBlock(BLOCK_DIESEL,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_DIESEL.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitroDiesel);
|
||||
BlockFluidNitroDiesel = new BlockFluidTechReborn(fluidNitroDiesel, Material.WATER, "techreborn.nitrodiesel");
|
||||
registerBlock(BlockFluidNitroDiesel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitroDiesel.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(fluidNitroDiesel, 36.0);
|
||||
FluidRegistry.registerFluid(NITRO_DIESEL);
|
||||
BLOCK_NITRO_DIESEL = new BlockFluidTechReborn(NITRO_DIESEL, Material.WATER, "techreborn.nitrodiesel");
|
||||
registerBlock(BLOCK_NITRO_DIESEL,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_NITRO_DIESEL.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(NITRO_DIESEL, 36.0);
|
||||
|
||||
FluidRegistry.registerFluid(fluidOil);
|
||||
BlockFluidOil = new BlockFluidTechReborn(fluidOil, Material.WATER, "techreborn.oil");
|
||||
registerBlock(BlockFluidOil,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidOil.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(fluidOil, 16.0);
|
||||
FluidRegistry.registerFluid(OIL);
|
||||
BLOCK_OIL = new BlockFluidTechReborn(OIL, Material.WATER, "techreborn.oil");
|
||||
registerBlock(BLOCK_OIL,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_OIL.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(OIL, 16.0);
|
||||
|
||||
FluidRegistry.registerFluid(fluidSulfuricAcid);
|
||||
BlockFluidSulfuricAcid = new BlockFluidTechReborn(fluidSulfuricAcid, Material.WATER, "techreborn.sulfuricacid");
|
||||
registerBlock(BlockFluidSulfuricAcid,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSulfuricAcid.getUnlocalizedName().substring(5));
|
||||
FluidRegistry.registerFluid(SULFURIC_ACID);
|
||||
BLOCK_SULFURIC_ACID = new BlockFluidTechReborn(SULFURIC_ACID, Material.WATER, "techreborn.sulfuricacid");
|
||||
registerBlock(BLOCK_SULFURIC_ACID,
|
||||
ModInfo.MOD_ID + "_" + BLOCK_SULFURIC_ACID.getUnlocalizedName().substring(5));
|
||||
}
|
||||
|
||||
public static void registerBlock(Block block, String name) {
|
||||
|
|
|
@ -22,257 +22,257 @@ import techreborn.items.tools.*;
|
|||
public class ModItems {
|
||||
|
||||
public static final String META_PLACEHOLDER = "PLACEHOLDER_ITEM";
|
||||
public static Item gems;
|
||||
public static Item ingots;
|
||||
public static Item nuggets;
|
||||
public static Item dusts;
|
||||
public static Item smallDusts;
|
||||
public static Item parts;
|
||||
public static Item rockCutter;
|
||||
public static Item lithiumBatpack;
|
||||
public static Item lapotronpack;
|
||||
public static Item lithiumBattery;
|
||||
public static Item omniTool;
|
||||
public static Item lapotronicOrb;
|
||||
public static Item manual;
|
||||
public static Item uuMatter;
|
||||
public static Item plate;
|
||||
public static Item cloakingDevice;
|
||||
public static Item reBattery;
|
||||
public static Item treeTap;
|
||||
public static Item electricTreetap;
|
||||
public static Item ironDrill;
|
||||
public static Item diamondDrill;
|
||||
public static Item advancedDrill;
|
||||
public static Item ironChainsaw;
|
||||
public static Item diamondChainsaw;
|
||||
public static Item advancedChainsaw;
|
||||
public static Item steelJackhammer;
|
||||
public static Item diamondJackhammer;
|
||||
public static Item advancedJackhammer;
|
||||
public static Item nanosaber;
|
||||
public static Item wrench;
|
||||
public static Item lapotronCrystal;
|
||||
public static Item energyCrystal;
|
||||
public static Item scrapBox;
|
||||
public static Item frequencyTransmitter;
|
||||
public static Item bronzeSword;
|
||||
public static Item bronzePickaxe;
|
||||
public static Item bronzeSpade;
|
||||
public static Item bronzeAxe;
|
||||
public static Item bronzeHoe;
|
||||
public static Item bronzeHelmet;
|
||||
public static Item bronzeChestplate;
|
||||
public static Item bronzeLeggings;
|
||||
public static Item bronzeBoots;
|
||||
public static Item rubySword;
|
||||
public static Item rubyPickaxe;
|
||||
public static Item rubySpade;
|
||||
public static Item rubyAxe;
|
||||
public static Item rubyHoe;
|
||||
public static Item rubyHelmet;
|
||||
public static Item rubyChestplate;
|
||||
public static Item rubyLeggings;
|
||||
public static Item rubyBoots;
|
||||
public static Item sapphireSword;
|
||||
public static Item sapphirePickaxe;
|
||||
public static Item sapphireSpade;
|
||||
public static Item sapphireAxe;
|
||||
public static Item sapphireHoe;
|
||||
public static Item sapphireHelmet;
|
||||
public static Item sapphireChestplate;
|
||||
public static Item sapphireLeggings;
|
||||
public static Item sapphireBoots;
|
||||
public static Item peridotSword;
|
||||
public static Item peridotPickaxe;
|
||||
public static Item peridotSpade;
|
||||
public static Item peridotAxe;
|
||||
public static Item peridotHoe;
|
||||
public static Item peridotHelmet;
|
||||
public static Item peridotChestplate;
|
||||
public static Item peridotLeggings;
|
||||
public static Item peridotBoots;
|
||||
public static Item upgrades;
|
||||
public static Item missingRecipe;
|
||||
public static Item debug;
|
||||
public static DynamicCell dynamicCell;
|
||||
public static Item GEMS;
|
||||
public static Item INGOTS;
|
||||
public static Item NUGGETS;
|
||||
public static Item DUSTS;
|
||||
public static Item SMALL_DUSTS;
|
||||
public static Item PARTS;
|
||||
public static Item ROCK_CUTTER;
|
||||
public static Item LITHIUM_BATTERY_PACK;
|
||||
public static Item LAPOTRONIC_ORB_PACK;
|
||||
public static Item LITHIUM_BATTERY;
|
||||
public static Item OMNI_TOOL;
|
||||
public static Item LAPOTRONIC_ORB;
|
||||
public static Item MANUAL;
|
||||
public static Item UU_MATTER;
|
||||
public static Item PLATES;
|
||||
public static Item CLOAKING_DEVICE;
|
||||
public static Item RE_BATTERY;
|
||||
public static Item TREE_TAP;
|
||||
public static Item ELECTRIC_TREE_TAP;
|
||||
public static Item STEEL_DRILL;
|
||||
public static Item DIAMOND_DRILL;
|
||||
public static Item ADVANCED_DRILL;
|
||||
public static Item STEEL_CHAINSAW;
|
||||
public static Item DIAMOND_CHAINSAW;
|
||||
public static Item ADVANCED_CHAINSAW;
|
||||
public static Item STEEL_JACKHAMMER;
|
||||
public static Item DIAMOND_JACKHAMMER;
|
||||
public static Item ADVANCED_JACKHAMMER;
|
||||
public static Item NANOSABER;
|
||||
public static Item WRENCH;
|
||||
public static Item LAPOTRONIC_CRYSTAL;
|
||||
public static Item ENERGY_CRYSTAL;
|
||||
public static Item SCRAP_BOX;
|
||||
public static Item FREQUENCY_TRANSMITTER;
|
||||
public static Item BRONZE_SWORD;
|
||||
public static Item BRONZE_PICKAXE;
|
||||
public static Item BRONZE_SPADE;
|
||||
public static Item BRONZE_AXE;
|
||||
public static Item BRONZE_HOE;
|
||||
public static Item BRONZE_HELMET;
|
||||
public static Item BRONZE_CHESTPLATE;
|
||||
public static Item BRONZE_LEGGINGS;
|
||||
public static Item BRONZE_BOOTS;
|
||||
public static Item RUBY_SWORD;
|
||||
public static Item RUBY_PICKAXE;
|
||||
public static Item RUBY_SPADE;
|
||||
public static Item RUBY_AXE;
|
||||
public static Item RUBY_HOE;
|
||||
public static Item RUBY_HELMET;
|
||||
public static Item RUBY_CHESTPLATE;
|
||||
public static Item RUBY_LEGGINGS;
|
||||
public static Item RUBY_BOOTS;
|
||||
public static Item SAPPHIRE_SWORD;
|
||||
public static Item SAPPHIRE_PICKAXE;
|
||||
public static Item SAPPHIRE_SPADE;
|
||||
public static Item SAPPHIRE_AXE;
|
||||
public static Item SAPPHIRE_HOE;
|
||||
public static Item SAPPHIRE_HELMET;
|
||||
public static Item SAPPHIRE_CHSTPLATE;
|
||||
public static Item SAPPHIRE_LEGGINGS;
|
||||
public static Item SAPPHIRE_BOOTS;
|
||||
public static Item PERIDOT_SWORD;
|
||||
public static Item PERIDOT_PICKAXE;
|
||||
public static Item PERIDOT_SAPPHIRE;
|
||||
public static Item PERIDOT_AXE;
|
||||
public static Item PERIDOT_HOE;
|
||||
public static Item PERIDOT_HELMET;
|
||||
public static Item PERIDOT_CHESTPLATE;
|
||||
public static Item PERIDOT_LEGGINGS;
|
||||
public static Item PERIDOT_BOOTS;
|
||||
public static Item UPGRADES;
|
||||
public static Item MISSING_RECIPE_PLACEHOLDER;
|
||||
public static Item DEBUG;
|
||||
public static DynamicCell CELL;
|
||||
|
||||
public static void init() throws InstantiationException, IllegalAccessException {
|
||||
gems = new ItemGems();
|
||||
registerItem(gems, "gem");
|
||||
ingots = new ItemIngots();
|
||||
registerItem(ingots, "ingot");
|
||||
dusts = new ItemDusts();
|
||||
registerItem(dusts, "dust");
|
||||
smallDusts = new ItemDustsSmall();
|
||||
registerItem(smallDusts, "smallDust");
|
||||
plate = new ItemPlates();
|
||||
registerItem(plate, "plates");
|
||||
nuggets = new ItemNuggets();
|
||||
registerItem(nuggets, "nuggets");
|
||||
GEMS = new ItemGems();
|
||||
registerItem(GEMS, "gem");
|
||||
INGOTS = new ItemIngots();
|
||||
registerItem(INGOTS, "ingot");
|
||||
DUSTS = new ItemDusts();
|
||||
registerItem(DUSTS, "dust");
|
||||
SMALL_DUSTS = new ItemDustsSmall();
|
||||
registerItem(SMALL_DUSTS, "smallDust");
|
||||
PLATES = new ItemPlates();
|
||||
registerItem(PLATES, "plates");
|
||||
NUGGETS = new ItemNuggets();
|
||||
registerItem(NUGGETS, "nuggets");
|
||||
// purifiedCrushedOre = new ItemPurifiedCrushedOre();
|
||||
// registerItem(purifiedCrushedOre, "purifiedCrushedOre");
|
||||
parts = new ItemParts();
|
||||
registerItem(parts, "part");
|
||||
PARTS = new ItemParts();
|
||||
registerItem(PARTS, "part");
|
||||
|
||||
rockCutter = PoweredItem.createItem(ItemRockCutter.class);
|
||||
registerItem(rockCutter, "rockCutter");
|
||||
lithiumBatpack = PoweredItem.createItem(ItemLithiumBatpack.class);
|
||||
registerItem(lithiumBatpack, "lithiumBatpack");
|
||||
lapotronpack = PoweredItem.createItem(ItemLapotronPack.class);
|
||||
registerItem(lapotronpack, "lapotronPack");
|
||||
lithiumBattery = PoweredItem.createItem(ItemLithiumBattery.class);
|
||||
registerItem(lithiumBattery, "lithiumBattery");
|
||||
lapotronicOrb = PoweredItem.createItem(ItemLapotronicOrb.class);
|
||||
registerItem(lapotronicOrb, "lapotronicOrb");
|
||||
omniTool = PoweredItem.createItem(ItemOmniTool.class);
|
||||
registerItem(omniTool, "omniTool");
|
||||
energyCrystal = PoweredItem.createItem(ItemEnergyCrystal.class);
|
||||
registerItem(energyCrystal, "energycrystal");
|
||||
lapotronCrystal = PoweredItem.createItem(ItemLapotronCrystal.class);
|
||||
registerItem(lapotronCrystal, "lapotroncrystal");
|
||||
ROCK_CUTTER = PoweredItem.createItem(ItemRockCutter.class);
|
||||
registerItem(ROCK_CUTTER, "rockCutter");
|
||||
LITHIUM_BATTERY_PACK = PoweredItem.createItem(ItemLithiumBatpack.class);
|
||||
registerItem(LITHIUM_BATTERY_PACK, "lithiumBatpack");
|
||||
LAPOTRONIC_ORB_PACK = PoweredItem.createItem(ItemLapotronPack.class);
|
||||
registerItem(LAPOTRONIC_ORB_PACK, "lapotronPack");
|
||||
LITHIUM_BATTERY = PoweredItem.createItem(ItemLithiumBattery.class);
|
||||
registerItem(LITHIUM_BATTERY, "lithiumBattery");
|
||||
LAPOTRONIC_ORB = PoweredItem.createItem(ItemLapotronicOrb.class);
|
||||
registerItem(LAPOTRONIC_ORB, "lapotronicOrb");
|
||||
OMNI_TOOL = PoweredItem.createItem(ItemOmniTool.class);
|
||||
registerItem(OMNI_TOOL, "omniTool");
|
||||
ENERGY_CRYSTAL = PoweredItem.createItem(ItemEnergyCrystal.class);
|
||||
registerItem(ENERGY_CRYSTAL, "energycrystal");
|
||||
LAPOTRONIC_CRYSTAL = PoweredItem.createItem(ItemLapotronCrystal.class);
|
||||
registerItem(LAPOTRONIC_CRYSTAL, "lapotroncrystal");
|
||||
|
||||
manual = new ItemTechManual();
|
||||
registerItem(manual, "techmanuel");
|
||||
uuMatter = new ItemUUmatter();
|
||||
registerItem(uuMatter, "uumatter");
|
||||
reBattery = PoweredItem.createItem(ItemReBattery.class);
|
||||
registerItem(reBattery, "rebattery");
|
||||
treeTap = new ItemTreeTap();
|
||||
registerItem(treeTap, "treetap");
|
||||
MANUAL = new ItemTechManual();
|
||||
registerItem(MANUAL, "techmanuel");
|
||||
UU_MATTER = new ItemUUmatter();
|
||||
registerItem(UU_MATTER, "uumatter");
|
||||
RE_BATTERY = PoweredItem.createItem(ItemReBattery.class);
|
||||
registerItem(RE_BATTERY, "rebattery");
|
||||
TREE_TAP = new ItemTreeTap();
|
||||
registerItem(TREE_TAP, "treetap");
|
||||
|
||||
electricTreetap = PoweredItem.createItem(ItemElectricTreetap.class);
|
||||
registerItem(electricTreetap, "electricTreetap");
|
||||
ELECTRIC_TREE_TAP = PoweredItem.createItem(ItemElectricTreetap.class);
|
||||
registerItem(ELECTRIC_TREE_TAP, "electricTreetap");
|
||||
|
||||
ironDrill = PoweredItem.createItem(ItemSteelDrill.class);
|
||||
registerItem(ironDrill, "irondrill");
|
||||
diamondDrill = PoweredItem.createItem(ItemDiamondDrill.class);
|
||||
registerItem(diamondDrill, "diamonddrill");
|
||||
advancedDrill = PoweredItem.createItem(ItemAdvancedDrill.class);
|
||||
registerItem(advancedDrill, "advanceddrill");
|
||||
STEEL_DRILL = PoweredItem.createItem(ItemSteelDrill.class);
|
||||
registerItem(STEEL_DRILL, "irondrill");
|
||||
DIAMOND_DRILL = PoweredItem.createItem(ItemDiamondDrill.class);
|
||||
registerItem(DIAMOND_DRILL, "diamonddrill");
|
||||
ADVANCED_DRILL = PoweredItem.createItem(ItemAdvancedDrill.class);
|
||||
registerItem(ADVANCED_DRILL, "advanceddrill");
|
||||
|
||||
ironChainsaw = PoweredItem.createItem(ItemSteelChainsaw.class);
|
||||
registerItem(ironChainsaw, "ironchainsaw");
|
||||
diamondChainsaw = PoweredItem.createItem(ItemDiamondChainsaw.class);
|
||||
registerItem(diamondChainsaw, "diamondchainsaw");
|
||||
advancedChainsaw = PoweredItem.createItem(ItemAdvancedChainsaw.class);
|
||||
registerItem(advancedChainsaw, "advancedchainsaw");
|
||||
STEEL_CHAINSAW = PoweredItem.createItem(ItemSteelChainsaw.class);
|
||||
registerItem(STEEL_CHAINSAW, "ironchainsaw");
|
||||
DIAMOND_CHAINSAW = PoweredItem.createItem(ItemDiamondChainsaw.class);
|
||||
registerItem(DIAMOND_CHAINSAW, "diamondchainsaw");
|
||||
ADVANCED_CHAINSAW = PoweredItem.createItem(ItemAdvancedChainsaw.class);
|
||||
registerItem(ADVANCED_CHAINSAW, "advancedchainsaw");
|
||||
|
||||
steelJackhammer = PoweredItem.createItem(ItemSteelJackhammer.class);
|
||||
registerItem(steelJackhammer, "steeljackhammer");
|
||||
diamondJackhammer = PoweredItem.createItem(ItemDiamondJackhammer.class);
|
||||
registerItem(diamondJackhammer, "diamondjackhammer");
|
||||
advancedJackhammer = PoweredItem.createItem(ItemAdvancedJackhammer.class);
|
||||
registerItem(advancedJackhammer, "ironjackhammer");
|
||||
STEEL_JACKHAMMER = PoweredItem.createItem(ItemSteelJackhammer.class);
|
||||
registerItem(STEEL_JACKHAMMER, "steeljackhammer");
|
||||
DIAMOND_JACKHAMMER = PoweredItem.createItem(ItemDiamondJackhammer.class);
|
||||
registerItem(DIAMOND_JACKHAMMER, "diamondjackhammer");
|
||||
ADVANCED_JACKHAMMER = PoweredItem.createItem(ItemAdvancedJackhammer.class);
|
||||
registerItem(ADVANCED_JACKHAMMER, "ironjackhammer");
|
||||
|
||||
if (ConfigTechReborn.enableGemArmorAndTools) {
|
||||
bronzeSword = new ItemTRSword(Reference.BRONZE);
|
||||
registerItem(bronzeSword, "bronzeSword");
|
||||
bronzePickaxe = new ItemTRPickaxe(Reference.BRONZE);
|
||||
registerItem(bronzePickaxe, "bronzePickaxe");
|
||||
bronzeSpade = new ItemTRSpade(Reference.BRONZE);
|
||||
registerItem(bronzeSpade, "bronzeSpade");
|
||||
bronzeAxe = new ItemTRAxe(Reference.BRONZE);
|
||||
registerItem(bronzeAxe, "bronzeAxe");
|
||||
bronzeHoe = new ItemTRHoe(Reference.BRONZE);
|
||||
registerItem(bronzeHoe, "bronzeHoe");
|
||||
BRONZE_SWORD = new ItemTRSword(Reference.BRONZE);
|
||||
registerItem(BRONZE_SWORD, "bronzeSword");
|
||||
BRONZE_PICKAXE = new ItemTRPickaxe(Reference.BRONZE);
|
||||
registerItem(BRONZE_PICKAXE, "bronzePickaxe");
|
||||
BRONZE_SPADE = new ItemTRSpade(Reference.BRONZE);
|
||||
registerItem(BRONZE_SPADE, "bronzeSpade");
|
||||
BRONZE_AXE = new ItemTRAxe(Reference.BRONZE);
|
||||
registerItem(BRONZE_AXE, "bronzeAxe");
|
||||
BRONZE_HOE = new ItemTRHoe(Reference.BRONZE);
|
||||
registerItem(BRONZE_HOE, "bronzeHoe");
|
||||
|
||||
bronzeHelmet = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(bronzeHelmet, "bronzeHelmet");
|
||||
bronzeChestplate = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(bronzeChestplate, "bronzeChestplate");
|
||||
bronzeLeggings = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(bronzeLeggings, "bronzeLeggings");
|
||||
bronzeBoots = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(bronzeBoots, "bronzeBoots");
|
||||
BRONZE_HELMET = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(BRONZE_HELMET, "bronzeHelmet");
|
||||
BRONZE_CHESTPLATE = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(BRONZE_CHESTPLATE, "bronzeChestplate");
|
||||
BRONZE_LEGGINGS = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(BRONZE_LEGGINGS, "bronzeLeggings");
|
||||
BRONZE_BOOTS = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(BRONZE_BOOTS, "bronzeBoots");
|
||||
|
||||
rubySword = new ItemTRSword(Reference.RUBY);
|
||||
registerItem(rubySword, "rubySword");
|
||||
rubyPickaxe = new ItemTRPickaxe(Reference.RUBY);
|
||||
registerItem(rubyPickaxe, "rubyPickaxe");
|
||||
rubySpade = new ItemTRSpade(Reference.RUBY);
|
||||
registerItem(rubySpade, "rubySpade");
|
||||
rubyAxe = new ItemTRAxe(Reference.RUBY);
|
||||
registerItem(rubyAxe, "rubyAxe");
|
||||
rubyHoe = new ItemTRHoe(Reference.RUBY);
|
||||
registerItem(rubyHoe, "rubyHoe");
|
||||
RUBY_SWORD = new ItemTRSword(Reference.RUBY);
|
||||
registerItem(RUBY_SWORD, "rubySword");
|
||||
RUBY_PICKAXE = new ItemTRPickaxe(Reference.RUBY);
|
||||
registerItem(RUBY_PICKAXE, "rubyPickaxe");
|
||||
RUBY_SPADE = new ItemTRSpade(Reference.RUBY);
|
||||
registerItem(RUBY_SPADE, "rubySpade");
|
||||
RUBY_AXE = new ItemTRAxe(Reference.RUBY);
|
||||
registerItem(RUBY_AXE, "rubyAxe");
|
||||
RUBY_HOE = new ItemTRHoe(Reference.RUBY);
|
||||
registerItem(RUBY_HOE, "rubyHoe");
|
||||
|
||||
rubyHelmet = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(rubyHelmet, "rubyHelmet");
|
||||
rubyChestplate = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(rubyChestplate, "rubyChestplate");
|
||||
rubyLeggings = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(rubyLeggings, "rubyLeggings");
|
||||
rubyBoots = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(rubyBoots, "rubyBoots");
|
||||
RUBY_HELMET = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(RUBY_HELMET, "rubyHelmet");
|
||||
RUBY_CHESTPLATE = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(RUBY_CHESTPLATE, "rubyChestplate");
|
||||
RUBY_LEGGINGS = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(RUBY_LEGGINGS, "rubyLeggings");
|
||||
RUBY_BOOTS = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(RUBY_BOOTS, "rubyBoots");
|
||||
|
||||
sapphireSword = new ItemTRSword(Reference.SAPPHIRE);
|
||||
registerItem(sapphireSword, "sapphireSword");
|
||||
sapphirePickaxe = new ItemTRPickaxe(Reference.SAPPHIRE);
|
||||
registerItem(sapphirePickaxe, "sapphirePickaxe");
|
||||
sapphireSpade = new ItemTRSpade(Reference.SAPPHIRE);
|
||||
registerItem(sapphireSpade, "sapphireSpade");
|
||||
sapphireAxe = new ItemTRAxe(Reference.SAPPHIRE);
|
||||
registerItem(sapphireAxe, "sapphireAxe");
|
||||
sapphireHoe = new ItemTRHoe(Reference.SAPPHIRE);
|
||||
registerItem(sapphireHoe, "sapphireHoe");
|
||||
SAPPHIRE_SWORD = new ItemTRSword(Reference.SAPPHIRE);
|
||||
registerItem(SAPPHIRE_SWORD, "sapphireSword");
|
||||
SAPPHIRE_PICKAXE = new ItemTRPickaxe(Reference.SAPPHIRE);
|
||||
registerItem(SAPPHIRE_PICKAXE, "sapphirePickaxe");
|
||||
SAPPHIRE_SPADE = new ItemTRSpade(Reference.SAPPHIRE);
|
||||
registerItem(SAPPHIRE_SPADE, "sapphireSpade");
|
||||
SAPPHIRE_AXE = new ItemTRAxe(Reference.SAPPHIRE);
|
||||
registerItem(SAPPHIRE_AXE, "sapphireAxe");
|
||||
SAPPHIRE_HOE = new ItemTRHoe(Reference.SAPPHIRE);
|
||||
registerItem(SAPPHIRE_HOE, "sapphireHoe");
|
||||
|
||||
sapphireHelmet = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(sapphireHelmet, "sapphireHelmet");
|
||||
sapphireChestplate = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(sapphireChestplate, "sapphireChestplate");
|
||||
sapphireLeggings = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(sapphireLeggings, "sapphireLeggings");
|
||||
sapphireBoots = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(sapphireBoots, "sapphireBoots");
|
||||
SAPPHIRE_HELMET = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(SAPPHIRE_HELMET, "sapphireHelmet");
|
||||
SAPPHIRE_CHSTPLATE = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(SAPPHIRE_CHSTPLATE, "sapphireChestplate");
|
||||
SAPPHIRE_LEGGINGS = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(SAPPHIRE_LEGGINGS, "sapphireLeggings");
|
||||
SAPPHIRE_BOOTS = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(SAPPHIRE_BOOTS, "sapphireBoots");
|
||||
|
||||
peridotSword = new ItemTRSword(Reference.PERIDOT);
|
||||
registerItem(peridotSword, "peridotSword");
|
||||
peridotPickaxe = new ItemTRPickaxe(Reference.PERIDOT);
|
||||
registerItem(peridotPickaxe, "peridotPickaxe");
|
||||
peridotSpade = new ItemTRSpade(Reference.PERIDOT);
|
||||
registerItem(peridotSpade, "peridotSpade");
|
||||
peridotAxe = new ItemTRAxe(Reference.PERIDOT);
|
||||
registerItem(peridotAxe, "peridotAxe");
|
||||
peridotHoe = new ItemTRHoe(Reference.PERIDOT);
|
||||
registerItem(peridotHoe, "peridotHoe");
|
||||
PERIDOT_SWORD = new ItemTRSword(Reference.PERIDOT);
|
||||
registerItem(PERIDOT_SWORD, "peridotSword");
|
||||
PERIDOT_PICKAXE = new ItemTRPickaxe(Reference.PERIDOT);
|
||||
registerItem(PERIDOT_PICKAXE, "peridotPickaxe");
|
||||
PERIDOT_SAPPHIRE = new ItemTRSpade(Reference.PERIDOT);
|
||||
registerItem(PERIDOT_SAPPHIRE, "peridotSpade");
|
||||
PERIDOT_AXE = new ItemTRAxe(Reference.PERIDOT);
|
||||
registerItem(PERIDOT_AXE, "peridotAxe");
|
||||
PERIDOT_HOE = new ItemTRHoe(Reference.PERIDOT);
|
||||
registerItem(PERIDOT_HOE, "peridotHoe");
|
||||
|
||||
peridotHelmet = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(peridotHelmet, "peridotHelmet");
|
||||
peridotChestplate = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(peridotChestplate, "peridotChestplate");
|
||||
peridotLeggings = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(peridotLeggings, "peridotLeggings");
|
||||
peridotBoots = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(peridotBoots, "peridotBoots");
|
||||
PERIDOT_HELMET = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD);
|
||||
registerItem(PERIDOT_HELMET, "peridotHelmet");
|
||||
PERIDOT_CHESTPLATE = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST);
|
||||
registerItem(PERIDOT_CHESTPLATE, "peridotChestplate");
|
||||
PERIDOT_LEGGINGS = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS);
|
||||
registerItem(PERIDOT_LEGGINGS, "peridotLeggings");
|
||||
PERIDOT_BOOTS = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET);
|
||||
registerItem(PERIDOT_BOOTS, "peridotBoots");
|
||||
}
|
||||
|
||||
wrench = new ItemWrench();
|
||||
registerItem(wrench, "wrench");
|
||||
WRENCH = new ItemWrench();
|
||||
registerItem(WRENCH, "wrench");
|
||||
|
||||
nanosaber = PoweredItem.createItem(ItemNanosaber.class);
|
||||
registerItem(nanosaber, "nanosaber");
|
||||
NANOSABER = PoweredItem.createItem(ItemNanosaber.class);
|
||||
registerItem(NANOSABER, "nanosaber");
|
||||
|
||||
scrapBox = new ItemScrapBox();
|
||||
registerItem(scrapBox, "scrapbox");
|
||||
SCRAP_BOX = new ItemScrapBox();
|
||||
registerItem(SCRAP_BOX, "scrapbox");
|
||||
|
||||
frequencyTransmitter = new ItemFrequencyTransmitter();
|
||||
registerItem(frequencyTransmitter, "frequencyTransmitter");
|
||||
FREQUENCY_TRANSMITTER = new ItemFrequencyTransmitter();
|
||||
registerItem(FREQUENCY_TRANSMITTER, "frequencyTransmitter");
|
||||
|
||||
upgrades = new ItemUpgrades();
|
||||
registerItem(upgrades, "upgrades");
|
||||
UPGRADES = new ItemUpgrades();
|
||||
registerItem(UPGRADES, "upgrades");
|
||||
|
||||
cloakingDevice = PoweredItem.createItem(ItemCloakingDevice.class);
|
||||
registerItem(cloakingDevice, "cloakingdevice");
|
||||
CLOAKING_DEVICE = PoweredItem.createItem(ItemCloakingDevice.class);
|
||||
registerItem(CLOAKING_DEVICE, "cloakingdevice");
|
||||
|
||||
missingRecipe = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");
|
||||
registerItem(missingRecipe, "mssingRecipe");
|
||||
MISSING_RECIPE_PLACEHOLDER = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");
|
||||
registerItem(MISSING_RECIPE_PLACEHOLDER, "mssingRecipe");
|
||||
|
||||
debug = new ItemDebugTool();
|
||||
registerItem(debug, "debug");
|
||||
DEBUG = new ItemDebugTool();
|
||||
registerItem(DEBUG, "debug");
|
||||
|
||||
dynamicCell = new DynamicCell();
|
||||
registerItem(dynamicCell, "dynamicCell");
|
||||
CELL = new DynamicCell();
|
||||
registerItem(CELL, "dynamicCell");
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import java.util.HashMap;
|
|||
|
||||
public class ModParts {
|
||||
|
||||
public static HashMap<Integer, ItemStack> stackCable = new HashMap<>();
|
||||
public static HashMap<Integer, ItemStack> CABLE = new HashMap<>();
|
||||
|
||||
public static void init() { // TODO 1.8
|
||||
// if (Loader.isModLoaded("IC2")) {
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -9,14 +9,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
|||
*/
|
||||
public class ModSounds {
|
||||
|
||||
public static SoundEvent shock;
|
||||
public static SoundEvent dismantle;
|
||||
public static SoundEvent extract;
|
||||
public static SoundEvent CABLE_SHOCK;
|
||||
public static SoundEvent BLOCK_DISMANTLE;
|
||||
public static SoundEvent SAP_EXTRACT;
|
||||
|
||||
public static void init() {
|
||||
shock = getSound("cable_shock");
|
||||
dismantle = getSound("block_dismantle");
|
||||
extract = getSound("sap_extract");
|
||||
CABLE_SHOCK = getSound("cable_shock");
|
||||
BLOCK_DISMANTLE = getSound("block_dismantle");
|
||||
SAP_EXTRACT = getSound("sap_extract");
|
||||
}
|
||||
|
||||
private static SoundEvent getSound(String str) {
|
||||
|
|
|
@ -27,7 +27,7 @@ public class OreDict {
|
|||
IC2Dict.init();
|
||||
}
|
||||
|
||||
OreDictionary.registerOre("reBattery", ModItems.reBattery);
|
||||
OreDictionary.registerOre("reBattery", ModItems.RE_BATTERY);
|
||||
|
||||
OreDictionary.registerOre("circuitBasic", ItemParts.getPartByName("electronicCircuit"));
|
||||
OreDictionary.registerOre("circuitAdvanced", ItemParts.getPartByName("advancedCircuit"));
|
||||
|
@ -39,31 +39,31 @@ public class OreDict {
|
|||
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1));
|
||||
OreDictionary.registerOre("machineBlockElite", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
|
||||
|
||||
OreDictionary.registerOre("lapotronCrystal", ModItems.lapotronCrystal);
|
||||
OreDictionary.registerOre("energyCrystal", ModItems.energyCrystal);
|
||||
OreDictionary.registerOre("lapotronCrystal", ModItems.LAPOTRONIC_CRYSTAL);
|
||||
OreDictionary.registerOre("energyCrystal", ModItems.ENERGY_CRYSTAL);
|
||||
|
||||
OreDictionary.registerOre("drillBasic", ModItems.diamondDrill);
|
||||
OreDictionary.registerOre("drillDiamond", ModItems.diamondDrill);
|
||||
OreDictionary.registerOre("drillBasic", ModItems.DIAMOND_DRILL);
|
||||
OreDictionary.registerOre("drillDiamond", ModItems.DIAMOND_DRILL);
|
||||
|
||||
OreDictionary.registerOre("industrialTnt", Blocks.TNT);
|
||||
OreDictionary.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
|
||||
OreDictionary.registerOre("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold"));
|
||||
OreDictionary.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
|
||||
|
||||
OreDictionary.registerOre("ic2Generator", ModBlocks.generator);
|
||||
OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
|
||||
OreDictionary.registerOre("ic2Macerator", ModBlocks.grinder);
|
||||
OreDictionary.registerOre("ic2Extractor", ModBlocks.extractor);
|
||||
OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
|
||||
OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
|
||||
OreDictionary.registerOre("ic2Generator", ModBlocks.SOLID_FUEL_GENEREATOR);
|
||||
OreDictionary.registerOre("ic2SolarPanel", ModBlocks.SOLAR_PANEL);
|
||||
OreDictionary.registerOre("ic2Macerator", ModBlocks.GRINDER);
|
||||
OreDictionary.registerOre("ic2Extractor", ModBlocks.EXTRACTOR);
|
||||
OreDictionary.registerOre("ic2Windmill", ModBlocks.WIND_MILL);
|
||||
OreDictionary.registerOre("ic2Watermill", ModBlocks.WATER_MILL);
|
||||
|
||||
//OreDictionary.registerOre("uran235", nothing);
|
||||
//OreDictionary.registerOre("uran238", nothing);
|
||||
//OreDictionary.registerOre("smallUran235", nothing);
|
||||
|
||||
OreDictionary.registerOre("fenceIron", ModBlocks.ironFence);
|
||||
OreDictionary.registerOre("woodRubber", ModBlocks.rubberLog);
|
||||
OreDictionary.registerOre("glassReinforced", ModBlocks.reinforcedglass);
|
||||
OreDictionary.registerOre("fenceIron", ModBlocks.REFINED_IRON_FENCE);
|
||||
OreDictionary.registerOre("woodRubber", ModBlocks.RUBBER_LOG);
|
||||
OreDictionary.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS);
|
||||
|
||||
OreDictionary.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
|
||||
OreDictionary.registerOre("diamondTR", Items.DIAMOND);
|
||||
|
|
257
src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
Normal file
257
src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
Normal file
|
@ -0,0 +1,257 @@
|
|||
package techreborn.init.recipes;
|
||||
|
||||
import com.google.common.base.CaseFormat;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import reborncore.common.util.CraftingHelper;
|
||||
import techreborn.blocks.BlockStorage;
|
||||
import techreborn.blocks.BlockStorage2;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.IC2Duplicates;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.items.*;
|
||||
|
||||
import java.security.InvalidParameterException;
|
||||
|
||||
/**
|
||||
* Created by Prospector
|
||||
*/
|
||||
public class CraftingTableRecipes extends RecipeMethods {
|
||||
public static void init() {
|
||||
registerCompressionRecipes();
|
||||
registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), new ItemStack(Blocks.STONE), ItemIngots.getIngotByName("iridium"));
|
||||
registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), ItemIngots.getIngotByName("iridium"));
|
||||
registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), ItemIngots.getIngotByName("tungstensteel"));
|
||||
|
||||
registerShapeless(new ItemStack(ModBlocks.RUBBER_PLANKS, 4), new ItemStack(ModBlocks.RUBBER_LOG));
|
||||
|
||||
registerShapeless(new ItemStack(ModItems.FREQUENCY_TRANSMITTER), IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), "circuitBasic");
|
||||
|
||||
registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin");
|
||||
registerShaped(new ItemStack(ModBlocks.REFINED_IRON_FENCE), "RRR", "RRR", 'R', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig());
|
||||
|
||||
registerShaped(new ItemStack(ModItems.STEEL_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(new ItemStack(ModItems.DIAMOND_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', new ItemStack(ModItems.STEEL_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(new ItemStack(ModItems.ADVANCED_DRILL), " I ", "NCN", "OAO", 'I', "ingotIridium", 'N', "nuggetIridium", 'A', new ItemStack(ModItems.DIAMOND_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', ItemUpgrades.getUpgradeByName("overclock"));
|
||||
|
||||
registerShaped(new ItemStack(ModItems.STEEL_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(new ItemStack(ModItems.DIAMOND_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', new ItemStack(ModItems.STEEL_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(new ItemStack(ModItems.ADVANCED_CHAINSAW), " NI", "OCN", "DO ", 'I', "ingotIridium", 'N', "nuggetIridium", 'D', new ItemStack(ModItems.DIAMOND_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', ItemUpgrades.getUpgradeByName("overclock"));
|
||||
|
||||
registerShaped(new ItemStack(ModItems.STEEL_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(new ItemStack(ModItems.DIAMOND_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', new ItemStack(ModItems.STEEL_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(new ItemStack(ModItems.ADVANCED_JACKHAMMER), "NDN", "OCO", " I ", 'I', "ingotIridium", 'N', "nuggetIridium", 'D', new ItemStack(ModItems.DIAMOND_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', ItemUpgrades.getUpgradeByName("overclock"));
|
||||
|
||||
if (ConfigTechReborn.enableGemArmorAndTools) {
|
||||
addToolAndArmourRecipes(new ItemStack(ModItems.RUBY_SWORD), new ItemStack(ModItems.RUBY_PICKAXE),
|
||||
new ItemStack(ModItems.RUBY_AXE), new ItemStack(ModItems.RUBY_HOE), new ItemStack(ModItems.RUBY_SPADE),
|
||||
new ItemStack(ModItems.RUBY_HELMET), new ItemStack(ModItems.RUBY_CHESTPLATE),
|
||||
new ItemStack(ModItems.RUBY_LEGGINGS), new ItemStack(ModItems.RUBY_BOOTS), "gemRuby");
|
||||
|
||||
addToolAndArmourRecipes(new ItemStack(ModItems.SAPPHIRE_SWORD), new ItemStack(ModItems.SAPPHIRE_PICKAXE),
|
||||
new ItemStack(ModItems.SAPPHIRE_AXE), new ItemStack(ModItems.SAPPHIRE_HOE),
|
||||
new ItemStack(ModItems.SAPPHIRE_SPADE), new ItemStack(ModItems.SAPPHIRE_HELMET),
|
||||
new ItemStack(ModItems.SAPPHIRE_CHSTPLATE), new ItemStack(ModItems.SAPPHIRE_LEGGINGS),
|
||||
new ItemStack(ModItems.SAPPHIRE_BOOTS), "gemSapphire");
|
||||
|
||||
addToolAndArmourRecipes(new ItemStack(ModItems.PERIDOT_SWORD), new ItemStack(ModItems.PERIDOT_PICKAXE),
|
||||
new ItemStack(ModItems.PERIDOT_AXE), new ItemStack(ModItems.PERIDOT_HOE),
|
||||
new ItemStack(ModItems.PERIDOT_SAPPHIRE), new ItemStack(ModItems.PERIDOT_HELMET),
|
||||
new ItemStack(ModItems.PERIDOT_CHESTPLATE), new ItemStack(ModItems.PERIDOT_LEGGINGS),
|
||||
new ItemStack(ModItems.PERIDOT_BOOTS), "gemPeridot");
|
||||
|
||||
addToolAndArmourRecipes(new ItemStack(ModItems.BRONZE_SWORD), new ItemStack(ModItems.BRONZE_PICKAXE),
|
||||
new ItemStack(ModItems.BRONZE_AXE), new ItemStack(ModItems.BRONZE_HOE),
|
||||
new ItemStack(ModItems.BRONZE_SPADE), new ItemStack(ModItems.BRONZE_HELMET),
|
||||
new ItemStack(ModItems.BRONZE_CHESTPLATE), new ItemStack(ModItems.BRONZE_LEGGINGS),
|
||||
new ItemStack(ModItems.BRONZE_BOOTS), "ingotBronze");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void registerCompressionRecipes() {
|
||||
for (String name : ArrayUtils.addAll(BlockStorage.types, BlockStorage2.types)) {
|
||||
ItemStack item = ItemStack.EMPTY;
|
||||
try {
|
||||
item = ItemIngots.getIngotByName(name, 9);
|
||||
} catch (InvalidParameterException e) {
|
||||
try {
|
||||
item = ItemGems.getGemByName(name, 9);
|
||||
} catch (InvalidParameterException e2) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (!item.isEmpty()) {
|
||||
registerShaped(BlockStorage.getStorageBlockByName(name), "III", "III", "III", 'I', item);
|
||||
registerShapeless(item, BlockStorage.getStorageBlockByName(name, 9));
|
||||
}
|
||||
}
|
||||
|
||||
for (String name : ArrayUtils.addAll(BlockStorage.types, BlockStorage2.types)) {
|
||||
registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A',
|
||||
"ingot" + name.substring(0, 1).toUpperCase() + name.substring(1));
|
||||
registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A',
|
||||
"gem" + name.substring(0, 1).toUpperCase() + name.substring(1));
|
||||
}
|
||||
|
||||
for (String name : ItemDustsSmall.types) {
|
||||
if (name.equals(ModItems.META_PLACEHOLDER)) {
|
||||
continue;
|
||||
}
|
||||
registerShapeless(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name));
|
||||
registerShapeless(ItemDusts.getDustByName(name), ItemDustsSmall.getSmallDustByName(name),
|
||||
ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name),
|
||||
ItemDustsSmall.getSmallDustByName(name));
|
||||
}
|
||||
|
||||
for (String nuggets : ItemNuggets.types) {
|
||||
if (nuggets.equals(ModItems.META_PLACEHOLDER) || nuggets.equalsIgnoreCase("diamond"))
|
||||
continue;
|
||||
registerShapeless(ItemNuggets.getNuggetByName(nuggets, 9), CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + nuggets));
|
||||
registerShaped(ItemIngots.getIngotByName(nuggets), "NNN", "NNN", "NNN", 'N', CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + nuggets));
|
||||
}
|
||||
|
||||
registerShapeless(ItemNuggets.getNuggetByName("diamond", 9), "gemDiamond");
|
||||
registerShaped(new ItemStack(Items.DIAMOND), "NNN", "NNN", "NNN", 'N', "nuggetDiamond");
|
||||
}
|
||||
|
||||
static void registerMixedMetalIngotRecipes() {
|
||||
if (!IC2Duplicates.deduplicate()) {
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
|
||||
'B', "ingotBronze", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
|
||||
'B', "ingotBronze", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
|
||||
'B', "ingotBrass", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
|
||||
'B', "ingotBrass", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
|
||||
'B', "ingotBronze", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
|
||||
'B', "ingotBrass", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
|
||||
'B', "ingotBronze", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
|
||||
'B', "ingotBronze", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
|
||||
'B', "ingotBrass", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
|
||||
'B', "ingotBrass", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
|
||||
'B', "ingotBronze", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
|
||||
'B', "ingotBrass", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotTin");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotZinc");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotAluminum");
|
||||
|
||||
registerShaped(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
|
||||
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum");
|
||||
}
|
||||
}
|
||||
|
||||
static void registerShaped(ItemStack output, Object... inputs) {
|
||||
CraftingHelper.addShapedOreRecipe(output, inputs);
|
||||
}
|
||||
|
||||
static void registerShapeless(ItemStack output, Object... inputs) {
|
||||
CraftingHelper.addShapelessOreRecipe(output, inputs);
|
||||
}
|
||||
|
||||
static void addToolAndArmourRecipes(ItemStack sword,
|
||||
ItemStack pickaxe,
|
||||
ItemStack axe,
|
||||
ItemStack hoe,
|
||||
ItemStack spade,
|
||||
ItemStack helmet,
|
||||
ItemStack chestplate,
|
||||
ItemStack leggings,
|
||||
ItemStack boots,
|
||||
String material) {
|
||||
registerShaped(sword, "G", "G", "S", 'S', Items.STICK, 'G', material);
|
||||
registerShaped(pickaxe, "GGG", " S ", " S ", 'S', Items.STICK, 'G', material);
|
||||
registerShaped(axe, "GG", "GS", " S", 'S', Items.STICK, 'G', material);
|
||||
registerShaped(hoe, "GG", " S", " S", 'S', Items.STICK, 'G', material);
|
||||
registerShaped(spade, "G", "S", "S", 'S', Items.STICK, 'G', material);
|
||||
registerShaped(helmet, "GGG", "G G", 'G', material);
|
||||
registerShaped(chestplate, "G G", "GGG", "GGG", 'G', material);
|
||||
registerShaped(leggings, "GGG", "G G", "G G", 'G', material);
|
||||
registerShaped(boots, "G G", "G G", 'G', material);
|
||||
}
|
||||
}
|
|
@ -18,8 +18,8 @@ import techreborn.init.ModFluids;
|
|||
public class IndustrialGrinderRecipes extends RecipeMethods {
|
||||
|
||||
static FluidStack WATER = new FluidStack(FluidRegistry.WATER, 1000);
|
||||
static FluidStack MERCURY = new FluidStack(ModFluids.fluidMercury, 1000);
|
||||
static FluidStack SODIUM_PERSULFATE = new FluidStack(ModFluids.fluidSodiumpersulfate, 1000);
|
||||
static FluidStack MERCURY = new FluidStack(ModFluids.MERCURY, 1000);
|
||||
static FluidStack SODIUM_PERSULFATE = new FluidStack(ModFluids.SODIUMPERSULFATE, 1000);
|
||||
|
||||
public static void init() {
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import techreborn.items.*;
|
|||
/**
|
||||
* Created by Prospector
|
||||
*/
|
||||
public class RecipeMethods {
|
||||
public abstract class RecipeMethods {
|
||||
static ItemStack getMaterial(String name, int count, Type type) {
|
||||
if (type == Type.DUST) {
|
||||
return ItemDusts.getDustByName(name, count);
|
||||
|
|
|
@ -63,7 +63,7 @@ public class ItemBlockAesu extends ItemBlock {
|
|||
|
||||
public ItemStack getDropWithNBT(double energy) {
|
||||
NBTTagCompound tileEntity = new NBTTagCompound();
|
||||
ItemStack dropStack = new ItemStack(ModBlocks.AESU, 1);
|
||||
ItemStack dropStack = new ItemStack(ModBlocks.ADJUSTABLE_SU, 1);
|
||||
writeToNBTWithoutCoords(tileEntity, energy);
|
||||
dropStack.setTagCompound(new NBTTagCompound());
|
||||
dropStack.getTagCompound().setTag("tileEntity", tileEntity);
|
||||
|
|
|
@ -8,7 +8,7 @@ import techreborn.init.ModBlocks;
|
|||
public class ItemBlockMachineCasing extends ItemMultiTexture {
|
||||
|
||||
public ItemBlockMachineCasing(Block block) {
|
||||
super(ModBlocks.machineCasing, ModBlocks.machineCasing, BlockMachineCasing.types);
|
||||
super(ModBlocks.MACHINE_CASINGS, ModBlocks.MACHINE_CASINGS, BlockMachineCasing.types);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import techreborn.init.ModBlocks;
|
|||
public class ItemBlockMachineFrame extends ItemBlockBase {
|
||||
|
||||
public ItemBlockMachineFrame(Block block) {
|
||||
super(ModBlocks.machineframe, ModBlocks.machineframe, BlockMachineFrame.types);
|
||||
super(ModBlocks.MACHINE_FRAMES, ModBlocks.MACHINE_FRAMES, BlockMachineFrame.types);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import techreborn.init.ModBlocks;
|
|||
public class ItemBlockOre extends ItemBlockBase {
|
||||
|
||||
public ItemBlockOre(Block block) {
|
||||
super(ModBlocks.ore, ModBlocks.ore, BlockOre.ores);
|
||||
super(ModBlocks.ORE, ModBlocks.ORE, BlockOre.ores);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import techreborn.init.ModBlocks;
|
|||
public class ItemBlockOre2 extends ItemBlockBase {
|
||||
|
||||
public ItemBlockOre2(Block block) {
|
||||
super(ModBlocks.ore2, ModBlocks.ore2, BlockOre2.ores);
|
||||
super(ModBlocks.ORE2, ModBlocks.ORE2, BlockOre2.ores);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -7,6 +7,6 @@ import techreborn.init.ModBlocks;
|
|||
|
||||
public class ItemBlockPlayerDetector extends ItemBlockBase {
|
||||
public ItemBlockPlayerDetector(Block block) {
|
||||
super(ModBlocks.playerDetector, ModBlocks.playerDetector, BlockPlayerDetector.types);
|
||||
super(ModBlocks.PLAYER_DETECTOR, ModBlocks.PLAYER_DETECTOR, BlockPlayerDetector.types);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import techreborn.init.ModBlocks;
|
|||
public class ItemBlockStorage extends ItemBlockBase {
|
||||
|
||||
public ItemBlockStorage(Block block) {
|
||||
super(ModBlocks.storage, ModBlocks.storage, BlockStorage.types);
|
||||
super(ModBlocks.STORAGE, ModBlocks.STORAGE, BlockStorage.types);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import techreborn.init.ModBlocks;
|
|||
public class ItemBlockStorage2 extends ItemBlockBase {
|
||||
|
||||
public ItemBlockStorage2(Block block) {
|
||||
super(ModBlocks.storage2, ModBlocks.storage2, BlockStorage2.types);
|
||||
super(ModBlocks.STORAGE2, ModBlocks.STORAGE2, BlockStorage2.types);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ public class DynamicCell extends Item {
|
|||
super();
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
setUnlocalizedName("techreborn.cell");
|
||||
setMaxStackSize(16);
|
||||
setMaxStackSize(64);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -132,14 +132,14 @@ public class DynamicCell extends Item {
|
|||
|
||||
public static ItemStack getCellWithFluid(Fluid fluid, int stackSize) {
|
||||
Validate.notNull(fluid);
|
||||
ItemStack stack = new ItemStack(ModItems.dynamicCell);
|
||||
ItemStack stack = new ItemStack(ModItems.CELL);
|
||||
getFluidHandler(stack).fill(new FluidStack(fluid, CAPACITY), true);
|
||||
stack.setCount(stackSize);
|
||||
return stack;
|
||||
}
|
||||
|
||||
public static ItemStack getEmptyCell(int amount) {
|
||||
return new ItemStack(ModItems.dynamicCell, amount);
|
||||
return new ItemStack(ModItems.CELL, amount);
|
||||
}
|
||||
|
||||
public static ItemStack getCellWithFluid(Fluid fluid) {
|
||||
|
|
|
@ -34,7 +34,7 @@ public class ItemDusts extends ItemTRNoDestroy {
|
|||
if (types[i].equals(ModItems.META_PLACEHOLDER)) {
|
||||
throw new InvalidParameterException("The dust " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.dusts, count, i);
|
||||
return new ItemStack(ModItems.DUSTS, count, i);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ public class ItemDustsSmall extends ItemTRNoDestroy {
|
|||
if (types[i].equals(ModItems.META_PLACEHOLDER)) {
|
||||
throw new InvalidParameterException("The small dust " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.smallDusts, count, i);
|
||||
return new ItemStack(ModItems.SMALL_DUSTS, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The small dust " + name + " could not be found.");
|
||||
|
|
|
@ -108,7 +108,7 @@ public class ItemFrequencyTransmitter extends ItemTRNoDestroy {
|
|||
|
||||
public static class StackInfoFreqTransmitter extends StackInfoElement {
|
||||
public StackInfoFreqTransmitter() {
|
||||
super(ModItems.frequencyTransmitter);
|
||||
super(ModItems.FREQUENCY_TRANSMITTER);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemGems extends ItemTRNoDestroy {
|
|||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModItems.gems, count, i);
|
||||
return new ItemStack(ModItems.GEMS, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The gem " + name + " could not be found.");
|
||||
|
|
|
@ -27,7 +27,7 @@ public class ItemIngots extends ItemTRNoDestroy {
|
|||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModItems.ingots, count, i);
|
||||
return new ItemStack(ModItems.INGOTS, count, i);
|
||||
}
|
||||
}
|
||||
if (name.equalsIgnoreCase("iron")) {
|
||||
|
|
|
@ -27,7 +27,7 @@ public class ItemNuggets extends ItemTRNoDestroy {
|
|||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModItems.nuggets, count, i);
|
||||
return new ItemStack(ModItems.NUGGETS, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The nugget " + name + " could not be found.");
|
||||
|
|
|
@ -49,7 +49,7 @@ public class ItemParts extends ItemTRNoDestroy {
|
|||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModItems.parts, count, i);
|
||||
return new ItemStack(ModItems.PARTS, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The part " + name + " could not be found.");
|
||||
|
|
|
@ -31,7 +31,7 @@ public class ItemPlates extends ItemTRNoDestroy {
|
|||
if (types[i].equals(ModItems.META_PLACEHOLDER)) {
|
||||
throw new InvalidParameterException("The dust " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.plate, count, i);
|
||||
return new ItemStack(ModItems.PLATES, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The plate " + name + " could not be found.");
|
||||
|
@ -52,7 +52,7 @@ public class ItemPlates extends ItemTRNoDestroy {
|
|||
types = newTypes;
|
||||
newTypes[plateIndex] = plateType;
|
||||
String oreName = "plate" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, plateType);
|
||||
OreDictionary.registerOre(oreName, new ItemStack(ModItems.plate, 1, plateIndex));
|
||||
OreDictionary.registerOre(oreName, new ItemStack(ModItems.PLATES, 1, plateIndex));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -28,7 +28,7 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IMachineUpgrade {
|
|||
public static ItemStack getUpgradeByName(String name, int count) {
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
return new ItemStack(ModItems.upgrades, count, i);
|
||||
return new ItemStack(ModItems.UPGRADES, count, i);
|
||||
}
|
||||
}
|
||||
throw new InvalidParameterException("The upgrade " + name + " could not be found.");
|
||||
|
|
|
@ -71,8 +71,8 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.lapotronpack);
|
||||
ItemStack charged = new ItemStack(ModItems.lapotronpack);
|
||||
ItemStack uncharged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK);
|
||||
ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
||||
itemList.add(uncharged);
|
||||
|
|
|
@ -11,7 +11,6 @@ import net.minecraft.util.NonNullList;
|
|||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.RebornCore;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
|
@ -90,8 +89,8 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.lithiumBatpack);
|
||||
ItemStack charged = new ItemStack(ModItems.lithiumBatpack);
|
||||
ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
||||
ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
||||
itemList.add(uncharged);
|
||||
|
|
|
@ -19,7 +19,7 @@ public class ItemEnergyCrystal extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.energyCrystal);
|
||||
ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -19,7 +19,7 @@ public class ItemLapotronCrystal extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.lapotronCrystal);
|
||||
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -20,7 +20,7 @@ public class ItemLapotronicOrb extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.lapotronicOrb);
|
||||
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -19,7 +19,7 @@ public class ItemLithiumBattery extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.lithiumBattery);
|
||||
ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -19,7 +19,7 @@ public class ItemReBattery extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.reBattery);
|
||||
ItemStack stack = new ItemStack(ModItems.RE_BATTERY);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.advancedChainsaw);
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemAdvancedDrill extends ItemDrill {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.advancedDrill);
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -23,7 +23,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.advancedJackhammer);
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -17,7 +17,6 @@ import techreborn.client.TechRebornCreativeTab;
|
|||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.items.ItemTRNoDestroy;
|
||||
import techreborn.items.ItemTextureBase;
|
||||
|
||||
public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemInfo {
|
||||
public static int Teir = ConfigTechReborn.CloakingDeviceTier;
|
||||
|
@ -89,8 +88,8 @@ public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemIn
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.cloakingDevice);
|
||||
ItemStack charged = new ItemStack(ModItems.cloakingDevice);
|
||||
ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
||||
ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
||||
itemList.add(uncharged);
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.diamondChainsaw);
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemDiamondDrill extends ItemDrill {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.diamondDrill);
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -23,7 +23,7 @@ public class ItemDiamondJackhammer extends ItemJackhammer {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.diamondJackhammer);
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import ic2.core.item.tool.ItemTreetap;
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
@ -17,7 +15,6 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.RebornCore;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
|
@ -25,7 +22,6 @@ import techreborn.client.TechRebornCreativeTab;
|
|||
import techreborn.init.ModItems;
|
||||
import techreborn.items.ItemTRNoDestroy;
|
||||
import techreborn.compat.CompatManager;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 05/11/2016.
|
||||
|
@ -97,8 +93,8 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.electricTreetap);
|
||||
ItemStack charged = new ItemStack(ModItems.electricTreetap);
|
||||
ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
|
||||
ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
||||
itemList.add(uncharged);
|
||||
|
|
|
@ -96,16 +96,16 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack inactiveUncharged = new ItemStack(ModItems.nanosaber);
|
||||
ItemStack inactiveUncharged = new ItemStack(ModItems.NANOSABER);
|
||||
inactiveUncharged.setTagCompound(new NBTTagCompound());
|
||||
inactiveUncharged.getTagCompound().setBoolean("isActive", false);
|
||||
|
||||
ItemStack inactiveCharged = new ItemStack(ModItems.nanosaber);
|
||||
ItemStack inactiveCharged = new ItemStack(ModItems.NANOSABER);
|
||||
inactiveCharged.setTagCompound(new NBTTagCompound());
|
||||
inactiveCharged.getTagCompound().setBoolean("isActive", false);
|
||||
PoweredItem.setEnergy(getMaxPower(inactiveCharged), inactiveCharged);
|
||||
|
||||
ItemStack activeCharged = new ItemStack(ModItems.nanosaber);
|
||||
ItemStack activeCharged = new ItemStack(ModItems.NANOSABER);
|
||||
activeCharged.setTagCompound(new NBTTagCompound());
|
||||
activeCharged.getTagCompound().setBoolean("isActive", true);
|
||||
PoweredItem.setEnergy(getMaxPower(activeCharged), activeCharged);
|
||||
|
|
|
@ -126,8 +126,8 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.omniTool);
|
||||
ItemStack charged = new ItemStack(ModItems.omniTool);
|
||||
ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL);
|
||||
ItemStack charged = new ItemStack(ModItems.OMNI_TOOL);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
||||
itemList.add(uncharged);
|
||||
|
|
|
@ -124,8 +124,8 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.rockCutter);
|
||||
ItemStack charged = new ItemStack(ModItems.rockCutter);
|
||||
ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||
ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
||||
itemList.add(uncharged);
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemSteelChainsaw extends ItemChainsaw {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.ironChainsaw);
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemSteelDrill extends ItemDrill {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.ironDrill);
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -23,7 +23,7 @@ public class ItemSteelJackhammer extends ItemJackhammer {
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.steelJackhammer);
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -162,7 +162,7 @@ public class ItemWrench extends ItemTRNoDestroy {
|
|||
}
|
||||
}
|
||||
world.playSound(null, player.posX, player.posY,
|
||||
player.posZ, ModSounds.dismantle,
|
||||
player.posZ, ModSounds.BLOCK_DISMANTLE,
|
||||
SoundCategory.BLOCKS, 0.6F, 1F);
|
||||
if (!world.isRemote) {
|
||||
world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
|
||||
|
|
|
@ -53,63 +53,63 @@ public class GuiManual extends GuiScreen {
|
|||
// POWER GENERATION
|
||||
pageCollection.addPage(new GeneratingPowerPage(Reference.pageNames.GENERATINGPOWER_PAGE, pageCollection));
|
||||
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.generator.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.generator), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.thermalGenerator.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.thermalGenerator), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.solarPanel.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.solarPanel), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.heatGenerator.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.heatGenerator), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.lightningRod.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.lightningRod), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.SOLID_FUEL_GENEREATOR.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.THERMAL_GENERATOR.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.THERMAL_GENERATOR), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.SOLAR_PANEL.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.SOLAR_PANEL), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.HEAT_GENERATOR.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.HEAT_GENERATOR), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.LIGHTNING_ROD.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.LIGHTNING_ROD), "", Reference.pageNames.GENERATINGPOWER_PAGE));
|
||||
|
||||
// BASIC MACHINES
|
||||
pageCollection.addPage(new BasicMachinesPage(Reference.pageNames.BASICMACHINES_PAGE, pageCollection));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.grinder.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.grinder), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.electricFurnace.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.electricFurnace), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.alloySmelter.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.alloySmelter), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.extractor.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.extractor), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.compressor.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.compressor), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.GRINDER.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.GRINDER), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.ELECTRIC_FURNACE.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.ELECTRIC_FURNACE), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.ALLOY_SMELTER.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.ALLOY_SMELTER), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.EXTRACTOR.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.EXTRACTOR), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.COMPRESSOR.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.COMPRESSOR), "", Reference.pageNames.BASICMACHINES_PAGE));
|
||||
|
||||
// ADVANCED MACHINES
|
||||
pageCollection.addPage(new AdvancedMachines(Reference.pageNames.ADVANCEDMACHINES_PAGE, pageCollection));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.blastFurnace.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.blastFurnace), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.industrialSawmill.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.industrialSawmill), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.industrialElectrolyzer.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.industrialElectrolyzer), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.industrialGrinder.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.industrialGrinder), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.implosionCompressor.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.implosionCompressor), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.centrifuge.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.centrifuge), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.INDUSTRIAL_BLAST_FURNACE.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.INDUSTRIAL_SAWMILL.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.INDUSTRIAL_ELECTROLYZER.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.INDUSTRIAL_GRINDER.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.IMPLOSION_COMPRESSOR.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModBlocks.INDUSTRIAL_CENTRIFUGE.getLocalizedName(), pageCollection,
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
|
||||
|
||||
// TOOLS
|
||||
pageCollection.addPage(new ToolsPage(Reference.pageNames.TOOLS_PAGE, pageCollection));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.ironDrill.getUnlocalizedName() + ".name", pageCollection,
|
||||
new ItemStack(ModItems.ironDrill), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.diamondDrill.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.diamondDrill), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.advancedDrill.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.advancedDrill), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.ironChainsaw.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.ironChainsaw), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.diamondChainsaw.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.diamondChainsaw), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.advancedChainsaw.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.advancedChainsaw), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.omniTool.getUnlocalizedName() + ".name", pageCollection,
|
||||
new ItemStack(ModItems.omniTool), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.treeTap.getUnlocalizedName() + ".name", pageCollection,
|
||||
new ItemStack(ModItems.treeTap), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.STEEL_DRILL.getUnlocalizedName() + ".name", pageCollection,
|
||||
new ItemStack(ModItems.STEEL_DRILL), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.DIAMOND_DRILL.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.DIAMOND_DRILL), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.ADVANCED_DRILL.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.ADVANCED_DRILL), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.STEEL_CHAINSAW.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.STEEL_CHAINSAW), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.DIAMOND_CHAINSAW.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.DIAMOND_CHAINSAW), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.ADVANCED_CHAINSAW.getUnlocalizedName() + ".name",
|
||||
pageCollection, new ItemStack(ModItems.ADVANCED_CHAINSAW), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.OMNI_TOOL.getUnlocalizedName() + ".name", pageCollection,
|
||||
new ItemStack(ModItems.OMNI_TOOL), "", Reference.pageNames.TOOLS_PAGE));
|
||||
pageCollection.addPage(new CraftingInfoPage(ModItems.TREE_TAP.getUnlocalizedName() + ".name", pageCollection,
|
||||
new ItemStack(ModItems.TREE_TAP), "", Reference.pageNames.TOOLS_PAGE));
|
||||
|
||||
return pageCollection;
|
||||
}
|
||||
|
|
|
@ -20,23 +20,23 @@ public class AdvancedMachines extends TitledPage {
|
|||
buttonList.clear();
|
||||
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
|
||||
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 10, getYMin() + 20, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.blastFurnace), ModBlocks.blastFurnace.getUnlocalizedName(),
|
||||
ttl(ModBlocks.blastFurnace.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), ModBlocks.INDUSTRIAL_BLAST_FURNACE.getUnlocalizedName(),
|
||||
ttl(ModBlocks.INDUSTRIAL_BLAST_FURNACE.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 10, getYMin() + 40, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.industrialSawmill), ModBlocks.industrialSawmill.getUnlocalizedName(),
|
||||
ttl(ModBlocks.industrialSawmill.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), ModBlocks.INDUSTRIAL_SAWMILL.getUnlocalizedName(),
|
||||
ttl(ModBlocks.INDUSTRIAL_SAWMILL.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 10, getYMin() + 60, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.industrialElectrolyzer), ModBlocks.industrialElectrolyzer.getUnlocalizedName(),
|
||||
ttl(ModBlocks.industrialElectrolyzer.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), ModBlocks.INDUSTRIAL_ELECTROLYZER.getUnlocalizedName(),
|
||||
ttl(ModBlocks.INDUSTRIAL_ELECTROLYZER.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 10, getYMin() + 80, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.industrialGrinder), ModBlocks.industrialGrinder.getUnlocalizedName(),
|
||||
ttl(ModBlocks.industrialGrinder.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), ModBlocks.INDUSTRIAL_GRINDER.getUnlocalizedName(),
|
||||
ttl(ModBlocks.INDUSTRIAL_GRINDER.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 10, getYMin() + 100, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.implosionCompressor), ModBlocks.implosionCompressor.getUnlocalizedName(),
|
||||
ttl(ModBlocks.implosionCompressor.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR), ModBlocks.IMPLOSION_COMPRESSOR.getUnlocalizedName(),
|
||||
ttl(ModBlocks.IMPLOSION_COMPRESSOR.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(6, getXMin() + 10, getYMin() + 120, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.centrifuge), ModBlocks.centrifuge.getUnlocalizedName(),
|
||||
ttl(ModBlocks.centrifuge.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), ModBlocks.INDUSTRIAL_CENTRIFUGE.getUnlocalizedName(),
|
||||
ttl(ModBlocks.INDUSTRIAL_CENTRIFUGE.getLocalizedName())));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -44,16 +44,16 @@ public class AdvancedMachines extends TitledPage {
|
|||
if (button.id == 0)
|
||||
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
|
||||
if (button.id == 1)
|
||||
collection.changeActivePage(ModBlocks.blastFurnace.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.INDUSTRIAL_BLAST_FURNACE.getLocalizedName());
|
||||
if (button.id == 2)
|
||||
collection.changeActivePage(ModBlocks.industrialSawmill.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.INDUSTRIAL_SAWMILL.getLocalizedName());
|
||||
if (button.id == 3)
|
||||
collection.changeActivePage(ModBlocks.industrialElectrolyzer.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.INDUSTRIAL_ELECTROLYZER.getLocalizedName());
|
||||
if (button.id == 4)
|
||||
collection.changeActivePage(ModBlocks.industrialGrinder.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.INDUSTRIAL_GRINDER.getLocalizedName());
|
||||
if (button.id == 5)
|
||||
collection.changeActivePage(ModBlocks.implosionCompressor.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.IMPLOSION_COMPRESSOR.getLocalizedName());
|
||||
if (button.id == 6)
|
||||
collection.changeActivePage(ModBlocks.centrifuge.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.INDUSTRIAL_CENTRIFUGE.getLocalizedName());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,20 +20,20 @@ public class BasicMachinesPage extends TitledPage {
|
|||
buttonList.clear();
|
||||
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
|
||||
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.grinder), ModBlocks.grinder.getUnlocalizedName(),
|
||||
ttl(ModBlocks.grinder.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.GRINDER), ModBlocks.GRINDER.getUnlocalizedName(),
|
||||
ttl(ModBlocks.GRINDER.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.electricFurnace), ModBlocks.electricFurnace.getUnlocalizedName(),
|
||||
ttl(ModBlocks.electricFurnace.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.ELECTRIC_FURNACE), ModBlocks.ELECTRIC_FURNACE.getUnlocalizedName(),
|
||||
ttl(ModBlocks.ELECTRIC_FURNACE.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.alloySmelter), ModBlocks.alloySmelter.getUnlocalizedName(),
|
||||
ttl(ModBlocks.alloySmelter.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.ALLOY_SMELTER), ModBlocks.ALLOY_SMELTER.getUnlocalizedName(),
|
||||
ttl(ModBlocks.ALLOY_SMELTER.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.extractor), ModBlocks.extractor.getUnlocalizedName(),
|
||||
ttl(ModBlocks.extractor.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.EXTRACTOR), ModBlocks.EXTRACTOR.getUnlocalizedName(),
|
||||
ttl(ModBlocks.EXTRACTOR.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.compressor), ModBlocks.compressor.getUnlocalizedName(),
|
||||
ttl(ModBlocks.compressor.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.COMPRESSOR), ModBlocks.COMPRESSOR.getUnlocalizedName(),
|
||||
ttl(ModBlocks.COMPRESSOR.getLocalizedName())));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -41,14 +41,14 @@ public class BasicMachinesPage extends TitledPage {
|
|||
if (button.id == 0)
|
||||
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
|
||||
if (button.id == 1)
|
||||
collection.changeActivePage(ModBlocks.grinder.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.GRINDER.getLocalizedName());
|
||||
if (button.id == 2)
|
||||
collection.changeActivePage(ModBlocks.electricFurnace.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.ELECTRIC_FURNACE.getLocalizedName());
|
||||
if (button.id == 3)
|
||||
collection.changeActivePage(ModBlocks.alloySmelter.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.ALLOY_SMELTER.getLocalizedName());
|
||||
if (button.id == 4)
|
||||
collection.changeActivePage(ModBlocks.extractor.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.EXTRACTOR.getLocalizedName());
|
||||
if (button.id == 5)
|
||||
collection.changeActivePage(ModBlocks.compressor.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.COMPRESSOR.getLocalizedName());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,16 +25,16 @@ public class ContentsPage extends TitledPage {
|
|||
ItemPlates.getPlateByName("iron"), Reference.pageNames.GETTINGSTARTED_PAGE,
|
||||
ttl(Reference.GETTINGSTARTED_KEY)));
|
||||
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.generator), Reference.pageNames.GENERATINGPOWER_PAGE,
|
||||
new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR), Reference.pageNames.GENERATINGPOWER_PAGE,
|
||||
ttl(Reference.GENERATINGPOWER_KEY)));
|
||||
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.electricFurnace), Reference.pageNames.BASICMACHINES_PAGE,
|
||||
new ItemStack(ModBlocks.ELECTRIC_FURNACE), Reference.pageNames.BASICMACHINES_PAGE,
|
||||
ttl(Reference.BASICMACHINES_KEY)));
|
||||
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.blastFurnace), Reference.pageNames.ADVANCEDMACHINES_PAGE,
|
||||
new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), Reference.pageNames.ADVANCEDMACHINES_PAGE,
|
||||
ttl(Reference.ADVANCEDMACHINES_KEY)));
|
||||
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.ironDrill), Reference.pageNames.TOOLS_PAGE, ttl(Reference.TOOLS_KEY)));
|
||||
new ItemStack(ModItems.STEEL_DRILL), Reference.pageNames.TOOLS_PAGE, ttl(Reference.TOOLS_KEY)));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -20,20 +20,20 @@ public class GeneratingPowerPage extends TitledPage {
|
|||
buttonList.clear();
|
||||
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
|
||||
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.generator), ModBlocks.generator.getUnlocalizedName(),
|
||||
ttl(ModBlocks.generator.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR), ModBlocks.SOLID_FUEL_GENEREATOR.getUnlocalizedName(),
|
||||
ttl(ModBlocks.SOLID_FUEL_GENEREATOR.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.thermalGenerator), ModBlocks.thermalGenerator.getUnlocalizedName(),
|
||||
ttl(ModBlocks.thermalGenerator.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.THERMAL_GENERATOR), ModBlocks.THERMAL_GENERATOR.getUnlocalizedName(),
|
||||
ttl(ModBlocks.THERMAL_GENERATOR.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.solarPanel), ModBlocks.solarPanel.getUnlocalizedName(),
|
||||
ttl(ModBlocks.solarPanel.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.SOLAR_PANEL), ModBlocks.SOLAR_PANEL.getUnlocalizedName(),
|
||||
ttl(ModBlocks.SOLAR_PANEL.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.heatGenerator), ModBlocks.heatGenerator.getUnlocalizedName(),
|
||||
ttl(ModBlocks.heatGenerator.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.HEAT_GENERATOR), ModBlocks.HEAT_GENERATOR.getUnlocalizedName(),
|
||||
ttl(ModBlocks.HEAT_GENERATOR.getLocalizedName())));
|
||||
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
|
||||
new ItemStack(ModBlocks.lightningRod), ModBlocks.lightningRod.getUnlocalizedName(),
|
||||
ttl(ModBlocks.lightningRod.getLocalizedName())));
|
||||
new ItemStack(ModBlocks.LIGHTNING_ROD), ModBlocks.LIGHTNING_ROD.getUnlocalizedName(),
|
||||
ttl(ModBlocks.LIGHTNING_ROD.getLocalizedName())));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -41,14 +41,14 @@ public class GeneratingPowerPage extends TitledPage {
|
|||
if (button.id == 0)
|
||||
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
|
||||
if (button.id == 1)
|
||||
collection.changeActivePage(ModBlocks.generator.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.SOLID_FUEL_GENEREATOR.getLocalizedName());
|
||||
if (button.id == 2)
|
||||
collection.changeActivePage(ModBlocks.thermalGenerator.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.THERMAL_GENERATOR.getLocalizedName());
|
||||
if (button.id == 3)
|
||||
collection.changeActivePage(ModBlocks.solarPanel.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.SOLAR_PANEL.getLocalizedName());
|
||||
if (button.id == 4)
|
||||
collection.changeActivePage(ModBlocks.heatGenerator.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.HEAT_GENERATOR.getLocalizedName());
|
||||
if (button.id == 5)
|
||||
collection.changeActivePage(ModBlocks.lightningRod.getLocalizedName());
|
||||
collection.changeActivePage(ModBlocks.LIGHTNING_ROD.getLocalizedName());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,23 +21,23 @@ public class ToolsPage extends TitledPage {
|
|||
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
|
||||
ButtonUtil.addNextButton(1, width / 2 + 40, height / 2 + 64, buttonList);
|
||||
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.ironDrill), ModItems.ironDrill.getUnlocalizedName(),
|
||||
ttl(ModItems.ironDrill.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.STEEL_DRILL), ModItems.STEEL_DRILL.getUnlocalizedName(),
|
||||
ttl(ModItems.STEEL_DRILL.getUnlocalizedName() + ".name")));
|
||||
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.diamondDrill), ModItems.diamondDrill.getUnlocalizedName(),
|
||||
ttl(ModItems.diamondDrill.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.DIAMOND_DRILL), ModItems.DIAMOND_DRILL.getUnlocalizedName(),
|
||||
ttl(ModItems.DIAMOND_DRILL.getUnlocalizedName() + ".name")));
|
||||
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.advancedDrill), ModItems.advancedDrill.getUnlocalizedName(),
|
||||
ttl(ModItems.advancedDrill.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.ADVANCED_DRILL), ModItems.ADVANCED_DRILL.getUnlocalizedName(),
|
||||
ttl(ModItems.ADVANCED_DRILL.getUnlocalizedName() + ".name")));
|
||||
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.ironChainsaw), ModItems.ironChainsaw.getUnlocalizedName(),
|
||||
ttl(ModItems.ironChainsaw.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.STEEL_CHAINSAW), ModItems.STEEL_CHAINSAW.getUnlocalizedName(),
|
||||
ttl(ModItems.STEEL_CHAINSAW.getUnlocalizedName() + ".name")));
|
||||
buttonList.add(new GuiButtonItemTexture(6, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.diamondChainsaw), ModItems.diamondChainsaw.getUnlocalizedName(),
|
||||
ttl(ModItems.diamondChainsaw.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.DIAMOND_CHAINSAW), ModItems.DIAMOND_CHAINSAW.getUnlocalizedName(),
|
||||
ttl(ModItems.DIAMOND_CHAINSAW.getUnlocalizedName() + ".name")));
|
||||
buttonList.add(new GuiButtonItemTexture(7, getXMin() + 20, getYMin() + 120, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.advancedChainsaw), ModItems.advancedChainsaw.getUnlocalizedName(),
|
||||
ttl(ModItems.advancedChainsaw.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.ADVANCED_CHAINSAW), ModItems.ADVANCED_CHAINSAW.getUnlocalizedName(),
|
||||
ttl(ModItems.ADVANCED_CHAINSAW.getUnlocalizedName() + ".name")));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -48,27 +48,27 @@ public class ToolsPage extends TitledPage {
|
|||
buttonList.clear();
|
||||
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
|
||||
buttonList.add(new GuiButtonItemTexture(8, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.omniTool), ModItems.omniTool.getUnlocalizedName(),
|
||||
ttl(ModItems.omniTool.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.OMNI_TOOL), ModItems.OMNI_TOOL.getUnlocalizedName(),
|
||||
ttl(ModItems.OMNI_TOOL.getUnlocalizedName() + ".name")));
|
||||
buttonList.add(new GuiButtonItemTexture(9, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
|
||||
new ItemStack(ModItems.treeTap), ModItems.treeTap.getUnlocalizedName(),
|
||||
ttl(ModItems.treeTap.getUnlocalizedName() + ".name")));
|
||||
new ItemStack(ModItems.TREE_TAP), ModItems.TREE_TAP.getUnlocalizedName(),
|
||||
ttl(ModItems.TREE_TAP.getUnlocalizedName() + ".name")));
|
||||
}
|
||||
if (button.id == 2)
|
||||
collection.changeActivePage(ModItems.ironDrill.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.STEEL_DRILL.getUnlocalizedName() + ".name");
|
||||
if (button.id == 3)
|
||||
collection.changeActivePage(ModItems.diamondDrill.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.DIAMOND_DRILL.getUnlocalizedName() + ".name");
|
||||
if (button.id == 4)
|
||||
collection.changeActivePage(ModItems.advancedDrill.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.ADVANCED_DRILL.getUnlocalizedName() + ".name");
|
||||
if (button.id == 5)
|
||||
collection.changeActivePage(ModItems.ironChainsaw.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.STEEL_CHAINSAW.getUnlocalizedName() + ".name");
|
||||
if (button.id == 6)
|
||||
collection.changeActivePage(ModItems.diamondChainsaw.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.DIAMOND_CHAINSAW.getUnlocalizedName() + ".name");
|
||||
if (button.id == 7)
|
||||
collection.changeActivePage(ModItems.advancedChainsaw.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.ADVANCED_CHAINSAW.getUnlocalizedName() + ".name");
|
||||
if (button.id == 8)
|
||||
collection.changeActivePage(ModItems.omniTool.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.OMNI_TOOL.getUnlocalizedName() + ".name");
|
||||
if (button.id == 9)
|
||||
collection.changeActivePage(ModItems.treeTap.getUnlocalizedName() + ".name");
|
||||
collection.changeActivePage(ModItems.TREE_TAP.getUnlocalizedName() + ".name");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -313,7 +313,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
|
|||
@Override
|
||||
protected void isBlockGoodForFrame(World world, int x, int y, int z) throws MultiblockValidationException {
|
||||
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
|
||||
if (block == ModBlocks.machineCasing) {
|
||||
if (block == ModBlocks.MACHINE_CASINGS) {
|
||||
|
||||
} else {
|
||||
super.isBlockGoodForFrame(world, x, y, z);
|
||||
|
|
|
@ -318,7 +318,7 @@ public abstract class CableMultipart extends Multipart
|
|||
}
|
||||
if (ConfigTechReborn.UninsulatedElectocutionSound) {
|
||||
getWorld().playSound(null, entity.posX, entity.posY,
|
||||
entity.posZ, ModSounds.shock,
|
||||
entity.posZ, ModSounds.CABLE_SHOCK,
|
||||
SoundCategory.BLOCKS, 0.6F, 1F);
|
||||
}
|
||||
if (ConfigTechReborn.UninsulatedElectocutionParticle) {
|
||||
|
|
|
@ -91,10 +91,10 @@ public class ClientProxy extends CommonProxy {
|
|||
}
|
||||
|
||||
for (int i = 0; i < BlockMachineCasing.types.length; i++) {
|
||||
Core.proxy.registerSubBlockInventoryLocation(ModBlocks.machineCasing, i, "techreborn:machines/structure/machine_casing", "type=" + 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.machineframe, i, "techreborn:machines/storage/machine_blocks", "type=" + i);
|
||||
Core.proxy.registerSubBlockInventoryLocation(ModBlocks.MACHINE_FRAMES, i, "techreborn:machines/storage/machine_blocks", "type=" + i);
|
||||
}
|
||||
|
||||
ModelDynamicCell.init();
|
||||
|
@ -119,7 +119,7 @@ public class ClientProxy extends CommonProxy {
|
|||
ClientRegistry.registerKeyBinding(KeyBindings.config);
|
||||
ClientMultiBlocks.init();
|
||||
StateMap rubberLeavesStateMap = new StateMap.Builder().ignore(BlockRubberLeaves.CHECK_DECAY, BlockRubberLeaves.DECAYABLE).build();
|
||||
ModelLoader.setCustomStateMapper(ModBlocks.rubberLeaves, rubberLeavesStateMap);
|
||||
ModelLoader.setCustomStateMapper(ModBlocks.RUBBER_LEAVES, rubberLeavesStateMap);
|
||||
}
|
||||
|
||||
protected void registerItemModel(ItemStack item, String name) {
|
||||
|
|
|
@ -102,7 +102,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
|
|||
|
||||
public ItemStack getDropWithNBT() {
|
||||
NBTTagCompound tileEntity = new NBTTagCompound();
|
||||
ItemStack dropStack = new ItemStack(ModBlocks.AESU, 1);
|
||||
ItemStack dropStack = new ItemStack(ModBlocks.ADJUSTABLE_SU, 1);
|
||||
writeToNBTWithoutCoords(tileEntity);
|
||||
dropStack.setTagCompound(new NBTTagCompound());
|
||||
dropStack.getTagCompound().setTag("tileEntity", tileEntity);
|
||||
|
|
|
@ -255,7 +255,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.alloyFurnace, 1);
|
||||
return new ItemStack(ModBlocks.IRON_ALLOY_FURNACE, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -66,7 +66,7 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.alloySmelter, 1);
|
||||
return new ItemStack(ModBlocks.ALLOY_SMELTER, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -6,15 +6,12 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.EnumFacing;
|
||||
import reborncore.api.power.EnumPowerTier;
|
||||
import reborncore.api.recipe.IRecipeCrafterProvider;
|
||||
import reborncore.api.tile.IContainerProvider;
|
||||
import reborncore.api.tile.IInventoryProvider;
|
||||
import reborncore.common.IWrenchable;
|
||||
import reborncore.common.container.RebornContainer;
|
||||
import reborncore.common.powerSystem.TilePowerAcceptor;
|
||||
import reborncore.common.recipes.RecipeCrafter;
|
||||
import reborncore.common.util.Inventory;
|
||||
import techreborn.api.Reference;
|
||||
import techreborn.client.container.ContainerAssemblingMachine;
|
||||
import techreborn.init.ModBlocks;
|
||||
|
||||
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider {
|
||||
|
@ -62,7 +59,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.assemblyMachine, 1);
|
||||
return new ItemStack(ModBlocks.ASSEMBLY_MACHINE, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -88,7 +88,7 @@ public class TileCentrifuge extends TilePowerAcceptor
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.centrifuge, 1);
|
||||
return new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -63,7 +63,7 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.chargeBench, 1);
|
||||
return new ItemStack(ModBlocks.CHARGE_O_MAT, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -61,7 +61,7 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.chemicalReactor, 1);
|
||||
return new ItemStack(ModBlocks.CHEMICAL_REACTOR, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -45,7 +45,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.chunkLoader, 1);
|
||||
return new ItemStack(ModBlocks.CHUNK_LOADER, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -64,7 +64,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.industrialElectrolyzer, 1);
|
||||
return new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
|
|
@ -48,7 +48,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.matterFabricator, 1);
|
||||
return new ItemStack(ModBlocks.MATTER_FABRICATOR, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
@ -121,15 +121,15 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
|
|||
|
||||
private boolean spaceForOutput() {
|
||||
return inventory.getStackInSlot(6) == ItemStack.EMPTY
|
||||
|| ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)
|
||||
|| ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.UU_MATTER), true, true)
|
||||
&& inventory.getStackInSlot(6).getCount() < 64;
|
||||
}
|
||||
|
||||
private void addOutputProducts() {
|
||||
|
||||
if (inventory.getStackInSlot(6) == ItemStack.EMPTY) {
|
||||
inventory.setInventorySlotContents(6, new ItemStack(ModItems.uuMatter));
|
||||
} else if (ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)) {
|
||||
inventory.setInventorySlotContents(6, new ItemStack(ModItems.UU_MATTER));
|
||||
} else if (ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.UU_MATTER), true, true)) {
|
||||
inventory.getStackInSlot(6).setCount(Math.min(64, 1 + inventory.getStackInSlot(6).getCount()));
|
||||
}
|
||||
}
|
||||
|
@ -152,9 +152,9 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
|
|||
public int getValue(ItemStack itemStack) {
|
||||
// int value = getValue(Recipes.matterAmplifier.getOutputFor(itemStack,
|
||||
// false));
|
||||
if (itemStack.getItem() == ModItems.parts && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()) {
|
||||
if (itemStack.getItem() == ModItems.PARTS && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()) {
|
||||
return 5000;
|
||||
} else if (itemStack.getItem() == ModItems.scrapBox) {
|
||||
} else if (itemStack.getItem() == ModItems.SCRAP_BOX) {
|
||||
return 45000;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -113,7 +113,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
|
|||
|
||||
public ItemStack getDropWithNBT() {
|
||||
NBTTagCompound tileEntity = new NBTTagCompound();
|
||||
ItemStack dropStack = new ItemStack(ModBlocks.quantumTank, 1);
|
||||
ItemStack dropStack = new ItemStack(ModBlocks.QUANTUM_TANK, 1);
|
||||
writeToNBTWithoutCoords(tileEntity);
|
||||
dropStack.setTagCompound(new NBTTagCompound());
|
||||
dropStack.getTagCompound().setTag("tileEntity", tileEntity);
|
||||
|
|
|
@ -140,7 +140,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.rollingMachine, 1);
|
||||
return new ItemStack(ModBlocks.ROLLING_MACHINE, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -125,7 +125,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
|
|||
|
||||
@Override
|
||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||
return new ItemStack(ModBlocks.scrapboxinator, 1);
|
||||
return new ItemStack(ModBlocks.SCRAPBOXINATOR, 1);
|
||||
}
|
||||
|
||||
public boolean isComplete() {
|
||||
|
@ -143,7 +143,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
|
|||
if (slotIndex == 2)
|
||||
return false;
|
||||
if (slotIndex == 1) {
|
||||
if (itemStack.getItem() == ModItems.scrapBox) {
|
||||
if (itemStack.getItem() == ModItems.SCRAP_BOX) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue