Skip to content

Commit

Permalink
- false -> null。
Browse files Browse the repository at this point in the history
- 修复加载错误。
  • Loading branch information
KasumiNova committed Oct 2, 2024
1 parent 8507ef8 commit 8f4f16c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {

// Project properties
group = "github.kasuminova.stellarcore"
version = "1.4.16"
version = "1.4.17"

// Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod
java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,33 @@

@SuppressWarnings({"CloneableClassInSecureContext", "AssignmentToMethodParameter", "unchecked"})
public class AutoCanonizingStringMap<V> extends Object2ObjectOpenHashMap<String, V> {
private final Function<String, String> canonicalizer;

private Function<String, String> canonicalizer = null;

public AutoCanonizingStringMap() {
canonicalizer = initCanonicalizer();
}

public AutoCanonizingStringMap(Map<String, V> map) {
super(map);
canonicalizer = initCanonicalizer();
}

@Override
public V put(String key, V value) {
Function<String, String> canonicalizer = getCanonicalizer();
key = canonicalizer.apply(key);
if (value instanceof String) {
value = (V) canonicalizer.apply((String) value);
}
return super.put(key, value);
}

private Function<String, String> getCanonicalizer() {
if (canonicalizer == null) {
canonicalizer = initCanonicalizer();
}
return canonicalizer;
}

private static Function<String, String> initCanonicalizer() {
if (Mods.CENSORED_ASM.loaded()) {
return AutoCanonizingStringMap::canonicalizeFromLoliStringPool;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ private void injectHasCapability(final Capability<?> capability, final EnumFacin
@Inject(method = "getCapability", at = @At("HEAD"), remap = false, cancellable = true)
private void injectGetCapability(final Capability<?> capability, final EnumFacing facing, final CallbackInfoReturnable<Object> cir) {
if (isEmpty) {
cir.setReturnValue(false);
cir.setReturnValue(null);
}
stellar_core$ensureCapInitialized();
}
Expand Down

0 comments on commit 8f4f16c

Please # to comment.