forked from SteamWar/SteamWar
Move item.json
This commit is contained in:
@@ -19,8 +19,6 @@
|
||||
|
||||
package de.steamwar.velocitycore.advancements;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.velocitypowered.api.network.ProtocolVersion;
|
||||
import com.velocitypowered.api.proxy.Player;
|
||||
import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
|
||||
@@ -29,7 +27,6 @@ import com.velocitypowered.proxy.protocol.MinecraftPacket;
|
||||
import com.velocitypowered.proxy.protocol.ProtocolUtils;
|
||||
import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder;
|
||||
import de.steamwar.messages.Chatter;
|
||||
import de.steamwar.sql.EventFight;
|
||||
import de.steamwar.sql.SteamwarUser;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import lombok.AllArgsConstructor;
|
||||
@@ -38,8 +35,6 @@ import lombok.RequiredArgsConstructor;
|
||||
import lombok.ToString;
|
||||
import net.kyori.adventure.text.Component;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.*;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Function;
|
||||
@@ -239,8 +234,6 @@ public class Advancement {
|
||||
}
|
||||
}
|
||||
|
||||
private static final JsonObject ITEMS = new Gson().fromJson(new BufferedReader(new InputStreamReader(Advancement.class.getResourceAsStream("/de/steamwar/velocitycore/advancements/item.json"))), JsonObject.class);
|
||||
|
||||
private void encodeAdvancement(ByteBuf byteBuf, ProtocolVersion protocolVersion, boolean showToast) {
|
||||
ProtocolUtils.writeString(byteBuf, advancement.identifier);
|
||||
if (advancement.parent.isPresent()) {
|
||||
@@ -256,7 +249,8 @@ public class Advancement {
|
||||
new ComponentHolder(protocolVersion, advancement.display.description).write(byteBuf);
|
||||
{ // Slot
|
||||
ProtocolUtils.writeVarInt(byteBuf, 1);
|
||||
int itemId = ITEMS.get(protocolVersion.name().replace("MINECRAFT_", "V_"))
|
||||
int itemId = Items.values
|
||||
.get(protocolVersion.name().replace("MINECRAFT_", "V_"))
|
||||
.getAsJsonObject()
|
||||
.get(advancement.display.item)
|
||||
.getAsInt();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user