Continue to make sense of things... this mod's a mess lol
This commit is contained in:
parent
d98802ee1b
commit
0b963dcda9
171 changed files with 269 additions and 234 deletions
|
@ -33,18 +33,22 @@ import techreborn.tiles.*;
|
|||
import techreborn.tiles.cable.TileCable;
|
||||
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
||||
import techreborn.tiles.generator.*;
|
||||
import techreborn.tiles.idsu.TileInterdimensionalSU;
|
||||
import techreborn.tiles.lesu.TileLSUStorage;
|
||||
import techreborn.tiles.lesu.TileLapotronicSU;
|
||||
import techreborn.tiles.generator.advanced.*;
|
||||
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
|
||||
import techreborn.tiles.generator.basic.TileWaterMill;
|
||||
import techreborn.tiles.generator.basic.TileWindMill;
|
||||
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
|
||||
import techreborn.tiles.storage.lesu.TileLSUStorage;
|
||||
import techreborn.tiles.storage.lesu.TileLapotronicSU;
|
||||
import techreborn.tiles.lighting.TileLamp;
|
||||
import techreborn.tiles.multiblock.*;
|
||||
import techreborn.tiles.machine.multiblock.*;
|
||||
import techreborn.tiles.storage.TileAdjustableSU;
|
||||
import techreborn.tiles.storage.TileHighVoltageSU;
|
||||
import techreborn.tiles.storage.TileLowVoltageSU;
|
||||
import techreborn.tiles.storage.TileMediumVoltageSU;
|
||||
import techreborn.tiles.tier0.TileIronAlloyFurnace;
|
||||
import techreborn.tiles.tier0.TileIronFurnace;
|
||||
import techreborn.tiles.tier1.*;
|
||||
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
|
||||
import techreborn.tiles.machine.iron.TileIronFurnace;
|
||||
import techreborn.tiles.machine.tier1.*;
|
||||
import techreborn.tiles.transformers.TileHVTransformer;
|
||||
import techreborn.tiles.transformers.TileLVTransformer;
|
||||
import techreborn.tiles.transformers.TileMVTransformer;
|
||||
|
|
|
@ -79,11 +79,11 @@ public class OreDict {
|
|||
OreUtil.registerOre("machineBlockElite", new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
|
||||
|
||||
// Tools&Armor
|
||||
OreUtil.registerOre("reBattery", TRItems.RECHARGEABLE_BATTERY);
|
||||
OreUtil.registerOre("reBattery", TRItems.RED_CELL_BATTERY);
|
||||
OreUtil.registerOre("lapotronCrystal", TRItems.LAPOTRON_CRYSTAL);
|
||||
OreUtil.registerOre("energyCrystal", TRItems.ENERGY_CRYSTAL);
|
||||
OreUtil.registerOre("drillBasic", TRItems.STEEL_DRILL);
|
||||
OreUtil.registerOre("drillDiamond", TRItems.DIAMOND_DRILL);
|
||||
OreUtil.registerOre("drillBasic", TRItems.BASIC_DRILL);
|
||||
OreUtil.registerOre("drillDiamond", TRItems.ADVANCED_DRILL);
|
||||
|
||||
// Misc
|
||||
OreUtil.registerOre("industrialTnt", Blocks.TNT);
|
||||
|
|
|
@ -426,7 +426,7 @@ public class TRContent {
|
|||
Upgrades(IUpgrade upgrade) {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new ItemUpgrade(name, upgrade);
|
||||
InitUtils.setupIngredient(item, name, "_upgrade");
|
||||
InitUtils.setupIngredient(item, name, "upgrade");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,22 @@ import techreborn.items.armor.ItemLapotronicOrbpack;
|
|||
import techreborn.items.armor.ItemLithiumIonBatpack;
|
||||
import techreborn.items.armor.ItemTRArmour;
|
||||
import techreborn.items.battery.*;
|
||||
import techreborn.items.tools.*;
|
||||
import techreborn.items.tool.ItemDebugTool;
|
||||
import techreborn.items.tool.ItemTreeTap;
|
||||
import techreborn.items.tool.ItemWrench;
|
||||
import techreborn.items.tool.advanced.ItemAdvancedChainsaw;
|
||||
import techreborn.items.tool.advanced.ItemAdvancedDrill;
|
||||
import techreborn.items.tool.advanced.ItemAdvancedJackhammer;
|
||||
import techreborn.items.tool.advanced.ItemRockCutter;
|
||||
import techreborn.items.tool.basic.ItemBasicChainsaw;
|
||||
import techreborn.items.tool.basic.ItemBasicDrill;
|
||||
import techreborn.items.tool.basic.ItemBasicJackhammer;
|
||||
import techreborn.items.tool.basic.ItemElectricTreetap;
|
||||
import techreborn.items.tool.industrial.*;
|
||||
import techreborn.items.tool.vanilla.ItemTRAxe;
|
||||
import techreborn.items.tool.vanilla.ItemTRHoe;
|
||||
import techreborn.items.tool.vanilla.ItemTRSpade;
|
||||
import techreborn.items.tool.vanilla.ItemTRSword;
|
||||
import techreborn.utils.InitUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
@ -59,23 +74,23 @@ public class TRItems {
|
|||
public static Item LAPOTRON_CRYSTAL;
|
||||
public static Item LAPOTRONIC_ORB;
|
||||
public static Item LITHIUM_ION_BATTERY;
|
||||
public static Item RECHARGEABLE_BATTERY;
|
||||
public static Item RED_CELL_BATTERY;
|
||||
|
||||
// Tools
|
||||
public static Item INDUSTRIAL_CHAINSAW;
|
||||
public static Item INDUSTRIAL_DRILL;
|
||||
public static Item INDUSTRIAL_JACKHAMMER;
|
||||
public static Item DEBUG_TOOL;
|
||||
public static Item ADVANCED_CHAINSAW;
|
||||
public static Item ADVANCED_DRILL;
|
||||
public static Item ADVANCED_JACKHAMMER;
|
||||
public static Item DEBUG_TOOL;
|
||||
public static Item DIAMOND_CHAINSAW;
|
||||
public static Item DIAMOND_DRILL;
|
||||
public static Item DIAMOND_JACKHAMMER;
|
||||
public static Item ELECTRIC_TREE_TAP;
|
||||
public static Item NANOSABER;
|
||||
public static Item OMNI_TOOL;
|
||||
public static Item ROCK_CUTTER;
|
||||
public static Item STEEL_CHAINSAW;
|
||||
public static Item STEEL_DRILL;
|
||||
public static Item STEEL_JACKHAMMER;
|
||||
public static Item BASIC_CHAINSAW;
|
||||
public static Item BASIC_DRILL;
|
||||
public static Item BASIC_JACKHAMMER;
|
||||
public static Item TREE_TAP;
|
||||
public static Item WRENCH;
|
||||
|
||||
|
@ -164,29 +179,26 @@ public class TRItems {
|
|||
TRContent.registerItems();
|
||||
|
||||
// Battery
|
||||
registerItem(RECHARGEABLE_BATTERY = InitUtils.setup(new ItemRechargeableBattery(), "rechargeable_battery"));
|
||||
registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery"));
|
||||
registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery"));
|
||||
registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack"));
|
||||
registerItem(ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal"));
|
||||
registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crytal"));
|
||||
registerItem(LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb"));
|
||||
|
||||
//Armor
|
||||
registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack"));
|
||||
registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack"));
|
||||
registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device"));
|
||||
|
||||
// Tools
|
||||
registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool"));
|
||||
|
||||
registerItem(STEEL_DRILL = InitUtils.setup(new ItemSteelDrill(), "steel_drill"));
|
||||
registerItem(STEEL_CHAINSAW = InitUtils.setup(new ItemSteelChainsaw(), "steel_chainsaw"));
|
||||
registerItem(STEEL_JACKHAMMER = InitUtils.setup(new ItemSteelJackhammer(), "steel_jackhammer"));
|
||||
registerItem(DIAMOND_DRILL = InitUtils.setup(new ItemDiamondDrill(), "diamond_drill"));
|
||||
registerItem(DIAMOND_CHAINSAW = InitUtils.setup(new ItemDiamondChainsaw(), "diamond_chainsaw"));
|
||||
registerItem(DIAMOND_JACKHAMMER = InitUtils.setup(new ItemDiamondJackhammer(), "diamond_jackhammer"));
|
||||
registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill"));
|
||||
registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw"));
|
||||
registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer"));
|
||||
registerItem(ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill"));
|
||||
registerItem(ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw"));
|
||||
registerItem(ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer"));
|
||||
registerItem(INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill"));
|
||||
registerItem(INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw"));
|
||||
registerItem(INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer"));
|
||||
|
||||
registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter"));
|
||||
registerItem(NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber"));
|
||||
|
@ -196,6 +208,9 @@ public class TRItems {
|
|||
registerItem(TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap"));
|
||||
registerItem(WRENCH = InitUtils.setup(new ItemWrench(), "wrench"));
|
||||
|
||||
// Armor
|
||||
registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device"));
|
||||
|
||||
// Other
|
||||
registerItem(CELL = InitUtils.setup(new DynamicCell(), "cell"));
|
||||
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
|
||||
|
|
|
@ -65,18 +65,18 @@ public class CraftingTableRecipes extends RecipeMethods {
|
|||
ItemStack rockCutter = getStack(TRItems.ROCK_CUTTER);
|
||||
rockCutter.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||
registerShaped(rockCutter, "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', "ingotTitanium", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(TRItems.STEEL_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(TRItems.DIAMOND_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(getStack(TRItems.ADVANCED_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRItems.DIAMOND_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
|
||||
registerShaped(getStack(TRItems.STEEL_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(TRItems.DIAMOND_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(getStack(TRItems.ADVANCED_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.DIAMOND_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
|
||||
registerShaped(getStack(TRItems.STEEL_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(TRItems.DIAMOND_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(getStack(TRItems.ADVANCED_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.DIAMOND_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
|
||||
registerShaped(getStack(TRItems.BASIC_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(TRItems.ADVANCED_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(getStack(TRItems.INDUSTRIAL_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRItems.ADVANCED_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
|
||||
registerShaped(getStack(TRItems.BASIC_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(TRItems.ADVANCED_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(getStack(TRItems.INDUSTRIAL_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.ADVANCED_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
|
||||
registerShaped(getStack(TRItems.BASIC_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(TRItems.ADVANCED_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(getStack(TRItems.INDUSTRIAL_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.ADVANCED_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
|
||||
registerShaped(getStack(TRItems.CLOAKING_DEVICE), "CIC", "IOI", "CIC", 'C', "ingotChrome", 'I', "plateIridiumAlloy", 'O', getStack(TRItems.LAPOTRONIC_ORB));
|
||||
registerShaped(getStack(TRItems.LAPOTRONIC_ORBPACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRItems.LITHIUM_ION_BATPACK));
|
||||
registerShaped(getStack(TRItems.RECHARGEABLE_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack());
|
||||
registerShaped(getStack(TRItems.RED_CELL_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack());
|
||||
registerShaped(getStack(TRItems.LITHIUM_ION_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack());
|
||||
registerShaped(getStack(TRItems.LITHIUM_ION_BATPACK), "BCB", "BPB", "B B", 'B', getStack(TRItems.LITHIUM_ION_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced");
|
||||
registerShaped(getStack(TRItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue