Skip to content

Commit 2b893d1

Browse files
committed
Remove use of Arch Platform
1 parent e4a532b commit 2b893d1

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
//Cobblemon
3131
implementation(kotlin("stdlib-jdk8"))
3232
modCompileOnly("com.cobblemon:mod:${project.properties["cobblemon_version"]}")
33-
modApi("net.impactdev.impactor.api:economy:5.1.0")
33+
modApi("net.impactdev.impactor.api:economy:5.1.1+1.20.1")
3434
}
3535

3636
publishing {

common/src/main/java/generations/gg/generations/core/generationscore/GenerationsCore.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
import com.cobblemon.mod.common.api.storage.player.PlayerDataExtensionRegistry;
1313
import com.mojang.logging.LogUtils;
1414
import dev.architectury.event.events.common.InteractionEvent;
15-
import dev.architectury.platform.Platform;
1615
import generations.gg.generations.core.generationscore.api.data.GenerationsCoreEntityDataSerializers;
1716
import generations.gg.generations.core.generationscore.api.player.AccountInfo;
1817
import generations.gg.generations.core.generationscore.api.player.BiomesVisited;
1918
import generations.gg.generations.core.generationscore.api.player.Caught;
20-
import generations.gg.generations.core.generationscore.compat.ImpactorCompat;
2119
import generations.gg.generations.core.generationscore.config.Config;
2220
import generations.gg.generations.core.generationscore.config.ConfigLoader;
2321
import generations.gg.generations.core.generationscore.world.container.GenerationsContainers;
@@ -107,8 +105,6 @@ public static void init(GenerationsImplementation implementation) {
107105
PlayerDataExtensionRegistry.INSTANCE.register(Caught.KEY, Caught.class, false);
108106
PlayerDataExtensionRegistry.INSTANCE.register(BiomesVisited.KEY, BiomesVisited.class, false);
109107

110-
if(Platform.isModLoaded("impactor")) ImpactorCompat.init();
111-
112108
GenerationsCobblemonEvents.init();
113109
InteractionEvent.INTERACT_ENTITY.register((player, entity, hand) -> {
114110
var stack = player.getItemInHand(hand);

fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/GenerationsCoreFabric.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import generations.gg.generations.core.generationscore.GenerationsCore;
44
import generations.gg.generations.core.generationscore.GenerationsImplementation;
5+
import generations.gg.generations.core.generationscore.compat.ImpactorCompat;
56
import generations.gg.generations.core.generationscore.compat.VanillaCompat;
67
import generations.gg.generations.core.generationscore.config.ConfigLoader;
78
import generations.gg.generations.core.generationscore.fabric.worldgen.GenerationsFabricBiomemodifiers;
@@ -41,6 +42,9 @@ public void onInitialize() {
4142
this.getNetworkManager().registerClientBound();
4243
this.getNetworkManager().registerServerBound();
4344

45+
if (FabricLoader.getInstance().isModLoaded("impactor"))
46+
ImpactorCompat.init();
47+
4448
ServerLifecycleEvents.SYNC_DATA_PACK_CONTENTS.register((player, isLogin) -> {
4549
if (isLogin)
4650
GenerationsCore.dataProvider.sync(player);

forge/src/main/java/generations/gg/generations/core/generationscore/forge/GenerationsCoreForge.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import dev.architectury.platform.forge.EventBuses;
55
import generations.gg.generations.core.generationscore.GenerationsCore;
66
import generations.gg.generations.core.generationscore.GenerationsImplementation;
7+
import generations.gg.generations.core.generationscore.compat.ImpactorCompat;
78
import generations.gg.generations.core.generationscore.compat.VanillaCompat;
89
import generations.gg.generations.core.generationscore.config.ConfigLoader;
910
import generations.gg.generations.core.generationscore.forge.client.GenerationsCoreClientForge;
@@ -75,6 +76,8 @@ public GenerationsCoreForge() {
7576

7677
GenerationsCore.initBuiltinPacks((packType, id, name) -> packs.computeIfAbsent(packType, a -> new ArrayList<>()).add(new Pair<>(id, name)));
7778
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::addPackFinders);
79+
if (ModList.get().isLoaded("impactor"))
80+
ImpactorCompat.init();
7881
}
7982

8083
public void addPackFinders(AddPackFindersEvent event) {

0 commit comments

Comments
 (0)