Skip to content
This repository was archived by the owner on Sep 26, 2025. It is now read-only.

Commit 3c37456

Browse files
committed
bug fix when IU is not installed
1 parent ffbe808 commit 3c37456

File tree

2 files changed

+27
-18
lines changed

2 files changed

+27
-18
lines changed

src/main/java/xyz/phanta/tconevo/integration/IntegrationManager.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
import net.minecraftforge.fml.common.FMLCommonHandler;
66
import net.minecraftforge.fml.common.Loader;
77
import net.minecraftforge.fml.common.discovery.ASMDataTable;
8-
import net.minecraftforge.fml.common.discovery.ModCandidate;
98
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
109
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
1110
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
1211
import net.minecraftforge.fml.relauncher.Side;
1312
import xyz.phanta.tconevo.TconEvoConfig;
1413
import xyz.phanta.tconevo.TconEvoMod;
15-
import xyz.phanta.tconevo.integration.iu.IUHooks;
1614
import xyz.phanta.tconevo.integration.iu.IUHooksImpl;
1715
import xyz.phanta.tconevo.util.ReflectionHackUtils;
1816

@@ -28,15 +26,17 @@ public static void injectHooks(ASMDataTable annotTable) {
2826

2927
//FIXME
3028
try {
31-
ASMDataTable.ASMData an = null;
32-
for (ASMDataTable.ASMData annotation : annotTable.getAll(IntegrationHooks.Inject.class.getName())) {
33-
an = annotation;
34-
break;
29+
if (Loader.isModLoaded(IUHooksImpl.MOD_ID)) {
30+
ASMDataTable.ASMData an = null;
31+
for (ASMDataTable.ASMData annotation : annotTable.getAll(IntegrationHooks.Inject.class.getName())) {
32+
an = annotation;
33+
break;
34+
}
35+
Map<String, Object> annotationInfo = new HashMap<>();
36+
annotationInfo.put("value", (Object) IUHooksImpl.MOD_ID);
37+
annotTable.addASMData(an.getCandidate(), "xyz.phanta.tconevo.integration.IntegrationHooks$Inject", "xyz.phanta.tconevo.integration.iu.IUHooks", "INSTANCE", annotationInfo);
3538
}
36-
Map<String, Object> annotationInfo = new HashMap<>();
37-
annotationInfo.put("value", (Object) IUHooksImpl.MOD_ID);
38-
annotTable.addASMData(an.getCandidate(), "xyz.phanta.tconevo.integration.IntegrationHooks$Inject", "xyz.phanta.tconevo.integration.iu.IUHooks", "INSTANCE", annotationInfo);
39-
} catch (NullPointerException e) {TconEvoMod.LOGGER.info("annotation nullable: ", e);}
39+
} catch (NullPointerException e) {TconEvoMod.LOGGER.error("annotation nullable: ", e);}
4040

4141
for (ASMDataTable.ASMData annot : annotTable.getAll(IntegrationHooks.Inject.class.getName())) {
4242
String modId = (String)annot.getAnnotationInfo().get("value");

src/main/java/xyz/phanta/tconevo/integration/conarm/TconEvoArmourMaterials.java

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package xyz.phanta.tconevo.integration.conarm;
22

33
import c4.conarm.common.armor.traits.ArmorTraits;
4+
import net.minecraftforge.fml.common.Loader;
45
import xyz.phanta.tconevo.init.TconEvoMaterials;
56
import xyz.phanta.tconevo.init.TconEvoTraits;
67
import xyz.phanta.tconevo.integration.conarm.material.ArmourMaterialBuilder;
78
import xyz.phanta.tconevo.integration.conarm.material.ArmourPartType;
9+
import xyz.phanta.tconevo.integration.ic2.Ic2HooksImpl;
10+
import xyz.phanta.tconevo.integration.iu.IUHooksImpl;
811

912
public class TconEvoArmourMaterials {
1013

@@ -234,10 +237,13 @@ public static void init() {
234237
.withStatsArmour(24F, 22F, 1F, 10.5F, 2F, 14F)
235238
.withTraits(ArmourPartType.ARMOUR, ArmorTraits.dense, ArmorTraits.indomitable)
236239
.build();
237-
new ArmourMaterialBuilder(TconEvoMaterials.ENERGIUM)
238-
.withStatsArmour(16F, 20F, 0.8F, 7F, 0F, 9.5F)
239-
.withTraits(ArmourPartType.ARMOUR, TconEvoArmourTraits.TRAIT_ELECTRIC)
240-
.build();
240+
//FIXME
241+
if (Loader.isModLoaded(IUHooksImpl.MOD_ID) || Loader.isModLoaded(Ic2HooksImpl.MOD_ID)) {
242+
new ArmourMaterialBuilder(TconEvoMaterials.ENERGIUM)
243+
.withStatsArmour(16F, 20F, 0.8F, 7F, 0F, 9.5F)
244+
.withTraits(ArmourPartType.ARMOUR, TconEvoArmourTraits.TRAIT_ELECTRIC)
245+
.build();
246+
}
241247
new ArmourMaterialBuilder(TconEvoMaterials.CARBON_FIBER)
242248
.withStatsArmour(28F, 16F, 1.3F, 7F, 5F, 10F)
243249
.withTraits(ArmourPartType.ARMOUR, TconEvoArmourTraits.TRAIT_BULWARK, ArmorTraits.lightweight)
@@ -246,10 +252,13 @@ public static void init() {
246252
.withStatsArmour(36F, 24F, 0.8F, 13.5F, 3F, 16F)
247253
.withTraits(ArmourPartType.ARMOUR, ArmorTraits.steady, TconEvoArmourTraits.TRAIT_REACTIVE)
248254
.build();
249-
new ArmourMaterialBuilder(TconEvoMaterials.UU_METAL)
250-
.withStatsArmour(1F, 18F, 2F, 0F, 0F, 15F)
251-
.withTraits(ArmourPartType.ARMOUR, TconEvoArmourTraits.TRAIT_PHOENIX_ASPECT)
252-
.build();
255+
//FIXME
256+
if (Loader.isModLoaded(IUHooksImpl.MOD_ID) || Loader.isModLoaded(Ic2HooksImpl.MOD_ID)) {
257+
new ArmourMaterialBuilder(TconEvoMaterials.UU_METAL)
258+
.withStatsArmour(1F, 18F, 2F, 0F, 0F, 15F)
259+
.withTraits(ArmourPartType.ARMOUR, TconEvoArmourTraits.TRAIT_PHOENIX_ASPECT)
260+
.build();
261+
}
253262

254263
// mekanism
255264
new ArmourMaterialBuilder(TconEvoMaterials.OSMIUM)

0 commit comments

Comments
 (0)