From 9a581c534f8ced7cb4c32683da1d0eea7df0ce57 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Tue, 23 Feb 2021 12:45:00 +0100 Subject: [PATCH] 21w07a, bandaid building --- buildSrc/src/main/kotlin/Versions.kt | 2 +- .../viabackwards/api/data/MappedItem.java | 2 +- .../api/data/MappedLegacyBlockItem.java | 2 +- .../rewriters/LegacyBlockItemRewriter.java | 2 +- .../packets/BlockItemPackets1_11.java | 2 +- .../packets/PlayerPackets1_11.java | 6 +- .../data/ShoulderTracker.java | 2 +- .../data/mapping-1.16.2to1.17.json | 87 ++++++++++++++++++- 8 files changed, 95 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index fca0e0d5..7c64e6ca 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -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" diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java index e6954867..191f8a1b 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java @@ -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 { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java index f9f563af..a2732477 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java @@ -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 { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java index a5a6bec7..8d3fef0c 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java @@ -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; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index a0653350..a758cb74 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -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; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java index 7d903a9b..97f9ae61 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java @@ -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; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java index 768097aa..c2941f10 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java @@ -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; diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json index 82ea51e7..e5951931 100644 --- a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json +++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json @@ -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": {