Siphalor/tweed5
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

fix(coat-bridge, fabric-helper): Fix various issues

Browse Source
This commit is contained in:
Siphalor
2025-11-02 19:22:21 +01:00
parent a4eb2eda1a
commit 2b0fac4127
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java
View File

@@ -94,12 +94,14 @@ public class TweedCoatMappersImpl {
@Override
public TweedCoatEntryMappingResult<T, String> mapEntry(ConfigEntry<T> entry, TweedCoatEntryMappingContext context) {
boolean applicable = anyClassMatches(entry.valueClass(), valueClasses);
if (!anyClassMatches(entry.valueClass(), valueClasses)) {
return TweedCoatEntryMappingResult.notApplicable();
}
return new TweedCoatEntryMappingResult<T, String>() {
@Override
public boolean isApplicable() {
return applicable;
return true;
}
@Override
@@ -198,12 +200,7 @@ public class TweedCoatMappersImpl {
@Override
public TweedCoatEntryMappingResult<T, T> mapEntry(ConfigEntry<T> entry, TweedCoatEntryMappingContext context) {
matchingClass: {
for (Class<T> valueClass : valueClasses) {
if (entry.valueClass() == valueClass) {
break matchingClass;
}
}
if (!anyClassMatches(entry.valueClass(), valueClasses)) {
return TweedCoatEntryMappingResult.notApplicable();
}
@@ -359,9 +356,9 @@ public class TweedCoatMappersImpl {
}
}
private static boolean anyClassMatches(Object value, Class<?>... classes) {
private static boolean anyClassMatches(Class<?> valueClass, Class<?>... classes) {
for (Class<?> clazz : classes) {
if (clazz.isInstance(value)) {
if (clazz.isAssignableFrom(valueClass)) {
return true;
}
}