From ac7d12986394ae1e8521728928a9404b9a102af3 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Wed, 24 Apr 2019 13:23:21 +1000 Subject: $ Fucked with TC4 integration. Enabled lots of logging. --- .../xmod/thaumcraft/aspect/GTPP_AspectCompat.java | 12 ++++++++- .../objects/wrapper/aspect/TC_Aspect_Wrapper.java | 30 +++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/thaumcraft') diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java index 6cd5af02b6..6271f97d53 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java +++ b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java @@ -83,6 +83,8 @@ 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 h = TC_Aspect_Wrapper.getVanillaAspectList(); @@ -97,6 +99,8 @@ public class GTPP_AspectCompat { } } + Logger.INFO("[Thaumcraft++] Finished mapping Vanilla Aspects to data tables. Mapped "+mAspectCache.size()); + @@ -113,6 +117,7 @@ public class GTPP_AspectCompat { false, 1, "Ancient Knowledge"); + Logger.INFO("[Thaumcraft++] Added new Aspect: Sagrausten"); ASPECT_LUST = new TC_Aspect_Wrapper( @@ -126,6 +131,7 @@ public class GTPP_AspectCompat { false, 1, "Warped Thoughts"); + Logger.INFO("[Thaumcraft++] Added new Aspect: Slusium"); ASPECT_STARBOUND = new TC_Aspect_Wrapper( @@ -138,6 +144,7 @@ public class GTPP_AspectCompat { false, 1, "A beginning to something new"); + Logger.INFO("[Thaumcraft++] Added new Aspect: Xenil"); ASPECT_TOXIC = new TC_Aspect_Wrapper( @@ -151,6 +158,7 @@ public class GTPP_AspectCompat { false, 1, "Insanity"); + Logger.INFO("[Thaumcraft++] Added new Aspect: Xablum"); ASPECT_HEAVEN = new TC_Aspect_Wrapper( @@ -163,7 +171,8 @@ public class GTPP_AspectCompat { new ResourceLocation(CORE.MODID+":textures/aspects/" + "Zetralt.png"), false, 1, - "Control, Respect, Glory"); + "Control, Respect, Glory"); + Logger.INFO("[Thaumcraft++] Added new Aspect: Zetralt"); } @@ -172,6 +181,7 @@ 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 fda0fd27c5..72e2c99a96 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,6 +11,7 @@ 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; @@ -47,7 +48,7 @@ public class TC_Aspect_Wrapper { * Statically set the Class objects */ static { - mClass_Aspect = ReflectionUtils.getClass("thaumcraft.api.aspects.Aspect"); + Logger.INFO("[Thaumcraft++] Creating TC_Aspect_Wrapper data tables."); } /** @@ -57,16 +58,19 @@ public class TC_Aspect_Wrapper { public static LinkedHashMap 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) mField_Aspects.get(null); } catch (IllegalArgumentException | IllegalAccessException e) { - Logger.REFLECTION("Failed configuring TC Aspect compatibility."); + Logger.INFO("[Thaumcraft++] Failed configuring TC Aspect compatibility."); return new LinkedHashMap(); } } public static Object getVanillaAspectObject(String aAspectName) { + Logger.INFO("[Thaumcraft++] Looking for Aspect '"+aAspectName+"' in Vanilla Data Tables."); return getVanillaAspectList().get(aAspectName); } @@ -138,6 +142,16 @@ 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())) { @@ -168,6 +182,7 @@ public class TC_Aspect_Wrapper { } } } catch (IllegalArgumentException e1) { + Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [0]"); e1.printStackTrace(); } } @@ -191,21 +206,25 @@ 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), @@ -225,6 +244,7 @@ public class TC_Aspect_Wrapper { } } catch (Throwable t) { + Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [1]"); t.printStackTrace(); return null; } @@ -255,9 +275,11 @@ 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; } @@ -281,6 +303,7 @@ 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]; } @@ -315,6 +338,7 @@ public class TC_Aspect_Wrapper { } return myObject; } catch (Throwable t) { + Logger.INFO("[Thaumcraft++] Error generating Aspects for GT++ usage. [4]"); t.printStackTrace(); return null; } -- cgit From d348fbf96da494b8d2bb4002ea14bf9e722ddd09 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Wed, 24 Apr 2019 14:02:28 +1000 Subject: - Disabled TC4 custom aspects temporarily. --- src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/thaumcraft') diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java index 35e608b0ca..8cdfb2afb6 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java +++ b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java @@ -43,9 +43,9 @@ public class HANDLER_Thaumcraft { //sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor("gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat", 0, null, GT_Values.D1, new Object[0]); - sThaumcraftCompat = new GTPP_AspectCompat(); + //sThaumcraftCompat = new GTPP_AspectCompat(); - if (!sItemsToGetAspects.isEmpty() && false) { + /*if (!sItemsToGetAspects.isEmpty() && false) { for (Pair j : sItemsToGetAspects) { if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) { List list = Arrays.asList(j.getValue()); @@ -57,7 +57,7 @@ public class HANDLER_Thaumcraft { } } } - } + }*/ } } -- cgit From ea049ad62ba64a414fccfa5cbb875d72e7e94d00 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Wed, 24 Apr 2019 14:23:15 +1000 Subject: $ Reverted changes to TC classes. --- .../xmod/thaumcraft/aspect/GTPP_AspectCompat.java | 12 +-------- .../objects/wrapper/aspect/TC_Aspect_Wrapper.java | 30 +++------------------- 2 files changed, 4 insertions(+), 38 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/thaumcraft') 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 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 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) 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(); } } 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; } -- cgit