Update to support new item power.

This commit is contained in:
modmuss50 2017-01-18 09:55:24 +00:00
parent 2c53c16010
commit 0872a802da
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
3 changed files with 65 additions and 21 deletions

View file

@ -81,6 +81,8 @@ public class Core {
worldGen = new TechRebornWorldGen(); worldGen = new TechRebornWorldGen();
worldGen.configFile = (new File(configDir, "ores.json")); worldGen.configFile = (new File(configDir, "ores.json"));
worldGen.hConfigFile = (new File(configDir, "ores.hjson")); worldGen.hConfigFile = (new File(configDir, "ores.hjson"));
//Must be done before the item classes are loaded.
ModPoweredItems.preInit();
TechRebornAPI.subItemRetriever = new SubItemRetriever(); TechRebornAPI.subItemRetriever = new SubItemRetriever();
//Recheck here because things break at times //Recheck here because things break at times

View file

@ -5,6 +5,8 @@ import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.api.power.IEnergyInterfaceItem;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.BucketHandler; import reborncore.common.util.BucketHandler;
@ -115,54 +117,54 @@ public class ModItems {
PARTS = new ItemParts(); PARTS = new ItemParts();
registerItem(PARTS, "part"); registerItem(PARTS, "part");
ROCK_CUTTER = PoweredItem.createItem(ItemRockCutter.class); ROCK_CUTTER = new ItemRockCutter();
registerItem(ROCK_CUTTER, "rockCutter"); registerItem(ROCK_CUTTER, "rockCutter");
LITHIUM_BATTERY_PACK = PoweredItem.createItem(ItemLithiumBatpack.class); LITHIUM_BATTERY_PACK = new ItemLithiumBatpack();
registerItem(LITHIUM_BATTERY_PACK, "lithiumBatpack"); registerItem(LITHIUM_BATTERY_PACK, "lithiumBatpack");
LAPOTRONIC_ORB_PACK = PoweredItem.createItem(ItemLapotronPack.class); LAPOTRONIC_ORB_PACK = new ItemLapotronPack();
registerItem(LAPOTRONIC_ORB_PACK, "lapotronPack"); registerItem(LAPOTRONIC_ORB_PACK, "lapotronPack");
LITHIUM_BATTERY = PoweredItem.createItem(ItemLithiumBattery.class); LITHIUM_BATTERY = new ItemLithiumBattery();
registerItem(LITHIUM_BATTERY, "lithiumBattery"); registerItem(LITHIUM_BATTERY, "lithiumBattery");
LAPOTRONIC_ORB = PoweredItem.createItem(ItemLapotronicOrb.class); LAPOTRONIC_ORB = new ItemLapotronicOrb();
registerItem(LAPOTRONIC_ORB, "lapotronicOrb"); registerItem(LAPOTRONIC_ORB, "lapotronicOrb");
OMNI_TOOL = PoweredItem.createItem(ItemOmniTool.class); OMNI_TOOL = new ItemOmniTool();
registerItem(OMNI_TOOL, "omniTool"); registerItem(OMNI_TOOL, "omniTool");
ENERGY_CRYSTAL = PoweredItem.createItem(ItemEnergyCrystal.class); ENERGY_CRYSTAL = new ItemEnergyCrystal();
registerItem(ENERGY_CRYSTAL, "energycrystal"); registerItem(ENERGY_CRYSTAL, "energycrystal");
LAPOTRONIC_CRYSTAL = PoweredItem.createItem(ItemLapotronCrystal.class); LAPOTRONIC_CRYSTAL = new ItemLapotronCrystal();
registerItem(LAPOTRONIC_CRYSTAL, "lapotroncrystal"); registerItem(LAPOTRONIC_CRYSTAL, "lapotroncrystal");
MANUAL = new ItemTechManual(); MANUAL = new ItemTechManual();
registerItem(MANUAL, "techmanuel"); registerItem(MANUAL, "techmanuel");
UU_MATTER = new ItemUUmatter(); UU_MATTER = new ItemUUmatter();
registerItem(UU_MATTER, "uumatter"); registerItem(UU_MATTER, "uumatter");
RE_BATTERY = PoweredItem.createItem(ItemReBattery.class); RE_BATTERY = new ItemReBattery();
registerItem(RE_BATTERY, "rebattery"); registerItem(RE_BATTERY, "rebattery");
TREE_TAP = new ItemTreeTap(); TREE_TAP = new ItemTreeTap();
registerItem(TREE_TAP, "treetap"); registerItem(TREE_TAP, "treetap");
ELECTRIC_TREE_TAP = PoweredItem.createItem(ItemElectricTreetap.class); ELECTRIC_TREE_TAP = new ItemElectricTreetap();
registerItem(ELECTRIC_TREE_TAP, "electricTreetap"); registerItem(ELECTRIC_TREE_TAP, "electricTreetap");
STEEL_DRILL = PoweredItem.createItem(ItemSteelDrill.class); STEEL_DRILL = new ItemSteelDrill();
registerItem(STEEL_DRILL, "irondrill"); registerItem(STEEL_DRILL, "irondrill");
DIAMOND_DRILL = PoweredItem.createItem(ItemDiamondDrill.class); DIAMOND_DRILL = new ItemDiamondDrill();
registerItem(DIAMOND_DRILL, "diamonddrill"); registerItem(DIAMOND_DRILL, "diamonddrill");
ADVANCED_DRILL = PoweredItem.createItem(ItemAdvancedDrill.class); ADVANCED_DRILL = new ItemAdvancedDrill();
registerItem(ADVANCED_DRILL, "advanceddrill"); registerItem(ADVANCED_DRILL, "advanceddrill");
STEEL_CHAINSAW = PoweredItem.createItem(ItemSteelChainsaw.class); STEEL_CHAINSAW = new ItemSteelChainsaw();
registerItem(STEEL_CHAINSAW, "ironchainsaw"); registerItem(STEEL_CHAINSAW, "ironchainsaw");
DIAMOND_CHAINSAW = PoweredItem.createItem(ItemDiamondChainsaw.class); DIAMOND_CHAINSAW = new ItemDiamondChainsaw();
registerItem(DIAMOND_CHAINSAW, "diamondchainsaw"); registerItem(DIAMOND_CHAINSAW, "diamondchainsaw");
ADVANCED_CHAINSAW = PoweredItem.createItem(ItemAdvancedChainsaw.class); ADVANCED_CHAINSAW = new ItemAdvancedChainsaw();
registerItem(ADVANCED_CHAINSAW, "advancedchainsaw"); registerItem(ADVANCED_CHAINSAW, "advancedchainsaw");
STEEL_JACKHAMMER = PoweredItem.createItem(ItemSteelJackhammer.class); STEEL_JACKHAMMER = new ItemSteelJackhammer();
registerItem(STEEL_JACKHAMMER, "steeljackhammer"); registerItem(STEEL_JACKHAMMER, "steeljackhammer");
DIAMOND_JACKHAMMER = PoweredItem.createItem(ItemDiamondJackhammer.class); DIAMOND_JACKHAMMER = new ItemDiamondJackhammer();
registerItem(DIAMOND_JACKHAMMER, "diamondjackhammer"); registerItem(DIAMOND_JACKHAMMER, "diamondjackhammer");
ADVANCED_JACKHAMMER = PoweredItem.createItem(ItemAdvancedJackhammer.class); ADVANCED_JACKHAMMER = new ItemAdvancedJackhammer();
registerItem(ADVANCED_JACKHAMMER, "ironjackhammer"); registerItem(ADVANCED_JACKHAMMER, "ironjackhammer");
if (ConfigTechReborn.enableGemArmorAndTools) { if (ConfigTechReborn.enableGemArmorAndTools) {
@ -250,7 +252,7 @@ public class ModItems {
WRENCH = new ItemWrench(); WRENCH = new ItemWrench();
registerItem(WRENCH, "wrench"); registerItem(WRENCH, "wrench");
NANOSABER = PoweredItem.createItem(ItemNanosaber.class); NANOSABER = new ItemNanosaber();
registerItem(NANOSABER, "nanosaber"); registerItem(NANOSABER, "nanosaber");
SCRAP_BOX = new ItemScrapBox(); SCRAP_BOX = new ItemScrapBox();
@ -262,7 +264,7 @@ public class ModItems {
UPGRADES = new ItemUpgrades(); UPGRADES = new ItemUpgrades();
registerItem(UPGRADES, "upgrades"); registerItem(UPGRADES, "upgrades");
CLOAKING_DEVICE = PoweredItem.createItem(ItemCloakingDevice.class); CLOAKING_DEVICE = new ItemCloakingDevice();
registerItem(CLOAKING_DEVICE, "cloakingdevice"); registerItem(CLOAKING_DEVICE, "cloakingdevice");
MISSING_RECIPE_PLACEHOLDER = new ItemMissingRecipe().setUnlocalizedName("missingRecipe"); MISSING_RECIPE_PLACEHOLDER = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");
@ -287,6 +289,12 @@ public class ModItems {
public static void registerItem(Item item, String name) { public static void registerItem(Item item, String name) {
item.setRegistryName(name); item.setRegistryName(name);
GameRegistry.register(item); GameRegistry.register(item);
if(item.getClass().isInstance(IEnergyItemInfo.class)){
if(!item.getClass().isInstance(IEnergyInterfaceItem.class)){
Core.logHelper.error(name + " was not patched with the power mixin. This is a error, the item may not work as intended.");
Core.logHelper.error("Please check that the reborn core loading plugin has been registerd.");
}
}
} }
} }

View file

@ -0,0 +1,34 @@
package techreborn.init;
import reborncore.common.powerSystem.PoweredItem;
/**
* Created by modmuss50 on 18/01/2017.
*/
public class ModPoweredItems {
public static void preInit(){
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemRockCutter");
PoweredItem.registerPoweredItem("techreborn.items.armor.ItemLithiumBatpack");
PoweredItem.registerPoweredItem("techreborn.items.armor.ItemLapotronPack");
PoweredItem.registerPoweredItem("techreborn.items.battery.ItemLithiumBattery");
PoweredItem.registerPoweredItem("techreborn.items.battery.ItemLapotronicOrb");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemOmniTool");
PoweredItem.registerPoweredItem("techreborn.items.battery.ItemEnergyCrystal");
PoweredItem.registerPoweredItem("techreborn.items.battery.ItemLapotronCrystal");
PoweredItem.registerPoweredItem("techreborn.items.battery.ItemReBattery");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemElectricTreetap");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemSteelDrill");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemDiamondDrill");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemAdvancedDrill");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemSteelChainsaw");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemDiamondChainsaw");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemAdvancedChainsaw");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemSteelJackhammer");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemDiamondJackhammer");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemAdvancedJackhammer");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemNanosaber");
PoweredItem.registerPoweredItem("techreborn.items.tools.ItemCloakingDevice");
}
}