3
0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-07-05 23:28:03 +02:00
Dieser Commit ist enthalten in:
Nassim Jahnke 2023-03-05 15:21:06 +01:00
Ursprung b516103a6e
Commit 2d1f675834
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
16 geänderte Dateien mit 13 neuen und 9 gelöschten Zeilen

Datei anzeigen

@ -33,8 +33,6 @@ import org.bukkit.plugin.java.JavaPlugin;
public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform { public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform {
public BukkitPlugin() { public BukkitPlugin() {
// This is the only place we can enable this before ViaVersion is loaded and registers protocols
// MappingDataLoader.enableMappingsCache();
} }
@Override @Override

Datei anzeigen

@ -27,7 +27,6 @@ public class BungeePlugin extends Plugin implements ViaBackwardsPlatform {
@Override @Override
public void onLoad() { public void onLoad() {
// MappingDataLoader.enableMappingsCache();
Via.getManager().addEnableListener(() -> this.init(getDataFolder())); Via.getManager().addEnableListener(() -> this.init(getDataFolder()));
} }

Datei anzeigen

@ -61,6 +61,14 @@ public class BackwardsMappings extends MappingDataBase {
@Override @Override
protected void loadExtras(final CompoundTag data) { protected void loadExtras(final CompoundTag data) {
if (vvProtocolClass != null) {
// Reuse item mappings
//TODO rest
final MappingData mappingData = Via.getManager().getProtocolManager().getProtocol(vvProtocolClass).getMappingData();
final BiMappings vvItemMappings = mappingData.getItemMappings();
this.itemMappings = vvItemMappings != null ? vvItemMappings.inverse() : null;
}
final CompoundTag itemNames = data.get("itemnames"); final CompoundTag itemNames = data.get("itemnames");
if (itemNames != null) { if (itemNames != null) {
backwardsItemMappings = new Int2ObjectOpenHashMap<>(itemNames.size()); backwardsItemMappings = new Int2ObjectOpenHashMap<>(itemNames.size());
@ -120,10 +128,11 @@ public class BackwardsMappings extends MappingDataBase {
return mappings != null ? mappings.createInverse() : null; return mappings != null ? mappings.createInverse() : null;
} }
/*@Override @Override
protected boolean shouldLoad(final String key) { protected boolean shouldLoad(final String key) {
return !TO_REUSE.contains(key); return !key.equals("items");
}/*/ //return !TO_REUSE.contains(key); //TODO
}
/** /**
* @see #getMappedItem(int) for custom backwards mappings * @see #getMappedItem(int) for custom backwards mappings

Datei anzeigen

@ -157,6 +157,6 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back
@Override @Override
protected boolean shouldLoad(final String key) { protected boolean shouldLoad(final String key) {
return super.shouldLoad(key) && !key.equals("blocks"); return !key.equals("blocks");
} }
} }

Datei anzeigen

@ -47,7 +47,6 @@ public class SpongePlugin implements ViaBackwardsPlatform {
@Listener @Listener
public void constructPlugin(ConstructPluginEvent event) { public void constructPlugin(ConstructPluginEvent event) {
// MappingDataLoader.enableMappingsCache();
Via.getManager().addEnableListener(() -> this.init(getDataFolder())); Via.getManager().addEnableListener(() -> this.init(getDataFolder()));
} }

Datei anzeigen

@ -52,7 +52,6 @@ public class VelocityPlugin implements ViaBackwardsPlatform {
@Subscribe(order = PostOrder.LATE) @Subscribe(order = PostOrder.LATE)
public void onProxyStart(ProxyInitializeEvent event) { public void onProxyStart(ProxyInitializeEvent event) {
this.logger = new LoggerWrapper(loggerSlf4j); this.logger = new LoggerWrapper(loggerSlf4j);
// MappingDataLoader.enableMappingsCache();
Via.getManager().addEnableListener(() -> this.init(getDataFolder())); Via.getManager().addEnableListener(() -> this.init(getDataFolder()));
} }