Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ dependencies {
modCompileOnly(forge.bundles.rei)
modCompileOnly(forge.emi)

// WAILA-likes
modCompileOnly(forge.theoneprobe)
// Jade (WAILA)
modCompileOnly(forge.jade)

// Curios
Expand Down
2 changes: 0 additions & 2 deletions gradle/forge.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ kubejs = "2001.6.5-build.16"
rhino = "2001.2.3-build.10"
architectury = "9.2.14"
clothconfig = "11.1.136"
theoneprobe = "1.20.1-10.0.1-3"
curios = "5.9.1+1.20.1"
kotlinforforge = "4.11.0"
shimmer = "1.20.1-0.2.4"
Expand Down Expand Up @@ -77,7 +76,6 @@ kubejs = { module = "dev.latvian.mods:kubejs-forge", version.ref =
rhino = { module = "dev.latvian.mods:rhino-forge", version.ref = "rhino" }
architectury = { module = "dev.architectury:architectury-forge", version.ref = "architectury" }
clothconfig = { module = "me.shedaniel.cloth:cloth-config-forge", version.ref = "clothconfig" }
theoneprobe = { module = "mcjty.theoneprobe:theoneprobe", version.ref = "theoneprobe" }
curios = { module = "top.theillusivec4.curios:curios-forge", version.ref = "curios" }
kotlinforforge = { module = "thedarkcolour:kotlinforforge", version.ref = "kotlinforforge" }
journeymap-api = { module = "info.journeymap:journeymap-api", version.ref = "journeyMapApi" }
Expand Down
4 changes: 0 additions & 4 deletions gradle/scripts/repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ repositories {
forRepository { maven { url = "https://maven.ftb.dev/releases" } }
filter { includeGroup("dev.ftb.mods") }
}
exclusiveContent { // TOP
forRepository { maven { url = "https://maven.k-4u.nl" } }
filter { includeGroup('mcjty.theoneprobe') }
}
exclusiveContent { // JourneyMap API
forRepository { maven { url = "https://jm.gserv.me/repository/maven-public/" } }
filter { includeGroup("info.journeymap") }
Expand Down
1 change: 0 additions & 1 deletion gradle/scripts/resources.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
ldlib_version : forge.versions.ldlib.get(),
jei_version : forge.versions.jei.get(),
emi_version : forge.versions.emi.get(),
top_version : forge.versions.theoneprobe.get(),
jade_version : forge.versions.jade.get(),
modernfix_version : forge.versions.modernfix.get(),
mod_license : mod_license,
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/gregtechceu/gtceu/api/GTValues.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ public static int[] tiersBetween(int minInclusive, int maxInclusive) {
.toArray();
}

public static final String MODID_TOP = "theoneprobe",
MODID_JEI = "jei",
public static final String MODID_JEI = "jei",
MODID_REI = "roughlyenoughitems",
MODID_EMI = "emi",
MODID_APPENG = "ae2",
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import com.gregtechceu.gtceu.integration.kjs.GTRegistryInfo;
import com.gregtechceu.gtceu.integration.kjs.events.MaterialModificationEventJS;
import com.gregtechceu.gtceu.integration.map.WaypointManager;
import com.gregtechceu.gtceu.integration.top.forge.TheOneProbePluginImpl;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

Expand All @@ -77,7 +76,6 @@
import net.minecraftforge.fml.ModLoader;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.javafmlmod.FMLModContainer;
import net.minecraftforge.registries.RegisterEvent;
Expand Down Expand Up @@ -298,16 +296,6 @@ public void commonSetup(FMLCommonSetupEvent event) {
});
}

@SubscribeEvent
public void loadComplete(FMLLoadCompleteEvent e) {
e.enqueueWork(() -> {
if (GTCEu.isModLoaded(GTValues.MODID_TOP)) {
GTCEu.LOGGER.info("TheOneProbe found. Enabling integration...");
TheOneProbePluginImpl.init();
}
});
}

@SubscribeEvent
public void registerCapabilities(RegisterCapabilitiesEvent event) {
GTCapability.register(event);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private static void initRecipeViewerLang(RegistrateLangProvider provider) {
provider.add("gtceu.rei.group.potion_fluids", "Potion Fluids");
}

/** Jade, TheOneProbe, WTHIT */
/** Jade */
private static void initWailaLikeLang(RegistrateLangProvider provider) {
provider.add("gtceu.top.working_disabled", "Working Disabled");
provider.add("gtceu.top.energy_consumption", "Using");
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading