add metal tools, weapons, armor
This commit is contained in:
parent
ae53a807b5
commit
a5bdf39f19
GPG key ID:
3AC50A6F47D1B722
7 changed files with 396 additions and 58 deletions
|
|
@ -29,7 +29,7 @@ public class BlockMetalBlock extends Block {
|
|||
}
|
||||
|
||||
public boolean isMagnetic() {
|
||||
return this.metal.isMagnetic();
|
||||
return this.metal.material.isMagnetic();
|
||||
}
|
||||
|
||||
public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ public class BlockMetalOre extends BlockOre {
|
|||
}
|
||||
|
||||
public boolean isMagnetic() {
|
||||
return this.metal.isMagnetic();
|
||||
return this.metal.material.isMagnetic();
|
||||
}
|
||||
|
||||
public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip)
|
||||
|
|
|
|||
|
|
@ -44,10 +44,8 @@ public abstract class CraftingRegistry
|
|||
}
|
||||
for(MetalType metal : MetalType.values()) {
|
||||
Item item = ItemRegistry.byName(metal.isPowder ? (metal.name + "_powder") : (metal.name + "_ingot"));
|
||||
if(metal.material != null) {
|
||||
metal.material.addRepairItem(item);
|
||||
registerTools(metal.material, item, metal.name);
|
||||
}
|
||||
Item block = ItemRegistry.byName(metal.name + "_block");
|
||||
add(new ItemStack(block), "###", "###", "###", '#', item);
|
||||
add(new ItemStack(item, 9), "#", '#', block);
|
||||
|
|
|
|||
|
|
@ -319,7 +319,6 @@ public abstract class ItemRegistry {
|
|||
register(metal.name + "_ingot", itm);
|
||||
((BlockOre)BlockRegistry.byName(metal.name + "_ore")).setSmeltItem(new ItemStack(itm));
|
||||
}
|
||||
if(metal.material != null)
|
||||
registerTools(metal.material, metal.name, metal.display);
|
||||
}
|
||||
for(ToolType tool : ToolType.values()) {
|
||||
|
|
|
|||
|
|
@ -1352,6 +1352,356 @@ public abstract class Items {
|
|||
public static final ItemAnimalArmor wood_horse_armor = get("wood_horse_armor");
|
||||
public static final ItemArmor wood_leggings = get("wood_leggings");
|
||||
public static final ItemTool wood_shears = get("wood_shears");
|
||||
public static final ItemTool aluminium_axe = get("aluminium_axe");
|
||||
public static final ItemArmor aluminium_boots = get("aluminium_boots");
|
||||
public static final ItemArmor aluminium_chestplate = get("aluminium_chestplate");
|
||||
public static final ItemArmor aluminium_helmet = get("aluminium_helmet");
|
||||
public static final ItemAnimalArmor aluminium_horse_armor = get("aluminium_horse_armor");
|
||||
public static final ItemArmor aluminium_leggings = get("aluminium_leggings");
|
||||
public static final ItemTool aluminium_pickaxe = get("aluminium_pickaxe");
|
||||
public static final ItemTool aluminium_shears = get("aluminium_shears");
|
||||
public static final ItemTool aluminium_shovel = get("aluminium_shovel");
|
||||
public static final ItemTool aluminium_sword = get("aluminium_sword");
|
||||
public static final ItemTool antimony_axe = get("antimony_axe");
|
||||
public static final ItemArmor antimony_boots = get("antimony_boots");
|
||||
public static final ItemArmor antimony_chestplate = get("antimony_chestplate");
|
||||
public static final ItemArmor antimony_helmet = get("antimony_helmet");
|
||||
public static final ItemAnimalArmor antimony_horse_armor = get("antimony_horse_armor");
|
||||
public static final ItemArmor antimony_leggings = get("antimony_leggings");
|
||||
public static final ItemTool antimony_pickaxe = get("antimony_pickaxe");
|
||||
public static final ItemTool antimony_shears = get("antimony_shears");
|
||||
public static final ItemTool antimony_shovel = get("antimony_shovel");
|
||||
public static final ItemTool antimony_sword = get("antimony_sword");
|
||||
public static final ItemTool arsenic_axe = get("arsenic_axe");
|
||||
public static final ItemArmor arsenic_boots = get("arsenic_boots");
|
||||
public static final ItemArmor arsenic_chestplate = get("arsenic_chestplate");
|
||||
public static final ItemArmor arsenic_helmet = get("arsenic_helmet");
|
||||
public static final ItemAnimalArmor arsenic_horse_armor = get("arsenic_horse_armor");
|
||||
public static final ItemArmor arsenic_leggings = get("arsenic_leggings");
|
||||
public static final ItemTool arsenic_pickaxe = get("arsenic_pickaxe");
|
||||
public static final ItemTool arsenic_shears = get("arsenic_shears");
|
||||
public static final ItemTool arsenic_shovel = get("arsenic_shovel");
|
||||
public static final ItemTool arsenic_sword = get("arsenic_sword");
|
||||
public static final ItemTool bismuth_axe = get("bismuth_axe");
|
||||
public static final ItemArmor bismuth_boots = get("bismuth_boots");
|
||||
public static final ItemArmor bismuth_chestplate = get("bismuth_chestplate");
|
||||
public static final ItemArmor bismuth_helmet = get("bismuth_helmet");
|
||||
public static final ItemAnimalArmor bismuth_horse_armor = get("bismuth_horse_armor");
|
||||
public static final ItemArmor bismuth_leggings = get("bismuth_leggings");
|
||||
public static final ItemTool bismuth_pickaxe = get("bismuth_pickaxe");
|
||||
public static final ItemTool bismuth_shears = get("bismuth_shears");
|
||||
public static final ItemTool bismuth_shovel = get("bismuth_shovel");
|
||||
public static final ItemTool bismuth_sword = get("bismuth_sword");
|
||||
public static final ItemTool black_metal_axe = get("black_metal_axe");
|
||||
public static final ItemArmor black_metal_boots = get("black_metal_boots");
|
||||
public static final ItemArmor black_metal_chestplate = get("black_metal_chestplate");
|
||||
public static final ItemArmor black_metal_helmet = get("black_metal_helmet");
|
||||
public static final ItemAnimalArmor black_metal_horse_armor = get("black_metal_horse_armor");
|
||||
public static final ItemArmor black_metal_leggings = get("black_metal_leggings");
|
||||
public static final ItemTool black_metal_pickaxe = get("black_metal_pickaxe");
|
||||
public static final ItemTool black_metal_shears = get("black_metal_shears");
|
||||
public static final ItemTool black_metal_shovel = get("black_metal_shovel");
|
||||
public static final ItemTool black_metal_sword = get("black_metal_sword");
|
||||
public static final ItemTool calcium_axe = get("calcium_axe");
|
||||
public static final ItemArmor calcium_boots = get("calcium_boots");
|
||||
public static final ItemArmor calcium_chestplate = get("calcium_chestplate");
|
||||
public static final ItemArmor calcium_helmet = get("calcium_helmet");
|
||||
public static final ItemAnimalArmor calcium_horse_armor = get("calcium_horse_armor");
|
||||
public static final ItemArmor calcium_leggings = get("calcium_leggings");
|
||||
public static final ItemTool calcium_pickaxe = get("calcium_pickaxe");
|
||||
public static final ItemTool calcium_shears = get("calcium_shears");
|
||||
public static final ItemTool calcium_shovel = get("calcium_shovel");
|
||||
public static final ItemTool calcium_sword = get("calcium_sword");
|
||||
public static final ItemTool chrome_axe = get("chrome_axe");
|
||||
public static final ItemArmor chrome_boots = get("chrome_boots");
|
||||
public static final ItemArmor chrome_chestplate = get("chrome_chestplate");
|
||||
public static final ItemArmor chrome_helmet = get("chrome_helmet");
|
||||
public static final ItemAnimalArmor chrome_horse_armor = get("chrome_horse_armor");
|
||||
public static final ItemArmor chrome_leggings = get("chrome_leggings");
|
||||
public static final ItemTool chrome_pickaxe = get("chrome_pickaxe");
|
||||
public static final ItemTool chrome_shears = get("chrome_shears");
|
||||
public static final ItemTool chrome_shovel = get("chrome_shovel");
|
||||
public static final ItemTool chrome_sword = get("chrome_sword");
|
||||
public static final ItemTool cobalt_axe = get("cobalt_axe");
|
||||
public static final ItemArmor cobalt_boots = get("cobalt_boots");
|
||||
public static final ItemArmor cobalt_chestplate = get("cobalt_chestplate");
|
||||
public static final ItemArmor cobalt_helmet = get("cobalt_helmet");
|
||||
public static final ItemAnimalArmor cobalt_horse_armor = get("cobalt_horse_armor");
|
||||
public static final ItemArmor cobalt_leggings = get("cobalt_leggings");
|
||||
public static final ItemTool cobalt_pickaxe = get("cobalt_pickaxe");
|
||||
public static final ItemTool cobalt_shears = get("cobalt_shears");
|
||||
public static final ItemTool cobalt_shovel = get("cobalt_shovel");
|
||||
public static final ItemTool cobalt_sword = get("cobalt_sword");
|
||||
public static final ItemTool copper_axe = get("copper_axe");
|
||||
public static final ItemArmor copper_boots = get("copper_boots");
|
||||
public static final ItemArmor copper_chestplate = get("copper_chestplate");
|
||||
public static final ItemArmor copper_helmet = get("copper_helmet");
|
||||
public static final ItemAnimalArmor copper_horse_armor = get("copper_horse_armor");
|
||||
public static final ItemArmor copper_leggings = get("copper_leggings");
|
||||
public static final ItemTool copper_pickaxe = get("copper_pickaxe");
|
||||
public static final ItemTool copper_shears = get("copper_shears");
|
||||
public static final ItemTool copper_shovel = get("copper_shovel");
|
||||
public static final ItemTool copper_sword = get("copper_sword");
|
||||
public static final ItemTool iodine_axe = get("iodine_axe");
|
||||
public static final ItemArmor iodine_boots = get("iodine_boots");
|
||||
public static final ItemArmor iodine_chestplate = get("iodine_chestplate");
|
||||
public static final ItemArmor iodine_helmet = get("iodine_helmet");
|
||||
public static final ItemAnimalArmor iodine_horse_armor = get("iodine_horse_armor");
|
||||
public static final ItemArmor iodine_leggings = get("iodine_leggings");
|
||||
public static final ItemTool iodine_pickaxe = get("iodine_pickaxe");
|
||||
public static final ItemTool iodine_shears = get("iodine_shears");
|
||||
public static final ItemTool iodine_shovel = get("iodine_shovel");
|
||||
public static final ItemTool iodine_sword = get("iodine_sword");
|
||||
public static final ItemTool lead_axe = get("lead_axe");
|
||||
public static final ItemArmor lead_boots = get("lead_boots");
|
||||
public static final ItemArmor lead_chestplate = get("lead_chestplate");
|
||||
public static final ItemArmor lead_helmet = get("lead_helmet");
|
||||
public static final ItemAnimalArmor lead_horse_armor = get("lead_horse_armor");
|
||||
public static final ItemArmor lead_leggings = get("lead_leggings");
|
||||
public static final ItemTool lead_pickaxe = get("lead_pickaxe");
|
||||
public static final ItemTool lead_shears = get("lead_shears");
|
||||
public static final ItemTool lead_shovel = get("lead_shovel");
|
||||
public static final ItemTool lead_sword = get("lead_sword");
|
||||
public static final ItemTool lithium_axe = get("lithium_axe");
|
||||
public static final ItemArmor lithium_boots = get("lithium_boots");
|
||||
public static final ItemArmor lithium_chestplate = get("lithium_chestplate");
|
||||
public static final ItemArmor lithium_helmet = get("lithium_helmet");
|
||||
public static final ItemAnimalArmor lithium_horse_armor = get("lithium_horse_armor");
|
||||
public static final ItemArmor lithium_leggings = get("lithium_leggings");
|
||||
public static final ItemTool lithium_pickaxe = get("lithium_pickaxe");
|
||||
public static final ItemTool lithium_shears = get("lithium_shears");
|
||||
public static final ItemTool lithium_shovel = get("lithium_shovel");
|
||||
public static final ItemTool lithium_sword = get("lithium_sword");
|
||||
public static final ItemTool magnesium_axe = get("magnesium_axe");
|
||||
public static final ItemArmor magnesium_boots = get("magnesium_boots");
|
||||
public static final ItemArmor magnesium_chestplate = get("magnesium_chestplate");
|
||||
public static final ItemArmor magnesium_helmet = get("magnesium_helmet");
|
||||
public static final ItemAnimalArmor magnesium_horse_armor = get("magnesium_horse_armor");
|
||||
public static final ItemArmor magnesium_leggings = get("magnesium_leggings");
|
||||
public static final ItemTool magnesium_pickaxe = get("magnesium_pickaxe");
|
||||
public static final ItemTool magnesium_shears = get("magnesium_shears");
|
||||
public static final ItemTool magnesium_shovel = get("magnesium_shovel");
|
||||
public static final ItemTool magnesium_sword = get("magnesium_sword");
|
||||
public static final ItemTool manganese_axe = get("manganese_axe");
|
||||
public static final ItemArmor manganese_boots = get("manganese_boots");
|
||||
public static final ItemArmor manganese_chestplate = get("manganese_chestplate");
|
||||
public static final ItemArmor manganese_helmet = get("manganese_helmet");
|
||||
public static final ItemAnimalArmor manganese_horse_armor = get("manganese_horse_armor");
|
||||
public static final ItemArmor manganese_leggings = get("manganese_leggings");
|
||||
public static final ItemTool manganese_pickaxe = get("manganese_pickaxe");
|
||||
public static final ItemTool manganese_shears = get("manganese_shears");
|
||||
public static final ItemTool manganese_shovel = get("manganese_shovel");
|
||||
public static final ItemTool manganese_sword = get("manganese_sword");
|
||||
public static final ItemTool neodymium_axe = get("neodymium_axe");
|
||||
public static final ItemArmor neodymium_boots = get("neodymium_boots");
|
||||
public static final ItemArmor neodymium_chestplate = get("neodymium_chestplate");
|
||||
public static final ItemArmor neodymium_helmet = get("neodymium_helmet");
|
||||
public static final ItemAnimalArmor neodymium_horse_armor = get("neodymium_horse_armor");
|
||||
public static final ItemArmor neodymium_leggings = get("neodymium_leggings");
|
||||
public static final ItemTool neodymium_pickaxe = get("neodymium_pickaxe");
|
||||
public static final ItemTool neodymium_shears = get("neodymium_shears");
|
||||
public static final ItemTool neodymium_shovel = get("neodymium_shovel");
|
||||
public static final ItemTool neodymium_sword = get("neodymium_sword");
|
||||
public static final ItemTool neptunium_axe = get("neptunium_axe");
|
||||
public static final ItemArmor neptunium_boots = get("neptunium_boots");
|
||||
public static final ItemArmor neptunium_chestplate = get("neptunium_chestplate");
|
||||
public static final ItemArmor neptunium_helmet = get("neptunium_helmet");
|
||||
public static final ItemAnimalArmor neptunium_horse_armor = get("neptunium_horse_armor");
|
||||
public static final ItemArmor neptunium_leggings = get("neptunium_leggings");
|
||||
public static final ItemTool neptunium_pickaxe = get("neptunium_pickaxe");
|
||||
public static final ItemTool neptunium_shears = get("neptunium_shears");
|
||||
public static final ItemTool neptunium_shovel = get("neptunium_shovel");
|
||||
public static final ItemTool neptunium_sword = get("neptunium_sword");
|
||||
public static final ItemTool nickel_axe = get("nickel_axe");
|
||||
public static final ItemArmor nickel_boots = get("nickel_boots");
|
||||
public static final ItemArmor nickel_chestplate = get("nickel_chestplate");
|
||||
public static final ItemArmor nickel_helmet = get("nickel_helmet");
|
||||
public static final ItemAnimalArmor nickel_horse_armor = get("nickel_horse_armor");
|
||||
public static final ItemArmor nickel_leggings = get("nickel_leggings");
|
||||
public static final ItemTool nickel_pickaxe = get("nickel_pickaxe");
|
||||
public static final ItemTool nickel_shears = get("nickel_shears");
|
||||
public static final ItemTool nickel_shovel = get("nickel_shovel");
|
||||
public static final ItemTool nickel_sword = get("nickel_sword");
|
||||
public static final ItemTool palladium_axe = get("palladium_axe");
|
||||
public static final ItemArmor palladium_boots = get("palladium_boots");
|
||||
public static final ItemArmor palladium_chestplate = get("palladium_chestplate");
|
||||
public static final ItemArmor palladium_helmet = get("palladium_helmet");
|
||||
public static final ItemAnimalArmor palladium_horse_armor = get("palladium_horse_armor");
|
||||
public static final ItemArmor palladium_leggings = get("palladium_leggings");
|
||||
public static final ItemTool palladium_pickaxe = get("palladium_pickaxe");
|
||||
public static final ItemTool palladium_shears = get("palladium_shears");
|
||||
public static final ItemTool palladium_shovel = get("palladium_shovel");
|
||||
public static final ItemTool palladium_sword = get("palladium_sword");
|
||||
public static final ItemTool phosphor_axe = get("phosphor_axe");
|
||||
public static final ItemArmor phosphor_boots = get("phosphor_boots");
|
||||
public static final ItemArmor phosphor_chestplate = get("phosphor_chestplate");
|
||||
public static final ItemArmor phosphor_helmet = get("phosphor_helmet");
|
||||
public static final ItemAnimalArmor phosphor_horse_armor = get("phosphor_horse_armor");
|
||||
public static final ItemArmor phosphor_leggings = get("phosphor_leggings");
|
||||
public static final ItemTool phosphor_pickaxe = get("phosphor_pickaxe");
|
||||
public static final ItemTool phosphor_shears = get("phosphor_shears");
|
||||
public static final ItemTool phosphor_shovel = get("phosphor_shovel");
|
||||
public static final ItemTool phosphor_sword = get("phosphor_sword");
|
||||
public static final ItemTool platinum_axe = get("platinum_axe");
|
||||
public static final ItemArmor platinum_boots = get("platinum_boots");
|
||||
public static final ItemArmor platinum_chestplate = get("platinum_chestplate");
|
||||
public static final ItemArmor platinum_helmet = get("platinum_helmet");
|
||||
public static final ItemAnimalArmor platinum_horse_armor = get("platinum_horse_armor");
|
||||
public static final ItemArmor platinum_leggings = get("platinum_leggings");
|
||||
public static final ItemTool platinum_pickaxe = get("platinum_pickaxe");
|
||||
public static final ItemTool platinum_shears = get("platinum_shears");
|
||||
public static final ItemTool platinum_shovel = get("platinum_shovel");
|
||||
public static final ItemTool platinum_sword = get("platinum_sword");
|
||||
public static final ItemTool plutonium_axe = get("plutonium_axe");
|
||||
public static final ItemArmor plutonium_boots = get("plutonium_boots");
|
||||
public static final ItemArmor plutonium_chestplate = get("plutonium_chestplate");
|
||||
public static final ItemArmor plutonium_helmet = get("plutonium_helmet");
|
||||
public static final ItemAnimalArmor plutonium_horse_armor = get("plutonium_horse_armor");
|
||||
public static final ItemArmor plutonium_leggings = get("plutonium_leggings");
|
||||
public static final ItemTool plutonium_pickaxe = get("plutonium_pickaxe");
|
||||
public static final ItemTool plutonium_shears = get("plutonium_shears");
|
||||
public static final ItemTool plutonium_shovel = get("plutonium_shovel");
|
||||
public static final ItemTool plutonium_sword = get("plutonium_sword");
|
||||
public static final ItemTool potassium_axe = get("potassium_axe");
|
||||
public static final ItemArmor potassium_boots = get("potassium_boots");
|
||||
public static final ItemArmor potassium_chestplate = get("potassium_chestplate");
|
||||
public static final ItemArmor potassium_helmet = get("potassium_helmet");
|
||||
public static final ItemAnimalArmor potassium_horse_armor = get("potassium_horse_armor");
|
||||
public static final ItemArmor potassium_leggings = get("potassium_leggings");
|
||||
public static final ItemTool potassium_pickaxe = get("potassium_pickaxe");
|
||||
public static final ItemTool potassium_shears = get("potassium_shears");
|
||||
public static final ItemTool potassium_shovel = get("potassium_shovel");
|
||||
public static final ItemTool potassium_sword = get("potassium_sword");
|
||||
public static final ItemTool praseodymium_axe = get("praseodymium_axe");
|
||||
public static final ItemArmor praseodymium_boots = get("praseodymium_boots");
|
||||
public static final ItemArmor praseodymium_chestplate = get("praseodymium_chestplate");
|
||||
public static final ItemArmor praseodymium_helmet = get("praseodymium_helmet");
|
||||
public static final ItemAnimalArmor praseodymium_horse_armor = get("praseodymium_horse_armor");
|
||||
public static final ItemArmor praseodymium_leggings = get("praseodymium_leggings");
|
||||
public static final ItemTool praseodymium_pickaxe = get("praseodymium_pickaxe");
|
||||
public static final ItemTool praseodymium_shears = get("praseodymium_shears");
|
||||
public static final ItemTool praseodymium_shovel = get("praseodymium_shovel");
|
||||
public static final ItemTool praseodymium_sword = get("praseodymium_sword");
|
||||
public static final ItemTool radium_axe = get("radium_axe");
|
||||
public static final ItemArmor radium_boots = get("radium_boots");
|
||||
public static final ItemArmor radium_chestplate = get("radium_chestplate");
|
||||
public static final ItemArmor radium_helmet = get("radium_helmet");
|
||||
public static final ItemAnimalArmor radium_horse_armor = get("radium_horse_armor");
|
||||
public static final ItemArmor radium_leggings = get("radium_leggings");
|
||||
public static final ItemTool radium_pickaxe = get("radium_pickaxe");
|
||||
public static final ItemTool radium_shears = get("radium_shears");
|
||||
public static final ItemTool radium_shovel = get("radium_shovel");
|
||||
public static final ItemTool radium_sword = get("radium_sword");
|
||||
public static final ItemTool selenium_axe = get("selenium_axe");
|
||||
public static final ItemArmor selenium_boots = get("selenium_boots");
|
||||
public static final ItemArmor selenium_chestplate = get("selenium_chestplate");
|
||||
public static final ItemArmor selenium_helmet = get("selenium_helmet");
|
||||
public static final ItemAnimalArmor selenium_horse_armor = get("selenium_horse_armor");
|
||||
public static final ItemArmor selenium_leggings = get("selenium_leggings");
|
||||
public static final ItemTool selenium_pickaxe = get("selenium_pickaxe");
|
||||
public static final ItemTool selenium_shears = get("selenium_shears");
|
||||
public static final ItemTool selenium_shovel = get("selenium_shovel");
|
||||
public static final ItemTool selenium_sword = get("selenium_sword");
|
||||
public static final ItemTool silicon_axe = get("silicon_axe");
|
||||
public static final ItemArmor silicon_boots = get("silicon_boots");
|
||||
public static final ItemArmor silicon_chestplate = get("silicon_chestplate");
|
||||
public static final ItemArmor silicon_helmet = get("silicon_helmet");
|
||||
public static final ItemAnimalArmor silicon_horse_armor = get("silicon_horse_armor");
|
||||
public static final ItemArmor silicon_leggings = get("silicon_leggings");
|
||||
public static final ItemTool silicon_pickaxe = get("silicon_pickaxe");
|
||||
public static final ItemTool silicon_shears = get("silicon_shears");
|
||||
public static final ItemTool silicon_shovel = get("silicon_shovel");
|
||||
public static final ItemTool silicon_sword = get("silicon_sword");
|
||||
public static final ItemTool silver_axe = get("silver_axe");
|
||||
public static final ItemArmor silver_boots = get("silver_boots");
|
||||
public static final ItemArmor silver_chestplate = get("silver_chestplate");
|
||||
public static final ItemArmor silver_helmet = get("silver_helmet");
|
||||
public static final ItemAnimalArmor silver_horse_armor = get("silver_horse_armor");
|
||||
public static final ItemArmor silver_leggings = get("silver_leggings");
|
||||
public static final ItemTool silver_pickaxe = get("silver_pickaxe");
|
||||
public static final ItemTool silver_shears = get("silver_shears");
|
||||
public static final ItemTool silver_shovel = get("silver_shovel");
|
||||
public static final ItemTool silver_sword = get("silver_sword");
|
||||
public static final ItemTool sodium_axe = get("sodium_axe");
|
||||
public static final ItemArmor sodium_boots = get("sodium_boots");
|
||||
public static final ItemArmor sodium_chestplate = get("sodium_chestplate");
|
||||
public static final ItemArmor sodium_helmet = get("sodium_helmet");
|
||||
public static final ItemAnimalArmor sodium_horse_armor = get("sodium_horse_armor");
|
||||
public static final ItemArmor sodium_leggings = get("sodium_leggings");
|
||||
public static final ItemTool sodium_pickaxe = get("sodium_pickaxe");
|
||||
public static final ItemTool sodium_shears = get("sodium_shears");
|
||||
public static final ItemTool sodium_shovel = get("sodium_shovel");
|
||||
public static final ItemTool sodium_sword = get("sodium_sword");
|
||||
public static final ItemTool sulfur_axe = get("sulfur_axe");
|
||||
public static final ItemArmor sulfur_boots = get("sulfur_boots");
|
||||
public static final ItemArmor sulfur_chestplate = get("sulfur_chestplate");
|
||||
public static final ItemArmor sulfur_helmet = get("sulfur_helmet");
|
||||
public static final ItemAnimalArmor sulfur_horse_armor = get("sulfur_horse_armor");
|
||||
public static final ItemArmor sulfur_leggings = get("sulfur_leggings");
|
||||
public static final ItemTool sulfur_pickaxe = get("sulfur_pickaxe");
|
||||
public static final ItemTool sulfur_shears = get("sulfur_shears");
|
||||
public static final ItemTool sulfur_shovel = get("sulfur_shovel");
|
||||
public static final ItemTool sulfur_sword = get("sulfur_sword");
|
||||
public static final ItemTool tin_axe = get("tin_axe");
|
||||
public static final ItemArmor tin_boots = get("tin_boots");
|
||||
public static final ItemArmor tin_chestplate = get("tin_chestplate");
|
||||
public static final ItemArmor tin_helmet = get("tin_helmet");
|
||||
public static final ItemAnimalArmor tin_horse_armor = get("tin_horse_armor");
|
||||
public static final ItemArmor tin_leggings = get("tin_leggings");
|
||||
public static final ItemTool tin_pickaxe = get("tin_pickaxe");
|
||||
public static final ItemTool tin_shears = get("tin_shears");
|
||||
public static final ItemTool tin_shovel = get("tin_shovel");
|
||||
public static final ItemTool tin_sword = get("tin_sword");
|
||||
public static final ItemTool titanium_axe = get("titanium_axe");
|
||||
public static final ItemArmor titanium_boots = get("titanium_boots");
|
||||
public static final ItemArmor titanium_chestplate = get("titanium_chestplate");
|
||||
public static final ItemArmor titanium_helmet = get("titanium_helmet");
|
||||
public static final ItemAnimalArmor titanium_horse_armor = get("titanium_horse_armor");
|
||||
public static final ItemArmor titanium_leggings = get("titanium_leggings");
|
||||
public static final ItemTool titanium_pickaxe = get("titanium_pickaxe");
|
||||
public static final ItemTool titanium_shears = get("titanium_shears");
|
||||
public static final ItemTool titanium_shovel = get("titanium_shovel");
|
||||
public static final ItemTool titanium_sword = get("titanium_sword");
|
||||
public static final ItemTool tungsten_axe = get("tungsten_axe");
|
||||
public static final ItemArmor tungsten_boots = get("tungsten_boots");
|
||||
public static final ItemArmor tungsten_chestplate = get("tungsten_chestplate");
|
||||
public static final ItemArmor tungsten_helmet = get("tungsten_helmet");
|
||||
public static final ItemAnimalArmor tungsten_horse_armor = get("tungsten_horse_armor");
|
||||
public static final ItemArmor tungsten_leggings = get("tungsten_leggings");
|
||||
public static final ItemTool tungsten_pickaxe = get("tungsten_pickaxe");
|
||||
public static final ItemTool tungsten_shears = get("tungsten_shears");
|
||||
public static final ItemTool tungsten_shovel = get("tungsten_shovel");
|
||||
public static final ItemTool tungsten_sword = get("tungsten_sword");
|
||||
public static final ItemTool uranium_axe = get("uranium_axe");
|
||||
public static final ItemArmor uranium_boots = get("uranium_boots");
|
||||
public static final ItemArmor uranium_chestplate = get("uranium_chestplate");
|
||||
public static final ItemArmor uranium_helmet = get("uranium_helmet");
|
||||
public static final ItemAnimalArmor uranium_horse_armor = get("uranium_horse_armor");
|
||||
public static final ItemArmor uranium_leggings = get("uranium_leggings");
|
||||
public static final ItemTool uranium_pickaxe = get("uranium_pickaxe");
|
||||
public static final ItemTool uranium_shears = get("uranium_shears");
|
||||
public static final ItemTool uranium_shovel = get("uranium_shovel");
|
||||
public static final ItemTool uranium_sword = get("uranium_sword");
|
||||
public static final ItemTool vanadium_axe = get("vanadium_axe");
|
||||
public static final ItemArmor vanadium_boots = get("vanadium_boots");
|
||||
public static final ItemArmor vanadium_chestplate = get("vanadium_chestplate");
|
||||
public static final ItemArmor vanadium_helmet = get("vanadium_helmet");
|
||||
public static final ItemAnimalArmor vanadium_horse_armor = get("vanadium_horse_armor");
|
||||
public static final ItemArmor vanadium_leggings = get("vanadium_leggings");
|
||||
public static final ItemTool vanadium_pickaxe = get("vanadium_pickaxe");
|
||||
public static final ItemTool vanadium_shears = get("vanadium_shears");
|
||||
public static final ItemTool vanadium_shovel = get("vanadium_shovel");
|
||||
public static final ItemTool vanadium_sword = get("vanadium_sword");
|
||||
public static final ItemTool zinc_axe = get("zinc_axe");
|
||||
public static final ItemArmor zinc_boots = get("zinc_boots");
|
||||
public static final ItemArmor zinc_chestplate = get("zinc_chestplate");
|
||||
public static final ItemArmor zinc_helmet = get("zinc_helmet");
|
||||
public static final ItemAnimalArmor zinc_horse_armor = get("zinc_horse_armor");
|
||||
public static final ItemArmor zinc_leggings = get("zinc_leggings");
|
||||
public static final ItemTool zinc_pickaxe = get("zinc_pickaxe");
|
||||
public static final ItemTool zinc_shears = get("zinc_shears");
|
||||
public static final ItemTool zinc_shovel = get("zinc_shovel");
|
||||
public static final ItemTool zinc_sword = get("zinc_sword");
|
||||
|
||||
private static <T extends Item> T get(String id) {
|
||||
T item = (T)ItemRegistry.byName(id);
|
||||
|
|
|
|||
|
|
@ -4,49 +4,49 @@ import common.util.Color;
|
|||
|
||||
public enum MetalType {
|
||||
IRON("iron", 26, "Fe", "Eisen", 0, new ToolMaterial(2, 8.0f, 0.0f, 250, 6, 2, 14, 15, 9, 2, 6, 5, 2).setMagnetic()),
|
||||
COPPER("copper", 29, "Cu", "Kupfer", 0),
|
||||
TIN("tin", 50, "Sn", "Zinn", 0),
|
||||
COPPER("copper", 29, "Cu", "Kupfer", 0, new ToolMaterial(2, 8.0f, 0.0f, 190, 6, 2, 14, 12, 9, 2, 6, 5, 2)),
|
||||
TIN("tin", 50, "Sn", "Zinn", 0, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
|
||||
ALUMINIUM("aluminium", 13, "Al", "Aluminium", 1),
|
||||
LEAD("lead", 82, "Pb", "Blei", 1),
|
||||
ALUMINIUM("aluminium", 13, "Al", "Aluminium", 1, new ToolMaterial(2, 8.0f, 0.0f, 220, 5, 1, 14, 14, 9, 1, 4, 2, 1)),
|
||||
LEAD("lead", 82, "Pb", "Blei", 1, new ToolMaterial(2, 20.0f, 0.0f, 250, 6, 2, 14, 15, 9, 2, 6, 5, 2)),
|
||||
|
||||
POTASSIUM("potassium", 19, "K", "Kalium", true, 2),
|
||||
CALCIUM("calcium", 20, "Ca", "Calcium", true, 2),
|
||||
NICKEL("nickel", 28, "Ni", "Nickel", 2),
|
||||
ZINC("zinc", 30, "Zn", "Zink", 2),
|
||||
POTASSIUM("potassium", 19, "K", "Kalium", true, 2, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
CALCIUM("calcium", 20, "Ca", "Calcium", true, 2, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
NICKEL("nickel", 28, "Ni", "Nickel", 2, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2).setMagnetic()),
|
||||
ZINC("zinc", 30, "Zn", "Zink", 2, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
|
||||
LITHIUM("lithium", 3, "Li", "Lithium", 3),
|
||||
SODIUM("sodium", 11, "Na", "Natrium", true, 3),
|
||||
PHOSPHOR("phosphor", 15, "P", "Phosphor", true, 3),
|
||||
SULFUR("sulfur", 16, "S", "Schwefel", true, 3),
|
||||
ARSENIC("arsenic", 33, "As", "Arsen", true, 3),
|
||||
SELENIUM("selenium", 34, "Se", "Selen", true, 3),
|
||||
IODINE("iodine", 53, "I", "Iod", true, 3),
|
||||
TUNGSTEN("tungsten", 74, "W", "Wolfram", 3),
|
||||
LITHIUM("lithium", 3, "Li", "Lithium", 3, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
SODIUM("sodium", 11, "Na", "Natrium", true, 3, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
PHOSPHOR("phosphor", 15, "P", "Phosphor", true, 3, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
SULFUR("sulfur", 16, "S", "Schwefel", true, 3, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
ARSENIC("arsenic", 33, "As", "Arsen", true, 3, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
SELENIUM("selenium", 34, "Se", "Selen", true, 3, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
IODINE("iodine", 53, "I", "Iod", true, 3, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
TUNGSTEN("tungsten", 74, "W", "Wolfram", 3, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
|
||||
MAGNESIUM("magnesium", 12, "Mg", "Magnesium", true, 4),
|
||||
SILICON("silicon", 14, "Si", "Silizium", 4),
|
||||
TITANIUM("titanium", 22, "Ti", "Titan", 4),
|
||||
VANADIUM("vanadium", 23, "V", "Vanadium", 4),
|
||||
CHROME("chrome", 24, "Cr", "Chrom", 4),
|
||||
PLATINUM("platinum", 78, "Pt", "Platin", 4),
|
||||
MAGNESIUM("magnesium", 12, "Mg", "Magnesium", true, 4, new ToolMaterial(0, 0.0f, 0.0f, 10, 2, 1, 2, 2, 2, 1, 1, 1, 1)),
|
||||
SILICON("silicon", 14, "Si", "Silizium", 4, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
TITANIUM("titanium", 22, "Ti", "Titan", 4, new ToolMaterial(2, 10.0f, 0.0f, 540, 6, 2, 14, 44, 9, 2, 6, 5, 2)),
|
||||
VANADIUM("vanadium", 23, "V", "Vanadium", 4, new ToolMaterial(2, 10.0f, 0.0f, 320, 6, 2, 14, 20, 9, 2, 6, 5, 2)),
|
||||
CHROME("chrome", 24, "Cr", "Chrom", 4, new ToolMaterial(2, 10.0f, 0.0f, 320, 6, 2, 14, 20, 9, 2, 6, 5, 2)),
|
||||
PLATINUM("platinum", 78, "Pt", "Platin", 4, new ToolMaterial(2, 10.0f, 0.0f, 320, 6, 2, 14, 20, 9, 2, 6, 5, 2)),
|
||||
GOLD("gold", 79, "Au", "Gold", 4, new ToolMaterial(0, 15.0f, 1.0f, 32, 12, 0, 22, 7, 25, 2, 5, 3, 1)),
|
||||
|
||||
MANGANESE("manganese", 25, "Mn", "Mangan", 5),
|
||||
COBALT("cobalt", 27, "Co", "Cobalt", 5),
|
||||
PALLADIUM("palladium", 46, "Pd", "Palladium", 5),
|
||||
SILVER("silver", 47, "Ag", "Silber", 5),
|
||||
ANTIMONY("antimony", 51, "Sb", "Antimon", true, 5),
|
||||
PRASEODYMIUM("praseodymium", 59, "Pr", "Praseodym", 5),
|
||||
NEODYMIUM("neodymium", 60, "Nd", "Neodym", 5),
|
||||
BISMUTH("bismuth", 83, "Bi", "Bismut", 5),
|
||||
MANGANESE("manganese", 25, "Mn", "Mangan", 5, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
COBALT("cobalt", 27, "Co", "Cobalt", 5, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2).setMagnetic()),
|
||||
PALLADIUM("palladium", 46, "Pd", "Palladium", 5, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
SILVER("silver", 47, "Ag", "Silber", 5, new ToolMaterial(2, 10.0f, 0.0f, 320, 6, 2, 14, 20, 9, 2, 6, 5, 2)),
|
||||
ANTIMONY("antimony", 51, "Sb", "Antimon", true, 5, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
PRASEODYMIUM("praseodymium", 59, "Pr", "Praseodym", 5, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
NEODYMIUM("neodymium", 60, "Nd", "Neodym", 5, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
BISMUTH("bismuth", 83, "Bi", "Bismut", 5, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
|
||||
RADIUM("radium", 88, "Ra", "Radium", 6, 0.6f),
|
||||
URANIUM("uranium", 92, "U", "Uran", 7, 1.0f),
|
||||
NEPTUNIUM("neptunium", 93, "Np", "Neptunium", 8, 2.0f),
|
||||
PLUTONIUM("plutonium", 94, "Pu", "Plutonium", 9, 4.0f),
|
||||
RADIUM("radium", 88, "Ra", "Radium", 6, 0.6f, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
URANIUM("uranium", 92, "U", "Uran", 7, 1.0f, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
NEPTUNIUM("neptunium", 93, "Np", "Neptunium", 8, 2.0f, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
PLUTONIUM("plutonium", 94, "Pu", "Plutonium", 9, 4.0f, new ToolMaterial(2, 8.0f, 0.0f, 80, 6, 2, 14, 5, 9, 2, 6, 5, 2)),
|
||||
|
||||
BLACK("black_metal", 666, "Bm", "Schwarzmetall", 5);
|
||||
BLACK("black_metal", 666, "Bm", "Schwarzmetall", 5, new ToolMaterial(2, 38.0f, 120.0f, 1280, 6, 2, 14, 15, 9, 2, 6, 5, 2));
|
||||
|
||||
|
||||
public final int order;
|
||||
|
|
@ -58,8 +58,7 @@ public enum MetalType {
|
|||
public final float radioactivity;
|
||||
public final ToolMaterial material;
|
||||
|
||||
private MetalType(String name, int order, String sign, String display, boolean isPowder, int rarity, float radioactivity,
|
||||
ToolMaterial material) {
|
||||
private MetalType(String name, int order, String sign, String display, boolean isPowder, int rarity, float radioactivity, ToolMaterial material) {
|
||||
this.order = order;
|
||||
this.sign = sign;
|
||||
this.name = name;
|
||||
|
|
@ -70,16 +69,12 @@ public enum MetalType {
|
|||
this.material = material;
|
||||
}
|
||||
|
||||
private MetalType(String name, int order, String sign, String display, boolean isPowder, int rarity) {
|
||||
this(name, order, sign, display, isPowder, rarity, 0.0f, null);
|
||||
private MetalType(String name, int order, String sign, String display, boolean isPowder, int rarity, ToolMaterial material) {
|
||||
this(name, order, sign, display, isPowder, rarity, 0.0f, material);
|
||||
}
|
||||
|
||||
private MetalType(String name, int order, String sign, String display, int rarity, float radioactivity) {
|
||||
this(name, order, sign, display, false, rarity, radioactivity, null);
|
||||
}
|
||||
|
||||
private MetalType(String name, int order, String sign, String display, int rarity) {
|
||||
this(name, order, sign, display, false, rarity, 0.0f, null);
|
||||
private MetalType(String name, int order, String sign, String display, int rarity, float radioactivity, ToolMaterial material) {
|
||||
this(name, order, sign, display, false, rarity, radioactivity, material);
|
||||
}
|
||||
|
||||
private MetalType(String name, int order, String sign, String display, int rarity, ToolMaterial material) {
|
||||
|
|
@ -97,8 +92,4 @@ public enum MetalType {
|
|||
public String formatRadioactivity() {
|
||||
return Color.RED + "Radioaktivität: " + Color.GREEN + String.format("%.1f RN", this.radioactivity * 100.0f);
|
||||
}
|
||||
|
||||
public boolean isMagnetic() {
|
||||
return this == IRON || this == NICKEL || this == COBALT;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ public class ItemMetal extends Item {
|
|||
this.setColor(Color.GREEN);
|
||||
this.setExplosive(1);
|
||||
}
|
||||
if(this.metal.isMagnetic())
|
||||
if(this.metal.material.isMagnetic())
|
||||
this.setMagnetic();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue