aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java12
-rw-r--r--src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java30
2 files changed, 4 insertions, 38 deletions
diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
index 6271f97d53..6cd5af02b6 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
@@ -83,8 +83,6 @@ public class GTPP_AspectCompat {
public GTPP_AspectCompat() {
- Logger.INFO("[Thaumcraft++] Initialising custom Thaumcraft 4 Aspects.");
- Logger.INFO("[Thaumcraft++] Mapping Vanilla Aspects to data tables.");
// Generate all existing Aspects as TC_Aspects
LinkedHashMap<String, Object> h = TC_Aspect_Wrapper.getVanillaAspectList();
@@ -99,8 +97,6 @@ public class GTPP_AspectCompat {
}
}
- Logger.INFO("[Thaumcraft++] Finished mapping Vanilla Aspects to data tables. Mapped "+mAspectCache.size());
-
@@ -117,7 +113,6 @@ public class GTPP_AspectCompat {
false,
1,
"Ancient Knowledge");
- Logger.INFO("[Thaumcraft++] Added new Aspect: Sagrausten");
ASPECT_LUST =
new TC_Aspect_Wrapper(
@@ -131,7 +126,6 @@ public class GTPP_AspectCompat {
false,
1,
"Warped Thoughts");
- Logger.INFO("[Thaumcraft++] Added new Aspect: Slusium");
ASPECT_STARBOUND =
new TC_Aspect_Wrapper(
@@ -144,7 +138,6 @@ public class GTPP_AspectCompat {
false,
1,
"A beginning to something new");
- Logger.INFO("[Thaumcraft++] Added new Aspect: Xenil");
ASPECT_TOXIC =
new TC_Aspect_Wrapper(
@@ -158,7 +151,6 @@ public class GTPP_AspectCompat {
false,
1,
"Insanity");
- Logger.INFO("[Thaumcraft++] Added new Aspect: Xablum");
ASPECT_HEAVEN =
new TC_Aspect_Wrapper(
@@ -171,8 +163,7 @@ public class GTPP_AspectCompat {
new ResourceLocation(CORE.MODID+":textures/aspects/" + "Zetralt.png"),
false,
1,
- "Control, Respect, Glory");
- Logger.INFO("[Thaumcraft++] Added new Aspect: Zetralt");
+ "Control, Respect, Glory");
}
@@ -181,7 +172,6 @@ public class GTPP_AspectCompat {
try {
return TC_Aspect_Wrapper.generate(aGtObjects.mAspect);
} catch (IllegalArgumentException e) {
- Logger.INFO("[Thaumcraft++] Error getting Aspects for GT++ usage. [1]");
e.printStackTrace();
return null;
}
diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
index 72e2c99a96..fda0fd27c5 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
@@ -11,7 +11,6 @@ import gregtech.api.enums.TC_Aspects;
import gregtech.api.util.GT_LanguageManager;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
import net.minecraft.util.ResourceLocation;
@@ -48,7 +47,7 @@ public class TC_Aspect_Wrapper {
* Statically set the Class objects
*/
static {
- Logger.INFO("[Thaumcraft++] Creating TC_Aspect_Wrapper data tables.");
+ mClass_Aspect = ReflectionUtils.getClass("thaumcraft.api.aspects.Aspect");
}
/**
@@ -58,19 +57,16 @@ public class TC_Aspect_Wrapper {
public static LinkedHashMap<String, Object> getVanillaAspectList() {
try {
if (mField_Aspects == null) {
- Logger.INFO("[Thaumcraft++] Getting Aspect list Reflectively.");
mField_Aspects = ReflectionUtils.getField(mClass_Aspect, "aspects");
}
- Logger.INFO("[Thaumcraft++] Obtained Vanilla Aspects as a HashMap");
return (LinkedHashMap<String, Object>) mField_Aspects.get(null);
} catch (IllegalArgumentException | IllegalAccessException e) {
- Logger.INFO("[Thaumcraft++] Failed configuring TC Aspect compatibility.");
+ Logger.REFLECTION("Failed configuring TC Aspect compatibility.");
return new LinkedHashMap<String, Object>();
}
}
public static Object getVanillaAspectObject(String aAspectName) {
- Logger.INFO("[Thaumcraft++] Looking for Aspect '"+aAspectName+"' in Vanilla Data Tables.");
return getVanillaAspectList().get(aAspectName);
}
@@ -142,16 +138,6 @@ public class TC_Aspect_Wrapper {
if (components == null) {
components = new TC_Aspect_Wrapper[] {};
}
-
- //Set Reflective Class data here instead of in static{}
- if (LoadedMods.Thaumcraft) {
- if (mClass_Aspect == null) {
- Logger.INFO("[Thaumcraft++] Getting Aspect base class reflectively.");
- mClass_Aspect = ReflectionUtils.getClass("thaumcraft.api.aspects.Aspect");
- }
- }
-
-
//String aTag = vanilla ? tag.toLowerCase() : "custom"+(aInternalAspectIDAllocation++);
String aTag = tag.toLowerCase();
if (getAspectList().containsKey(tag.toLowerCase())) {
@@ -182,7 +168,6 @@ public class TC_Aspect_Wrapper {
}
}
} catch (IllegalArgumentException e1) {
- Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [0]");
e1.printStackTrace();
}
}
@@ -206,25 +191,21 @@ public class TC_Aspect_Wrapper {
* @throws IllegalArgumentException
* @throws IllegalAccessException
*/
+ @SuppressWarnings("unused")
public static TC_Aspect_Wrapper generate(Object aBaseAspect) {
try {
- Logger.INFO("[Thaumcraft++] Trying to generate Aspect.");
Field aTagF = ReflectionUtils.getField(mClass_Aspect, "tag");
if (aTagF == null) {
- Logger.INFO("[Thaumcraft++] Failed - Invalid Getter for Aspect [1].");
return null;
}
String aTafB = (String) aTagF.get(aBaseAspect);
if (aTafB == null) {
- Logger.INFO("[Thaumcraft++] Failed - Invalid Getting for Aspect [2].");
return null;
}
String aTag = aTafB.toLowerCase();
if (aTag != null && getAspectList().containsKey(aTag.toLowerCase())) {
- Logger.INFO("[Thaumcraft++] Found existing Aspect, reusing. Aspect: "+aTag);
return getAspect(aTag);
} else {
- Logger.INFO("[Thaumcraft++] Generating our own, as it does not yet exist. Aspect: "+aTag);
TC_Aspect_Wrapper aTemp = new TC_Aspect_Wrapper(
aTag,
(int) ReflectionUtils.getField(mClass_Aspect, "color").get(aBaseAspect),
@@ -244,7 +225,6 @@ public class TC_Aspect_Wrapper {
}
}
catch (Throwable t) {
- Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [1]");
t.printStackTrace();
return null;
}
@@ -275,11 +255,9 @@ public class TC_Aspect_Wrapper {
return aTemp;
}
} catch (IllegalArgumentException e) {
- Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [2.1]");
e.printStackTrace();
}
}
- Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [2.2]");
return null;
}
@@ -303,7 +281,6 @@ public class TC_Aspect_Wrapper {
}
}
} catch (IllegalArgumentException | IllegalAccessException e) {
- Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [3]");
e.printStackTrace();
aAspectArray = new TC_Aspect_Wrapper[0];
}
@@ -338,7 +315,6 @@ public class TC_Aspect_Wrapper {
}
return myObject;
} catch (Throwable t) {
- Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [4]");
t.printStackTrace();
return null;
}
generated by cgit (git 2.46.0) at 2025-03-10 16:24:34 +0000