No more errors, the game launches, rejoice!

This commit is contained in:
aidancbrady committed 2016-05-26 03:14:44 -04:00
1 parent 79af86daae
commit ceec3e71e9
67 files changed
+951 -676

No files matched your search

+115 -110
View File
@@ -47,124 +47,124 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("Mekanism")
public class MekanismItems
{
public static final Item EnrichedAlloy = new ItemAlloy().setUnlocalizedName("EnrichedAlloy");
public static final Item ReinforcedAlloy = new ItemAlloy().setUnlocalizedName("ReinforcedAlloy");
public static final Item AtomicAlloy = new ItemAlloy().setUnlocalizedName("AtomicAlloy");
public static final Item TeleportationCore = new ItemMekanism().setUnlocalizedName("TeleportationCore");
public static final Item ElectrolyticCore = new ItemMekanism().setUnlocalizedName("ElectrolyticCore");
public static final Item Substrate = new ItemMekanism().setUnlocalizedName("Substrate");
public static final Item Polyethene = new ItemHDPE().setUnlocalizedName("HDPE");
public static final Item BioFuel = new ItemMekanism().setUnlocalizedName("BioFuel");
public static final Item ItemProxy = new ItemProxy().setUnlocalizedName("ItemProxy");
public static final Item EnrichedIron = new ItemMekanism().setUnlocalizedName("EnrichedIron");
public static final Item CompressedCarbon = new ItemMekanism().setUnlocalizedName("CompressedCarbon");
public static final Item CompressedRedstone = new ItemMekanism().setUnlocalizedName("CompressedRedstone");
public static final Item CompressedDiamond = new ItemMekanism().setUnlocalizedName("CompressedDiamond");
public static final Item CompressedObsidian = new ItemMekanism().setUnlocalizedName("CompressedObsidian");
public static final Item BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET).setUnlocalizedName("BrineBucket");
public static final Item LithiumBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET).setUnlocalizedName("LithiumBucket");
public static final Item HeavyWaterBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET).setUnlocalizedName("HeavyWaterBucket");
public static final Item SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED).setUnlocalizedName("SpeedUpgrade");
public static final Item EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY).setUnlocalizedName("EnergyUpgrade");
public static final Item FilterUpgrade = new ItemUpgrade(Upgrade.FILTER).setUnlocalizedName("FilterUpgrade");
public static final Item MufflingUpgrade = new ItemUpgrade(Upgrade.MUFFLING).setUnlocalizedName("MufflingUpgrade");
public static final Item GasUpgrade = new ItemUpgrade(Upgrade.GAS).setUnlocalizedName("GasUpgrade");
public static final Item FactoryInstaller = new ItemFactoryInstaller().setUnlocalizedName("FactoryInstaller");
public static final ItemEnergized EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet");
public static final ItemRobit Robit = (ItemRobit)new ItemRobit().setUnlocalizedName("Robit");
public static final ItemAtomicDisassembler AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler().setUnlocalizedName("AtomicDisassembler");
public static final ItemPortableTeleporter PortableTeleporter = (ItemPortableTeleporter)new ItemPortableTeleporter().setUnlocalizedName("PortableTeleporter");
public static final ItemConfigurator Configurator = (ItemConfigurator)new ItemConfigurator().setUnlocalizedName("Configurator");
public static final ItemNetworkReader NetworkReader = (ItemNetworkReader)new ItemNetworkReader().setUnlocalizedName("NetworkReader");
public static final Item WalkieTalkie = new ItemWalkieTalkie().setUnlocalizedName("WalkieTalkie");
public static final ItemElectricBow ElectricBow = (ItemElectricBow)new ItemElectricBow().setUnlocalizedName("ElectricBow");
public static final ItemFlamethrower Flamethrower = (ItemFlamethrower)new ItemFlamethrower().setUnlocalizedName("Flamethrower");
public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader");
public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary");
public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper().setUnlocalizedName("GaugeDropper");
public static final Item ConfigurationCard = new ItemConfigurationCard().setUnlocalizedName("ConfigurationCard");
public static final Item CraftingFormula = new ItemCraftingFormula().setUnlocalizedName("CraftingFormula");
public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter");
public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel");
public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank");
public static final ItemGasMask GasMask = (ItemGasMask)new ItemGasMask().setUnlocalizedName("GasMask");
public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack");
public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack");
public static final ItemFreeRunners FreeRunners = (ItemFreeRunners)new ItemFreeRunners().setUnlocalizedName("FreeRunners");
public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon");
public static final Item EnrichedAlloy = init(new ItemAlloy(), "EnrichedAlloy");
public static final Item ReinforcedAlloy = init(new ItemAlloy(), "ReinforcedAlloy");
public static final Item AtomicAlloy = init(new ItemAlloy(), "AtomicAlloy");
public static final Item TeleportationCore = init(new ItemMekanism(), "TeleportationCore");
public static final Item ElectrolyticCore = init(new ItemMekanism(), "ElectrolyticCore");
public static final Item Substrate = init(new ItemMekanism(), "Substrate");
public static final Item Polyethene = init(new ItemHDPE(), "HDPE");
public static final Item BioFuel = init(new ItemMekanism(), "BioFuel");
public static final Item ItemProxy = init(new ItemProxy(), "ItemProxy");
public static final Item EnrichedIron = init(new ItemMekanism(), "EnrichedIron");
public static final Item CompressedCarbon = init(new ItemMekanism(), "CompressedCarbon");
public static final Item CompressedRedstone = init(new ItemMekanism(), "CompressedRedstone");
public static final Item CompressedDiamond = init(new ItemMekanism(), "CompressedDiamond");
public static final Item CompressedObsidian = init(new ItemMekanism(), "CompressedObsidian");
public static final Item BrineBucket = init(new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET), "BrineBucket");
public static final Item LithiumBucket = init(new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET), "LithiumBucket");
public static final Item HeavyWaterBucket = init(new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET), "HeavyWaterBucket");
public static final Item SpeedUpgrade = init(new ItemUpgrade(Upgrade.SPEED), "SpeedUpgrade");
public static final Item EnergyUpgrade = init(new ItemUpgrade(Upgrade.ENERGY), "EnergyUpgrade");
public static final Item FilterUpgrade = init(new ItemUpgrade(Upgrade.FILTER), "FilterUpgrade");
public static final Item MufflingUpgrade = init(new ItemUpgrade(Upgrade.MUFFLING), "MufflingUpgrade");
public static final Item GasUpgrade = init(new ItemUpgrade(Upgrade.GAS), "GasUpgrade");
public static final Item FactoryInstaller = init(new ItemFactoryInstaller(), "FactoryInstaller");
public static final ItemEnergized EnergyTablet = (ItemEnergized)init(new ItemEnergized(1000000), "EnergyTablet");
public static final ItemRobit Robit = (ItemRobit)init(new ItemRobit(), "Robit");
public static final ItemAtomicDisassembler AtomicDisassembler = (ItemAtomicDisassembler)init(new ItemAtomicDisassembler(), "AtomicDisassembler");
public static final ItemPortableTeleporter PortableTeleporter = (ItemPortableTeleporter)init(new ItemPortableTeleporter(), "PortableTeleporter");
public static final ItemConfigurator Configurator = (ItemConfigurator)init(new ItemConfigurator(), "Configurator");
public static final ItemNetworkReader NetworkReader = (ItemNetworkReader)init(new ItemNetworkReader(), "NetworkReader");
public static final Item WalkieTalkie = init(new ItemWalkieTalkie(), "WalkieTalkie");
public static final ItemElectricBow ElectricBow = (ItemElectricBow)init(new ItemElectricBow(), "ElectricBow");
public static final ItemFlamethrower Flamethrower = (ItemFlamethrower)init(new ItemFlamethrower(), "Flamethrower");
public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)init(new ItemSeismicReader(), "SeismicReader");
public static final Item Dictionary = init(new ItemDictionary(), "Dictionary");
public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)init(new ItemGaugeDropper(), "GaugeDropper");
public static final Item ConfigurationCard = init(new ItemConfigurationCard(), "ConfigurationCard");
public static final Item CraftingFormula = init(new ItemCraftingFormula(), "CraftingFormula");
public static final Item PartTransmitter = init(new ItemPartTransmitter(), "MultipartTransmitter");
public static final Item GlowPanel = init(new ItemGlowPanel(), "GlowPanel");
public static final ItemScubaTank ScubaTank = (ItemScubaTank)init(new ItemScubaTank(), "ScubaTank");
public static final ItemGasMask GasMask = (ItemGasMask)init(new ItemGasMask(), "GasMask");
public static final ItemJetpack Jetpack = (ItemJetpack)init(new ItemJetpack(), "Jetpack");
public static final ItemJetpack ArmoredJetpack = (ItemJetpack)init(new ItemJetpack(), "ArmoredJetpack");
public static final ItemFreeRunners FreeRunners = (ItemFreeRunners)init(new ItemFreeRunners(), "FreeRunners");
public static final Item Balloon = init(new ItemBalloon(), "Balloon");
//Multi-ID Items
public static final Item OtherDust = new ItemOtherDust();
public static final Item Dust = new ItemDust();
public static final Item Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust");
public static final Item Salt = new ItemMekanism().setUnlocalizedName("Salt");
public static final Item Ingot = new ItemIngot();
public static final Item Clump = new ItemClump();
public static final Item DirtyDust = new ItemDirtyDust();
public static final Item Shard = new ItemShard();
public static final Item Crystal = new ItemCrystal();
public static final Item ControlCircuit = new ItemControlCircuit();
public static final Item OtherDust = init(new ItemOtherDust(), "OtherDust");
public static final Item Dust = init(new ItemDust(), "Dust");
public static final Item Sawdust = init(new ItemMekanism(), "Sawdust");
public static final Item Salt = init(new ItemMekanism(), "Salt");
public static final Item Ingot = init(new ItemIngot(), "Ingot");
public static final Item Clump = init(new ItemClump(), "Clump");
public static final Item DirtyDust = init(new ItemDirtyDust(), "DirtyDust");
public static final Item Shard = init(new ItemShard(), "Shard");
public static final Item Crystal = init(new ItemCrystal(), "Crystal");
public static final Item ControlCircuit = init(new ItemControlCircuit(), "ControlCircuit");
/**
* Adds and registers all items.
*/
public static void register()
{
GameRegistry.registerItem(PartTransmitter, "PartTransmitter");
GameRegistry.registerItem(ElectricBow, "ElectricBow");
GameRegistry.registerItem(Dust, "Dust");
GameRegistry.registerItem(Ingot, "Ingot");
GameRegistry.registerItem(EnergyTablet, "EnergyTablet");
GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade");
GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade");
GameRegistry.registerItem(FilterUpgrade, "FilterUpgrade");
GameRegistry.registerItem(MufflingUpgrade, "MufflingUpgrade");
GameRegistry.registerItem(GasUpgrade, "GasUpgrade");
GameRegistry.registerItem(Robit, "Robit");
GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler");
GameRegistry.registerItem(EnrichedAlloy, "EnrichedAlloy");
GameRegistry.registerItem(ReinforcedAlloy, "ReinforcedAlloy");
GameRegistry.registerItem(AtomicAlloy, "AtomicAlloy");
GameRegistry.registerItem(ItemProxy, "ItemProxy");
GameRegistry.registerItem(ControlCircuit, "ControlCircuit");
GameRegistry.registerItem(EnrichedIron, "EnrichedIron");
GameRegistry.registerItem(CompressedCarbon, "CompressedCarbon");
GameRegistry.registerItem(CompressedRedstone, "CompressedRedstone");
GameRegistry.registerItem(CompressedDiamond, "CompressedDiamond");
GameRegistry.registerItem(CompressedObsidian, "CompressedObsidian");
GameRegistry.registerItem(PortableTeleporter, "PortableTeleporter");
GameRegistry.registerItem(TeleportationCore, "TeleportationCore");
GameRegistry.registerItem(Clump, "Clump");
GameRegistry.registerItem(DirtyDust, "DirtyDust");
GameRegistry.registerItem(Configurator, "Configurator");
GameRegistry.registerItem(NetworkReader, "NetworkReader");
GameRegistry.registerItem(WalkieTalkie, "WalkieTalkie");
GameRegistry.registerItem(Jetpack, "Jetpack");
GameRegistry.registerItem(Dictionary, "Dictionary");
GameRegistry.registerItem(GasMask, "GasMask");
GameRegistry.registerItem(ScubaTank, "ScubaTank");
GameRegistry.registerItem(Balloon, "Balloon");
GameRegistry.registerItem(Shard, "Shard");
GameRegistry.registerItem(ElectrolyticCore, "ElectrolyticCore");
GameRegistry.registerItem(Sawdust, "Sawdust");
GameRegistry.registerItem(Salt, "Salt");
GameRegistry.registerItem(BrineBucket, "BrineBucket");
GameRegistry.registerItem(LithiumBucket, "LithiumBucket");
GameRegistry.registerItem(HeavyWaterBucket, "HeavyWaterBucket");
GameRegistry.registerItem(Crystal, "Crystal");
GameRegistry.registerItem(FreeRunners, "FreeRunners");
GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack");
GameRegistry.registerItem(ConfigurationCard, "ConfigurationCard");
GameRegistry.registerItem(CraftingFormula, "CraftingFormula");
GameRegistry.registerItem(SeismicReader, "SeismicReader");
GameRegistry.registerItem(Substrate, "Substrate");
GameRegistry.registerItem(Polyethene, "Polyethene");
GameRegistry.registerItem(BioFuel, "BioFuel");
GameRegistry.registerItem(GlowPanel, "GlowPanel");
GameRegistry.registerItem(Flamethrower, "Flamethrower");
GameRegistry.registerItem(GaugeDropper, "GaugeDropper");
GameRegistry.registerItem(FactoryInstaller, "FactoryInstaller");
GameRegistry.registerItem(OtherDust, "OtherDust");
GameRegistry.register(PartTransmitter);
GameRegistry.register(ElectricBow);
GameRegistry.register(Dust);
GameRegistry.register(Ingot);
GameRegistry.register(EnergyTablet);
GameRegistry.register(SpeedUpgrade);
GameRegistry.register(EnergyUpgrade);
GameRegistry.register(FilterUpgrade);
GameRegistry.register(MufflingUpgrade);
GameRegistry.register(GasUpgrade);
GameRegistry.register(Robit);
GameRegistry.register(AtomicDisassembler);
GameRegistry.register(EnrichedAlloy);
GameRegistry.register(ReinforcedAlloy);
GameRegistry.register(AtomicAlloy);
GameRegistry.register(ItemProxy);
GameRegistry.register(ControlCircuit);
GameRegistry.register(EnrichedIron);
GameRegistry.register(CompressedCarbon);
GameRegistry.register(CompressedRedstone);
GameRegistry.register(CompressedDiamond);
GameRegistry.register(CompressedObsidian);
GameRegistry.register(PortableTeleporter);
GameRegistry.register(TeleportationCore);
GameRegistry.register(Clump);
GameRegistry.register(DirtyDust);
GameRegistry.register(Configurator);
GameRegistry.register(NetworkReader);
GameRegistry.register(WalkieTalkie);
GameRegistry.register(Jetpack);
GameRegistry.register(Dictionary);
GameRegistry.register(GasMask);
GameRegistry.register(ScubaTank);
GameRegistry.register(Balloon);
GameRegistry.register(Shard);
GameRegistry.register(ElectrolyticCore);
GameRegistry.register(Sawdust);
GameRegistry.register(Salt);
GameRegistry.register(BrineBucket);
GameRegistry.register(LithiumBucket);
GameRegistry.register(HeavyWaterBucket);
GameRegistry.register(Crystal);
GameRegistry.register(FreeRunners);
GameRegistry.register(ArmoredJetpack);
GameRegistry.register(ConfigurationCard);
GameRegistry.register(CraftingFormula);
GameRegistry.register(SeismicReader);
GameRegistry.register(Substrate);
GameRegistry.register(Polyethene);
GameRegistry.register(BioFuel);
GameRegistry.register(GlowPanel);
GameRegistry.register(Flamethrower);
GameRegistry.register(GaugeDropper);
GameRegistry.register(FactoryInstaller);
GameRegistry.register(OtherDust);
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET);
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET);
@@ -175,4 +175,9 @@ public class MekanismItems
Mekanism.proxy.registerItemRenders();
}
public static Item init(Item item, String name)
{
return item.setUnlocalizedName(name).setRegistryName("mekanism:" + name);
}
}