summaryrefslogtreecommitdiff
path: root/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
diff options
context:
space:
mode:
authorRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-12-22 14:54:05 +0100
committerRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-12-22 14:54:05 +0100
commit36c425e1432caff8eee5933e7ea46422b13ba709 (patch)
tree058dfaacd1f423a037c543937a80f312691dcfcf /src/main/java/com/sosnitzka/taiga/MaterialTraits.java
parentc0a5d562789828f5ea37f37961d78204863140af (diff)
Fixed a Trait where no enchantment effect has been shown after restart. Added beserk trait.
Diffstat (limited to 'src/main/java/com/sosnitzka/taiga/MaterialTraits.java')
-rw-r--r--src/main/java/com/sosnitzka/taiga/MaterialTraits.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
index 4eb5ef0..4fd2be9 100644
--- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
+++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
@@ -52,7 +52,9 @@ public class MaterialTraits {
public static final AbstractTrait decay = new TraitDecay();
public static final AbstractTrait whirl = new TraitWhirl();
public static final AbstractTrait superheavy = new TraitSuperHeavy();
- //public static final AbstractTrait dev = new TraitDevelopement();
+ public static final AbstractTrait dev = new TraitDevelopement();
+ public static final AbstractTrait carousel = new TraitCarousel();
+ public static final AbstractTrait beserk = new TraitBeserk();
/**
@@ -86,7 +88,7 @@ public class MaterialTraits {
/**
* With Dev
**/
- public static Material adamant = new Material("adamant", TextFormatting.GOLD); //.addTrait(dev);
+ public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk); //.addTrait(dev);
public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum);
public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay);
public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes.HANDLE).addTrait(glimmer, MaterialTypes.HEAD);