From 292cda605f44c3e1c6813c91ceab7081a87a1040 Mon Sep 17 00:00:00 2001
From: RCXcrafter <rcxcrafter@gmail.com>
Date: Tue, 26 Jan 2021 21:19:15 +0100
Subject: [PATCH] fix trait conflicts for real this time

---
 .../materialis/traits/MaterialisTraits.java   | 22 +++++++++----------
 .../traits/armor/MaterialisArmorTraits.java   | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/rcx/materialis/traits/MaterialisTraits.java b/src/main/java/com/rcx/materialis/traits/MaterialisTraits.java
index a1d13fb2..f2d3d7df 100644
--- a/src/main/java/com/rcx/materialis/traits/MaterialisTraits.java
+++ b/src/main/java/com/rcx/materialis/traits/MaterialisTraits.java
@@ -21,27 +21,27 @@ public class MaterialisTraits {
 	public static ITrait unlimited = fallback;
 
 	public static void preInit() {
-		if (TinkerRegistry.getTrait(TraitBlinding.id) == null)
+		if (TinkerRegistry.getModifier(TraitBlinding.id) == null)
 			blinding = new TraitBlinding();
-		if (TinkerRegistry.getTrait(TraitBloodthirst.id) == null)
+		if (TinkerRegistry.getModifier(TraitBloodthirst.id) == null)
 			bloodthirst = new TraitBloodthirst();
-		if (TinkerRegistry.getTrait(TraitCrystalline.id) == null)
+		if (TinkerRegistry.getModifier(TraitCrystalline.id) == null)
 			crystalline = new TraitCrystalline();
-		if (TinkerRegistry.getTrait("fancy") == null)
+		if (TinkerRegistry.getModifier("fancy") == null)
 			fancy = new TraitNoEffect("fancy", 0xFFE30B);
-		if (TinkerRegistry.getTrait(TraitIntangible.id) == null)
+		if (TinkerRegistry.getModifier(TraitIntangible.id) == null)
 			intangible = new TraitIntangible();
-		if (TinkerRegistry.getTrait(TraitLimited.id) == null)
+		if (TinkerRegistry.getModifier(TraitLimited.id) == null)
 			limited = new TraitLimited();
-		if (TinkerRegistry.getTrait(TraitPhasing.id) == null)
+		if (TinkerRegistry.getModifier(TraitPhasing.id) == null)
 			phasing = new TraitPhasing();
-		if (TinkerRegistry.getTrait(TraitShortFuse.id) == null)
+		if (TinkerRegistry.getModifier(TraitShortFuse.id) == null)
 			shortFuse = new TraitShortFuse();
-		if (TinkerRegistry.getTrait(TraitSupermassive.id) == null)
+		if (TinkerRegistry.getModifier(TraitSupermassive.id) == null)
 			supermassive = new TraitSupermassive();
-		if (TinkerRegistry.getTrait(TraitUnbreakable.id) == null)
+		if (TinkerRegistry.getModifier(TraitUnbreakable.id) == null)
 			unbreakable = new TraitUnbreakable();
-		if (TinkerRegistry.getTrait("unlimited") == null)
+		if (TinkerRegistry.getModifier("unlimited") == null)
 			unlimited = new TraitNoEffect("unlimited", 0x64A7B5);
 	}
 }
diff --git a/src/main/java/com/rcx/materialis/traits/armor/MaterialisArmorTraits.java b/src/main/java/com/rcx/materialis/traits/armor/MaterialisArmorTraits.java
index 5beb0d26..50c0107c 100644
--- a/src/main/java/com/rcx/materialis/traits/armor/MaterialisArmorTraits.java
+++ b/src/main/java/com/rcx/materialis/traits/armor/MaterialisArmorTraits.java
@@ -29,27 +29,27 @@ public class MaterialisArmorTraits {
 	public static IArmorTrait untamed = fallback;
 
 	public static void preInit() {
-		if (TinkerRegistry.getTrait(TraitBlinding.id) == null)
+		if (TinkerRegistry.getModifier(TraitBlinding.id) == null)
 			blinding = new TraitArmorBlinding();
-		if (TinkerRegistry.getTrait(TraitArmorCosmic.id) == null)
+		if (TinkerRegistry.getModifier(TraitArmorCosmic.id) == null)
 			cosmic = new TraitArmorCosmic();
-		if (TinkerRegistry.getTrait(TraitCrystalline.id) == null)
+		if (TinkerRegistry.getModifier(TraitCrystalline.id) == null)
 			crystalline = new TraitArmorCrystalline();
-		if (TinkerRegistry.getTrait(TraitArmorFireproof.id) == null)
+		if (TinkerRegistry.getModifier(TraitArmorFireproof.id) == null)
 			fireproof = new TraitArmorFireproof();
-		if (TinkerRegistry.getTrait(TraitIntangible.id) == null)
+		if (TinkerRegistry.getModifier(TraitIntangible.id) == null)
 			intangible = new TraitArmorIntangible();
-		if (TinkerRegistry.getTrait(TraitLimited.id) == null)
+		if (TinkerRegistry.getModifier(TraitLimited.id) == null)
 			limited = new TraitArmorLimited();
-		if (TinkerRegistry.getTrait(TraitArmorRenewableEnergy.id) == null)
+		if (TinkerRegistry.getModifier(TraitArmorRenewableEnergy.id) == null)
 			renewableEnergy = new TraitArmorRenewableEnergy();
-		if (TinkerRegistry.getTrait(TraitShortFuse.id) == null)
+		if (TinkerRegistry.getModifier(TraitShortFuse.id) == null)
 			shortFuse = new TraitArmorShortFuse();
-		if (TinkerRegistry.getTrait(TraitSupermassive.id) == null)
+		if (TinkerRegistry.getModifier(TraitSupermassive.id) == null)
 			supermassive = new TraitArmorSupermassive();
-		if (TinkerRegistry.getTrait(TraitUnbreakable.id) == null)
+		if (TinkerRegistry.getModifier(TraitUnbreakable.id) == null)
 			unbreakable = new TraitArmorUnbreakable();
-		if (TinkerRegistry.getTrait(TraitArmorUntamed.id) == null)
+		if (TinkerRegistry.getModifier(TraitArmorUntamed.id) == null)
 			untamed = new TraitArmorUntamed();
 	}
 }