Mirrors/ViaBackwards
3
0
Fork 0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-12-25 15:50:12 +01:00
Code Issues Releases Aktivität

Merge remote-tracking branch 'origin/master' into dev

Quellcode durchsuchen 
# Conflicts:
#	gradle/libs.versions.toml
Dieser Commit ist enthalten in:
Nassim Jahnke 2021-10-07 12:38:01 +02:00
Commit 448f452965
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
8 geänderte Dateien mit 9 neuen und 9 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
build.gradle.kts
Datei anzeigen

@ -5,7 +5,7 @@ plugins {
allprojects { allprojects {
group = "com.viaversion" group = "com.viaversion"
version = "4.1.0-21w38a-SNAPSHOT" version = "4.1.0-21w39a-SNAPSHOT"
description = "Allow older clients to join newer server versions." description = "Allow older clients to join newer server versions."
} }

2
common/src/main/java/com/viaversion/viabackwards/api/data/VBMappingDataLoader.java
Datei anzeigen

@ -134,7 +134,7 @@ public class VBMappingDataLoader {
} }
public static Int2ObjectMap<MappedItem> loadItemMappings(JsonObject oldMapping, JsonObject newMapping, JsonObject diffMapping, boolean warnOnMissing) { public static Int2ObjectMap<MappedItem> loadItemMappings(JsonObject oldMapping, JsonObject newMapping, JsonObject diffMapping, boolean warnOnMissing) {
Int2ObjectMap<MappedItem> itemMapping = new Int2ObjectOpenHashMap<>(diffMapping.size(), 1F); Int2ObjectMap<MappedItem> itemMapping = new Int2ObjectOpenHashMap<>(diffMapping.size(), 0.99F);
Object2IntMap<String> newIdenfierMap = MappingDataLoader.indexedObjectToMap(newMapping); Object2IntMap<String> newIdenfierMap = MappingDataLoader.indexedObjectToMap(newMapping);
Object2IntMap<String> oldIdenfierMap = MappingDataLoader.indexedObjectToMap(oldMapping); Object2IntMap<String> oldIdenfierMap = MappingDataLoader.indexedObjectToMap(oldMapping);
for (Map.Entry<String, JsonElement> entry : diffMapping.entrySet()) { for (Map.Entry<String, JsonElement> entry : diffMapping.entrySet()) {

2
common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java
Datei anzeigen

@ -147,7 +147,7 @@ public abstract class EntityRewriterBase<T extends BackwardsProtocol> extends En
@Override @Override
public <E extends Enum<E> & EntityType> void mapTypes(EntityType[] oldTypes, Class<E> newTypeClass) { public <E extends Enum<E> & EntityType> void mapTypes(EntityType[] oldTypes, Class<E> newTypeClass) {
if (typeMappings == null) { if (typeMappings == null) {
typeMappings = new Int2IntOpenHashMap(oldTypes.length, 1F); typeMappings = new Int2IntOpenHashMap(oldTypes.length, 0.99F);
typeMappings.defaultReturnValue(-1); typeMappings.defaultReturnValue(-1);
} }
for (EntityType oldType : oldTypes) { for (EntityType oldType : oldTypes) {

2
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java
Datei anzeigen

@ -22,7 +22,7 @@ import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap;
public class PotionSplashHandler { public class PotionSplashHandler {
private static final Int2IntMap DATA = new Int2IntOpenHashMap(14, 1F); private static final Int2IntMap DATA = new Int2IntOpenHashMap(14, 0.99F);
static { static {
DATA.defaultReturnValue(-1); DATA.defaultReturnValue(-1);

2
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java
Datei anzeigen

@ -21,7 +21,7 @@ import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap;
import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap;
public class MapColorMapping { public class MapColorMapping {
private static final Int2IntMap MAPPING = new Int2IntOpenHashMap(64, 1F); private static final Int2IntMap MAPPING = new Int2IntOpenHashMap(64, 0.99F);
static { static {
MAPPING.defaultReturnValue(-1); MAPPING.defaultReturnValue(-1);

2
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java
Datei anzeigen

@ -29,7 +29,7 @@ import com.viaversion.viaversion.util.Pair;
public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler { public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
private static final Int2ObjectMap<Pair<String, Byte>> FLOWERS = new Int2ObjectOpenHashMap<>(22, 1F); private static final Int2ObjectMap<Pair<String, Byte>> FLOWERS = new Int2ObjectOpenHashMap<>(22, 0.99F);
private static final Pair<String, Byte> AIR = new Pair<>("minecraft:air", (byte) 0); private static final Pair<String, Byte> AIR = new Pair<>("minecraft:air", (byte) 0);
static { static {

2
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java
Datei anzeigen

@ -21,7 +21,7 @@ import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
public class PaintingMapping { public class PaintingMapping {
private static final Int2ObjectMap<String> PAINTINGS = new Int2ObjectOpenHashMap<>(26, 1F); private static final Int2ObjectMap<String> PAINTINGS = new Int2ObjectOpenHashMap<>(26, 0.99F);
public static void init() { public static void init() {
add("Kebab"); add("Kebab");

4
gradle/libs.versions.toml
Datei anzeigen

@ -3,14 +3,14 @@ metadata.format.version = "1.1"
[versions] [versions]
# ViaVersion # ViaVersion
viaver = "4.1.0-21w38a-SNAPSHOT" viaver = "4.1.0-21w39a-SNAPSHOT"
# Common provided # Common provided
netty = "4.0.20.Final" netty = "4.0.20.Final"
guava = "17.0" guava = "17.0"
log4j = "2.8.1" log4j = "2.8.1"
checkerQual = "3.14.0" checkerQual = "3.18.0"
# Platforms # Platforms
paper = "1.16.5-R0.1-SNAPSHOT" paper = "1.16.5-R0.1-SNAPSHOT"