diff options
| author | Lance5057 <Lance5057@gmail.com> | 2017-11-26 18:42:10 -0600 |
|---|---|---|
| committer | Lance5057 <Lance5057@gmail.com> | 2017-11-26 18:42:10 -0600 |
| commit | ca59d88e0effef351498c6df46d5a24cafadc2df (patch) | |
| tree | 5317d7e4305d7dd1ad3727f1b343115ff2e6e2d0 /src/main/java | |
| parent | f2f2eedda86142a5c9b090f164c9a64d92e1ea66 (diff) | |
Fixed the tool station gui crash.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/lance5057/tDefense/core/materials/TDMaterials.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java index 34edd07..3455803 100644 --- a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java +++ b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java @@ -197,11 +197,11 @@ public class TDMaterials { public static TDOreDictItem grain; public static TDOreDictItem gem; - public static final AbstractTrait axelover = new TraitAxeLover(); - public static final AbstractTrait dulling = new TraitDulling(); - public static final AbstractTrait firestarter = new TraitFirestarter(); - public static final AbstractTrait barbed = new TraitBarbed(); - public static final AbstractTrait dogtoy = new TraitDogToy(); +// public static final AbstractTrait axelover = new TraitAxeLover(); +// public static final AbstractTrait dulling = new TraitDulling(); +// public static final AbstractTrait firestarter = new TraitFirestarter(); +// public static final AbstractTrait barbed = new TraitBarbed(); + //public static final AbstractTrait dogtoy = new TraitDogToy(); static ArrayList<Item> itemList = new ArrayList<Item>(); static ArrayList<Block> blockList = new ArrayList<Block>(); @@ -285,21 +285,21 @@ public class TDMaterials { // TinkerRegistry.addMaterialStats(Material.UNKNOWN, // new ShieldMaterialStats(35, 33)); TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ShieldMaterialStats(35, 33)); - TinkerMaterials.wood.addTrait(axelover, SHIELD); + //TinkerMaterials.wood.addTrait(axelover, SHIELD); TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new ShieldMaterialStats(120, 33)); // TinkerRegistry.addMaterialTrait(TinkerMaterials.stone, dulling, // SHIELD); - TinkerMaterials.stone.addTrait(dulling, SHIELD); + //TinkerMaterials.stone.addTrait(dulling, SHIELD); TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new ShieldMaterialStats(150, 33)); - TinkerRegistry.addMaterialTrait(TinkerMaterials.flint, firestarter, SHIELD); + //TinkerRegistry.addMaterialTrait(TinkerMaterials.flint, firestarter, SHIELD); TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new ShieldMaterialStats(210, 33)); - TinkerRegistry.addMaterialTrait(TinkerMaterials.cactus, barbed, SHIELD); + //TinkerRegistry.addMaterialTrait(TinkerMaterials.cactus, barbed, SHIELD); TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new ShieldMaterialStats(200, 33)); - TinkerRegistry.addMaterialTrait(TinkerMaterials.bone, dogtoy, SHIELD); + //TinkerRegistry.addMaterialTrait(TinkerMaterials.bone, dogtoy, SHIELD); TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new ShieldMaterialStats(139, 33)); TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new ShieldMaterialStats(430, 33)); |