Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-11-22 12:16:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

21w07a, bandaid building

Browse Source
This commit is contained in:
KennyTV 2021-02-23 12:45:00 +01:00
parent 99e2297d67
commit 9a581c534f
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
8 changed files with 95 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Versions.kt
View File

@ -1,6 +1,6 @@
object Versions {
// ViaVersion
const val viaversion = "3.3.0-21w07a"
const val viaversion = "3.3.0-21w06a"
// Common
const val netty = "4.0.20.Final"

2
common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java
View File

@ -1,7 +1,7 @@
package nl.matsv.viabackwards.api.data;
import net.md_5.bungee.api.ChatColor;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;
import us.myles.viaversion.libs.bungeecordchat.api.ChatColor;
public class MappedItem {

2
common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java
View File

@ -1,8 +1,8 @@
package nl.matsv.viabackwards.api.data;
import net.md_5.bungee.api.ChatColor;
import nl.matsv.viabackwards.utils.Block;
import org.jetbrains.annotations.Nullable;
import us.myles.viaversion.libs.bungeecordchat.api.ChatColor;
import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
public class MappedLegacyBlockItem {

2
common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java
View File

@ -10,7 +10,6 @@
package nl.matsv.viabackwards.api.rewriters;
import net.md_5.bungee.api.ChatColor;
import nl.matsv.viabackwards.api.BackwardsProtocol;
import nl.matsv.viabackwards.api.data.MappedLegacyBlockItem;
import nl.matsv.viabackwards.api.data.VBMappingDataLoader;
@ -21,6 +20,7 @@ import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
import us.myles.ViaVersion.api.minecraft.item.Item;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;
import us.myles.viaversion.libs.bungeecordchat.api.ChatColor;
import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap;
import us.myles.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
import us.myles.viaversion.libs.gson.JsonElement;

2
common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java
View File

@ -10,7 +10,6 @@
package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets;
import net.md_5.bungee.api.ChatColor;
import nl.matsv.viabackwards.api.data.MappedLegacyBlockItem;
import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
import nl.matsv.viabackwards.api.rewriters.LegacyBlockItemRewriter;
@ -34,6 +33,7 @@ import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
import us.myles.viaversion.libs.bungeecordchat.api.ChatColor;
import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag;
import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag;

6
common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java
View File

@ -10,9 +10,6 @@
package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.chat.ComponentSerializer;
import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.remapper.PacketRemapper;
@ -20,6 +17,9 @@ import us.myles.ViaVersion.api.remapper.ValueTransformer;
import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
import us.myles.viaversion.libs.bungeecordchat.api.chat.BaseComponent;
import us.myles.viaversion.libs.bungeecordchat.api.chat.TextComponent;
import us.myles.viaversion.libs.bungeecordchat.chat.ComponentSerializer;
import us.myles.viaversion.libs.gson.JsonElement;
import us.myles.viaversion.libs.gson.JsonObject;

2
common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java
View File

@ -10,7 +10,6 @@
package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data;
import net.md_5.bungee.api.ChatColor;
import nl.matsv.viabackwards.ViaBackwards;
import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
import us.myles.ViaVersion.api.PacketWrapper;
@ -18,6 +17,7 @@ import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import us.myles.viaversion.libs.bungeecordchat.api.ChatColor;
public class ShoulderTracker extends StoredObject {
private int entityId;

87
common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
View File

@ -1321,7 +1321,24 @@
"minecraft:waxed_cut_copper_stairs": "minecraft:brick_stairs[",
"minecraft:waxed_weathered_cut_copper_slab": "minecraft:brick_slab[",
"minecraft:waxed_exposed_cut_copper_slab": "minecraft:brick_slab[",
"minecraft:waxed_cut_copper_slab": "minecraft:brick_slab["
"minecraft:waxed_cut_copper_slab": "minecraft:brick_slab[",
"minecraft:grimstone": "minecraft:blackstone",
"minecraft:grimstone_stairs": "minecraft:blackstone_stairs[",
"minecraft:grimstone_slab": "minecraft:blackstone_slab[",
"minecraft:grimstone_wall": "minecraft:blackstone_wall[",
"minecraft:polished_grimstone": "minecraft:polished_blackstone",
"minecraft:polished_grimstone_stairs": "minecraft:polished_blackstone_stairs[",
"minecraft:polished_grimstone_slab": "minecraft:polished_blackstone_slab[",
"minecraft:polished_grimstone_wall": "minecraft:polished_blackstone_wall[",
"minecraft:grimstone_tiles": "minecraft:blackstone",
"minecraft:grimstone_tile_stairs": "minecraft:blackstone_stairs[",
"minecraft:grimstone_tile_slab": "minecraft:blackstone_slab[",
"minecraft:grimstone_tile_wall": "minecraft:blackstone_wall[",
"minecraft:grimstone_bricks": "minecraft:blackstone",
"minecraft:grimstone_brick_stairs": "minecraft:polished_blackstone_brick_stairs[",
"minecraft:grimstone_brick_slab": "minecraft:polished_blackstone_brick_slab[",
"minecraft:grimstone_brick_wall": "minecraft:polished_blackstone_brick_wall[",
"minecraft:chiseled_grimstone": "minecraft:blackstone"
},
"items": {
"minecraft:dirt_path": {
@ -1655,6 +1672,74 @@
"minecraft:waxed_weathered_cut_copper_slab": {
"id": "minecraft:brick_slab",
"name": "1.17 Waxed Weathered Cut Copper Slab"
},
"minecraft:grimstone": {
"id": "minecraft:blackstone",
"name": "1.17 Grimstone"
},
"minecraft:polished_grimstone": {
"id": "minecraft:polished_blackstone",
"name": "1.17 Polished Grimstone"
},
"minecraft:grimstone_bricks": {
"id": "minecraft:polished_blackstone_bricks",
"name": "1.17 Grimstone Bricks"
},
"minecraft:grimstone_tiles": {
"id": "minecraft:blackstone",
"name": "1.17 Grimstone Tiles"
},
"minecraft:chiseled_grimstone": {
"id": "minecraft:chiseled_polished_blackstone",
"name": "1.17 Chiseled Grimstone"
},
"minecraft:grimstone_wall": {
"id": "minecraft:blackstone_wall",
"name": "1.17 Grimstone Wall"
},
"minecraft:polished_grimstone_wall": {
"id": "minecraft:polished_blackstone_wall",
"name": "1.17 Polished Grimstone Wall"
},
"minecraft:grimstone_tile_wall": {
"id": "minecraft:blackstone_wall",
"name": "1.17 Grimstone Tile Wall"
},
"minecraft:grimstone_brick_wall": {
"id": "minecraft:polished_blackstone_brick_wall",
"name": "1.17 Grimstone Brick Wall"
},
"minecraft:grimstone_stairs": {
"id": "minecraft:blackstone_stairs",
"name": "1.17 Grimstone Stairs"
},
"minecraft:polished_grimstone_stairs": {
"id": "minecraft:polished_blackstone_brick_stairs",
"name": "1.17 Polished Grimstone Stairs"
},
"minecraft:grimstone_tile_stairs": {
"id": "minecraft:blackstone_stairs",
"name": "1.17 Grimstone Tile Stairs"
},
"minecraft:grimstone_brick_stairs": {
"id": "minecraft:polished_blackstone_brick_stairs",
"name": "1.17 Grimstone Brick Stairs"
},
"minecraft:polished_grimstone_slab": {
"id": "minecraft:polished_blackstone_brick_slab",
"name": "1.17 Polished Grimstone Slab"
},
"minecraft:grimstone_slab": {
"id": "minecraft:blackstone_slab",
"name": "1.17 Grimstone Slab"
},
"minecraft:grimstone_tile_slab": {
"id": "minecraft:blackstone_slab",
"name": "1.17 Grimstone Tile Slab"
},
"minecraft:grimstone_brick_slab": {
"id": "minecraft:polished_blackstone_brick_slab",
"name": "1.17 Grimstone Brick Slab"
}
},
"sounds": {