Skip to content

Commit 85740f8

Browse files
committed
Remove blast_search_trees
1 parent d46d245 commit 85740f8

File tree

12 files changed

+3
-531
lines changed

12 files changed

+3
-531
lines changed

common/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ architectury {
66
common(rootProject.enabled_platforms.split(","))
77
}
88

9-
ext.jei_minecraft_version = "1.20.2" /* temporary, till 1.20 releases */
10-
119
dependencies {
1210
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
1311
// Do NOT use other classes from fabric loader
@@ -20,18 +18,8 @@ dependencies {
2018
modApi("dev.latvian.mods:rhino:${rhino_version}") {
2119
transitive = false
2220
}
23-
modApi("me.shedaniel:RoughlyEnoughItems-api:${rei_version}") {
24-
transitive = false
25-
}
26-
modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}") {
27-
transitive = false
28-
}
2921

3022
modCompileOnly "curse.maven:spark-361579:${rootProject.spark_version}"
31-
// compile against the JEI API but do not include it at runtime
32-
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-common:${jei_version}")
33-
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-gui:${jei_version}")
34-
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-lib:${jei_version}")
3523
// Remove the next line if you don't want to depend on the API
3624
// modApi "me.shedaniel:architectury:${rootProject.architectury_version}"
3725
}

common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
1010
import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
1111
import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
12-
import org.embeddedt.modernfix.searchtree.JEIBackedSearchTree;
13-
import org.embeddedt.modernfix.searchtree.REIBackedSearchTree;
14-
import org.embeddedt.modernfix.searchtree.SearchTreeProviderRegistry;
1512
import org.embeddedt.modernfix.util.ClassInfoManager;
1613
import org.embeddedt.modernfix.world.IntegratedWatchdog;
1714

@@ -42,8 +39,6 @@ public ModernFixClient() {
4239
if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.branding.F3Screen")) {
4340
brandingString = ModernFix.NAME + " " + ModernFixPlatformHooks.INSTANCE.getVersionString();
4441
}
45-
SearchTreeProviderRegistry.register(JEIBackedSearchTree.PROVIDER);
46-
SearchTreeProviderRegistry.register(REIBackedSearchTree.PROVIDER);
4742
for(String className : ModernFixPlatformHooks.INSTANCE.getCustomModOptions().get(IntegrationConstants.CLIENT_INTEGRATION_CLASS)) {
4843
try {
4944
CLIENT_INTEGRATIONS.add((ModernFixClientIntegration)Class.forName(className).getDeclaredConstructor().newInstance());

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/SessionSearchTreesMixin.java

Lines changed: 0 additions & 94 deletions
This file was deleted.

common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
163163
.put("mixin.perf.dynamic_resources", false)
164164
.put("mixin.feature.direct_stack_trace", false)
165165
.put("mixin.feature.stalled_chunk_load_detection", false)
166-
.put("mixin.perf.blast_search_trees.force", false)
167166
.put("mixin.bugfix.restore_old_dragon_movement", false)
168167
.put("mixin.perf.worldgen_allocation", false) // experimental
169168
.put("mixin.feature.cause_lag_by_disabling_threads", false)

common/src/main/java/org/embeddedt/modernfix/searchtree/DummySearchTree.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java

Lines changed: 0 additions & 109 deletions
This file was deleted.

common/src/main/java/org/embeddedt/modernfix/searchtree/JEIRuntimeCapturer.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)