From 4d21ebf3827e8df200c04561b081aa6ee2ea08ae Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 21 Feb 2023 09:52:34 +0100 Subject: [PATCH] Move to 1.19(.2) --- build.gradle | 8 +++++++- src/de/steamwar/lobby/command/PortalCommand.java | 5 +++-- src/de/steamwar/lobby/map/CustomMap.java | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 57e67d9..f6c9e63 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,10 @@ sourceSets { repositories { mavenCentral() + maven { + url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/') + } + maven { url = uri('https://steamwar.de/maven/') credentials { @@ -94,7 +98,9 @@ repositories { } dependencies { - compileOnly swdep("Spigot-1.15") + compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' + + compileOnly swdep("Spigot-1.19") compileOnly swdep("WorldEdit-1.15") compileOnly swdep("SpigotCore") diff --git a/src/de/steamwar/lobby/command/PortalCommand.java b/src/de/steamwar/lobby/command/PortalCommand.java index 2d892f2..043155a 100644 --- a/src/de/steamwar/lobby/command/PortalCommand.java +++ b/src/de/steamwar/lobby/command/PortalCommand.java @@ -15,7 +15,7 @@ import lombok.Data; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import java.util.ArrayList; @@ -102,7 +102,8 @@ public class PortalCommand extends SWCommand { private Location locationOfPlayer(Player player) { Location l = player.getLocation(); - l.setYaw(((CraftPlayer)player).getHandle().getHeadRotation()); + + l.setYaw(((CraftPlayer)player).getHandle().cg()); return l; } diff --git a/src/de/steamwar/lobby/map/CustomMap.java b/src/de/steamwar/lobby/map/CustomMap.java index 6bf8536..935d722 100644 --- a/src/de/steamwar/lobby/map/CustomMap.java +++ b/src/de/steamwar/lobby/map/CustomMap.java @@ -19,10 +19,10 @@ package de.steamwar.lobby.map; -import net.minecraft.server.v1_15_R1.WorldMap; +import net.minecraft.world.level.saveddata.maps.WorldMap; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_15_R1.map.CraftMapView; +import org.bukkit.craftbukkit.v1_19_R1.map.CraftMapView; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.MapMeta; @@ -77,7 +77,7 @@ public class CustomMap { for (int sx = 0; sx < 128; sx++) { for (int sy = 0; sy < 128; sy++) { byte color = MapPalette.matchColor(new Color(subImage.getRGB(sx, sy))); - worldMap.colors[sx + sy * 128] = color; + worldMap.g[sx + sy * 128] = color; } } craftMapView.setLocked(true);