Remove old cables

This commit is contained in:
modmuss50 2017-06-12 10:55:26 +01:00
parent 007e8714fa
commit 624d8fb93a
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
32 changed files with 53 additions and 1733 deletions

View file

@ -25,15 +25,12 @@
package techreborn.init;
import net.minecraft.item.ItemStack;
import techreborn.blocks.cable.EnumCableType;
import techreborn.compat.CompatManager;
import techreborn.config.ConfigTechReborn;
import techreborn.items.ItemIngots;
import techreborn.items.ItemParts;
import techreborn.items.ItemUpgrades;
import techreborn.parts.powerCables.EnumStandaloneCableType;
import javax.annotation.Nonnull;
/**
* Created by Mark on 18/12/2016.
*/
@ -53,14 +50,14 @@ public enum IC2Duplicates {
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()),
CABLE_HV(EnumStandaloneCableType.HV.getStack()),
CABLE_ICOPPER(EnumStandaloneCableType.ICOPPER.getStack()),
CABLE_IGOLD(EnumStandaloneCableType.IGOLD.getStack()),
CABLE_IHV(EnumStandaloneCableType.IHV.getStack()),
CABLE_IIHV(EnumStandaloneCableType.TIN.getStack()),
CABLE_COPPER(EnumCableType.COPPER.getStack()),
CABLE_GLASSFIBER(EnumCableType.GLASSFIBER.getStack()),
CABLE_GOLD(EnumCableType.GOLD.getStack()),
CABLE_HV(EnumCableType.HV.getStack()),
CABLE_ICOPPER(EnumCableType.ICOPPER.getStack()),
CABLE_IGOLD(EnumCableType.IGOLD.getStack()),
CABLE_IHV(EnumCableType.IHV.getStack()),
CABLE_IIHV(EnumCableType.TIN.getStack()),
UPGRADE_OVERCLOCKER(ItemUpgrades.getUpgradeByName("overclock")),
UPGRADE_TRANSFORMER(ItemUpgrades.getUpgradeByName("transformer")),
UPGRADE_STORAGE(ItemUpgrades.getUpgradeByName("energy_storage")),

View file

@ -47,7 +47,7 @@ import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.itemblocks.*;
import techreborn.parts.powerCables.EnumCableType;
import techreborn.blocks.cable.EnumCableType;
import techreborn.tiles.*;
import techreborn.tiles.cable.TileCable;
import techreborn.tiles.fusionReactor.TileEntityFusionController;

View file

@ -33,8 +33,8 @@ import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.Core;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.cable.BlockCable;
import techreborn.items.*;
import techreborn.parts.powerCables.ItemStandaloneCables;
public class OreDict {
@ -71,7 +71,7 @@ public class OreDict {
OreDictionary.registerOre("industrialTnt", Blocks.TNT);
OreDictionary.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
OreDictionary.registerOre("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold"));
OreDictionary.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold"));
OreDictionary.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
OreDictionary.registerOre("ic2Generator", ModBlocks.SOLID_FUEL_GENEREATOR);

View file

@ -32,9 +32,9 @@ import reborncore.common.util.OreUtil;
import reborncore.common.util.StringUtils;
import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.cable.BlockCable;
import techreborn.init.IC2Duplicates;
import techreborn.items.*;
import techreborn.parts.powerCables.ItemStandaloneCables;
/**
* Created by Prospector
@ -58,7 +58,7 @@ public abstract class RecipeMethods {
} else if (type == Type.PART) {
return ItemParts.getPartByName(name, count);
} else if (type == Type.CABLE) {
return ItemStandaloneCables.getCableByName(name, count);
return BlockCable.getCableByName(name, count);
} else if (type == Type.MACHINE_FRAME) {
return BlockMachineFrame.getFrameByName(name, count);
} else if (type == Type.MACHINE_CASING) {