Flattened upgrades
This commit is contained in:
parent
a40635e75f
commit
a05ba25f31
9 changed files with 80 additions and 139 deletions
|
@ -137,12 +137,14 @@ public class SubItemRetriever implements ISubItemRetriever {
|
|||
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name) {
|
||||
return ItemUpgrades.getUpgradeByName(name);
|
||||
// return ItemUpgrades.getUpgradeByName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name, int count) {
|
||||
return ItemUpgrades.getUpgradeByName(name, count);
|
||||
// return ItemUpgrades.getUpgradeByName(name, count);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -34,10 +34,13 @@ import techreborn.Core;
|
|||
import techreborn.api.Reference;
|
||||
import techreborn.blocks.BlockMachineFrames;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.events.TRRecipeHandler;
|
||||
import techreborn.items.*;
|
||||
import techreborn.items.armor.*;
|
||||
import techreborn.items.battery.*;
|
||||
import techreborn.items.tools.*;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class TRItems {
|
||||
|
@ -69,7 +72,6 @@ public class TRItems {
|
|||
public static Item STEEL_CHAINSAW;
|
||||
public static Item STEEL_DRILL;
|
||||
public static Item STEEL_JACKHAMMER;
|
||||
public static Item MANUAL;
|
||||
public static Item TREE_TAP;
|
||||
public static Item WRENCH;
|
||||
|
||||
|
@ -77,7 +79,10 @@ public class TRItems {
|
|||
public static DynamicCell CELL;
|
||||
public static Item FREQUENCY_TRANSMITTER;
|
||||
public static Item SCRAP_BOX;
|
||||
public static Item UPGRADES;
|
||||
public static Item MANUAL;
|
||||
public static Item UPGRADE_OVERCLOCKER;
|
||||
public static Item UPGRADE_TRANSFORMER;
|
||||
public static Item UPGRADE_ENERGY_STORAGE;
|
||||
|
||||
// Gem armor & tools
|
||||
@Nullable
|
||||
|
@ -221,9 +226,13 @@ public class TRItems {
|
|||
registerItem(FREQUENCY_TRANSMITTER, "frequencyTransmitter");
|
||||
SCRAP_BOX = new ItemScrapBox();
|
||||
registerItem(SCRAP_BOX, "scrapbox");
|
||||
UPGRADES = new ItemUpgrades();
|
||||
registerItem(UPGRADES, "upgrades");
|
||||
|
||||
UPGRADE_OVERCLOCKER = new ItemUpgrades();
|
||||
registerItem(UPGRADE_OVERCLOCKER, "upgrade_overclocker");
|
||||
UPGRADE_TRANSFORMER = new ItemUpgrades();
|
||||
registerItem(UPGRADE_TRANSFORMER, "upgrade_transformer");
|
||||
UPGRADE_ENERGY_STORAGE = new ItemUpgrades();
|
||||
registerItem(UPGRADE_ENERGY_STORAGE, "upgrade_energystorage");
|
||||
|
||||
// Gem armor & tools
|
||||
if (ConfigTechReborn.enableGemArmorAndTools) {
|
||||
BRONZE_SWORD = new ItemTRSword(Reference.BRONZE, "ingotBronze");
|
||||
|
@ -314,6 +323,8 @@ public class TRItems {
|
|||
|
||||
public static void registerItem(Item item, String name) {
|
||||
item.setRegistryName(name);
|
||||
item.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
||||
TRRecipeHandler.hideEntry(item);
|
||||
RebornRegistry.registerItem(item);
|
||||
}
|
||||
|
||||
|
|
|
@ -95,11 +95,11 @@ public class CraftingTableRecipes extends RecipeMethods {
|
|||
}
|
||||
|
||||
//Upgrades
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P', "plankWood", 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T', TRIngredients.Parts.COOLANT_SIMPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', TRIngredients.Parts.HELIUM_COOLANT_TRIPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', TRIngredients.Parts.NAK_COOLANT_SIMPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER));
|
||||
// registerShaped(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P', "plankWood", 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic", 'B', "reBattery");
|
||||
// registerShaped(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T', TRIngredients.Parts.COOLANT_SIMPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
|
||||
// registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', TRIngredients.Parts.HELIUM_COOLANT_TRIPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
|
||||
// registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', TRIngredients.Parts.NAK_COOLANT_SIMPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
|
||||
// registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER));
|
||||
|
||||
//Machines
|
||||
registerShapeless(getStack(ModBlocks.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE));
|
||||
|
|
|
@ -66,8 +66,8 @@ public abstract class RecipeMethods {
|
|||
return BlockMachineFrames.getFrameByName(name, count);
|
||||
} else if (type == Type.MACHINE_CASING) {
|
||||
return BlockMachineCasing.getStackByName(name, count);
|
||||
} else if (type == Type.UPGRADE) {
|
||||
return ItemUpgrades.getUpgradeByName(name, count);
|
||||
// } else if (type == Type.UPGRADE) {
|
||||
// return ItemUpgrades.getUpgradeByName(name, count);
|
||||
} else if (type == Type.ORE) {
|
||||
return BlockOre.getOreByName(name, count);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue