Skip to content

Commit ad1e12a

Browse files
committed
Remove unfinished/obsolete registry & block optimizations
These patches were unfinished, are known to be buggy, and won't make sense in modern versions of Minecraft, where many of the underlying issues have been addressed in other ways
1 parent 12d69be commit ad1e12a

File tree

12 files changed

+0
-1278
lines changed

12 files changed

+0
-1278
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/DirectObjectMixin.java

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
package org.embeddedt.modernfix.common.mixin.perf.compact_mojang_registries;
22

3-
import com.google.common.collect.BiMap;
4-
import com.google.common.collect.ImmutableSet;
53
import com.mojang.serialization.Lifecycle;
64
import net.minecraft.core.MappedRegistry;
75
import net.minecraft.core.Registry;
86
import net.minecraft.resources.ResourceKey;
9-
import net.minecraft.resources.ResourceLocation;
107
import org.embeddedt.modernfix.annotation.IgnoreOutsideDev;
11-
import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
12-
import org.embeddedt.modernfix.registry.DirectStorageRegistryObject;
138
import org.embeddedt.modernfix.registry.LifecycleMap;
14-
import org.embeddedt.modernfix.registry.RegistryStorage;
159
import org.spongepowered.asm.mixin.Final;
1610
import org.spongepowered.asm.mixin.Mixin;
1711
import org.spongepowered.asm.mixin.Mutable;
@@ -29,12 +23,6 @@ public abstract class MappedRegistryMixin<T> extends Registry<T> {
2923
@Final
3024
@Mutable
3125
private Map<T, Lifecycle> lifecycles;
32-
@Shadow @Final @Mutable
33-
private BiMap<ResourceLocation, T> storage;
34-
@Shadow @Final @Mutable
35-
private BiMap<ResourceKey<T>, T> keyStorage;
36-
37-
private static final ImmutableSet<ResourceLocation> MFIX$NEW_STORAGE_KEYS = ImmutableSet.of(new ResourceLocation("block"), new ResourceLocation("item"));
3826

3927
protected MappedRegistryMixin(ResourceKey<? extends Registry<T>> resourceKey, Lifecycle lifecycle) {
4028
super(resourceKey, lifecycle);
@@ -43,10 +31,5 @@ protected MappedRegistryMixin(ResourceKey<? extends Registry<T>> resourceKey, Li
4331
@Inject(method = "<init>", at = @At("RETURN"))
4432
private void replaceStorage(CallbackInfo ci) {
4533
this.lifecycles = new LifecycleMap<>();
46-
if(MFIX$NEW_STORAGE_KEYS.contains(this.key().location())) {
47-
ModernFixMixinPlugin.instance.logger.info("Using experimental registry storage for {}", this.key());
48-
this.storage = (BiMap<ResourceLocation, T>) RegistryStorage.createStorage();
49-
this.keyStorage = (BiMap<ResourceKey<T>, T>)RegistryStorage.createKeyStorage(this.key(), (BiMap<ResourceLocation, DirectStorageRegistryObject>)this.storage);
50-
}
5134
}
5235
}

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_block_codecs/StateDefinitionMixin.java

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

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_block_codecs/StateHolderMixin.java

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

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,7 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
168168
.put("mixin.perf.dynamic_resources", false)
169169
.putConditionally(() -> !isFabric, "mixin.perf.async_jei", false)
170170
.put("mixin.perf.reuse_datapacks", false)
171-
.put("mixin.perf.dynamic_block_codecs", false)
172171
.put("mixin.feature.direct_stack_trace", false)
173-
.putConditionally(ModernFixPlatformHooks.INSTANCE::isDevEnv, "mixin.perf.rewrite_registry", false)
174172
.put("mixin.perf.clear_mixin_classinfo", false)
175173
.put("mixin.bugfix.packet_leak", false)
176174
.put("mixin.perf.deduplicate_location", false)

common/src/main/java/org/embeddedt/modernfix/registry/DirectStorageBiMap.java

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

common/src/main/java/org/embeddedt/modernfix/registry/DirectStorageRegistryObject.java

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

common/src/main/java/org/embeddedt/modernfix/registry/RegistryStorage.java

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

0 commit comments

Comments
 (0)