Skip to content

Commit 3aa554e

Browse files
committed
1.19
1 parent cb15d2b commit 3aa554e

9 files changed

+22
-21
lines changed

plugin.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Vivecraft-Spigot-Extensions
2-
version: '1.18.2-1'
3-
api-version: 1.18
2+
version: '1.19-1'
3+
api-version: 1.19
44
main: org.vivecraft.VSE
55
website: http://www.vivecraft.org/
66
author: jrbudda, jaron780

src/org/vivecraft/Reflector.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import net.minecraft.world.entity.monster.EnderMan;
1212

1313
public class Reflector {
14-
//last checked 1.18.2
14+
//last checked 1.19
1515
public static Field Entity_Data_Pose= getPrivateField("ad", Entity.class);
16-
public static Field Entity_eyesHeight = getPrivateField("ba", Entity.class);
16+
public static Field Entity_eyeHeight = getPrivateField("ba", Entity.class);
1717
public static Field SynchedEntityData_itemsById = getPrivateField("f", SynchedEntityData.class);
1818
public static Field availableGoals = getPrivateField("d", GoalSelector.class);
19-
public static Field aboveGroundCount = getPrivateField("C", ServerGamePacketListenerImpl.class);
19+
public static Field aboveGroundTickCount = getPrivateField("F", ServerGamePacketListenerImpl.class);
2020

2121
public static Method Entity_teleport= getPrivateMethod("t", EnderMan.class);
2222
public static Method Entity_teleportTowards = getPrivateMethod("a", EnderMan.class, Entity.class);

src/org/vivecraft/VSE.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import org.bukkit.World;
1919
import org.bukkit.configuration.ConfigurationSection;
2020
import org.bukkit.configuration.file.FileConfiguration;
21-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftCreeper;
22-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEnderman;
23-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
24-
import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
21+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftCreeper;
22+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEnderman;
23+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
24+
import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
2525
import org.bukkit.entity.Entity;
2626
import org.bukkit.entity.EntityType;
2727
import org.bukkit.entity.Player;
@@ -53,9 +53,10 @@
5353
import org.vivecraft.utils.Headshot;
5454
import org.vivecraft.utils.MetadataHelper;
5555

56+
import net.md_5.bungee.api.chat.TranslatableComponent;
5657
import net.milkbowl.vault.permission.Permission;
5758
import net.minecraft.network.Connection;
58-
import net.minecraft.network.chat.TranslatableComponent;
59+
import net.minecraft.network.chat.Component;
5960
import net.minecraft.resources.ResourceLocation;
6061
import net.minecraft.world.entity.Mob;
6162
import net.minecraft.world.entity.ai.goal.WrappedGoal;
@@ -66,7 +67,7 @@ public class VSE extends JavaPlugin implements Listener {
6667
FileConfiguration config = getConfig();
6768

6869
public final static String CHANNEL = "vivecraft:data";
69-
private final static String readurl = "https://raw.githubusercontent.com/jrbudda/Vivecraft_Spigot_Extensions/1.18/version.txt";
70+
private final static String readurl = "https://raw.githubusercontent.com/jrbudda/Vivecraft_Spigot_Extensions/1.19/version.txt";
7071
private final static int bStatsId = 6931;
7172

7273
public static Map<UUID, VivePlayer> vivePlayers = new HashMap<UUID, VivePlayer>();
@@ -199,7 +200,7 @@ public void run() {
199200

200201
public static ItemStack setLocalizedItemName(ItemStack stack, String key) {
201202
var nmsStack = CraftItemStack.asNMSCopy(stack);
202-
nmsStack.setHoverName(new TranslatableComponent(key));
203+
nmsStack.setHoverName(Component.translatable(key));
203204
return CraftItemStack.asBukkitCopy(nmsStack);
204205
}
205206

src/org/vivecraft/VivePlayer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.io.IOException;
77

88
import org.bukkit.Location;
9-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
9+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
1010
import org.bukkit.entity.Player;
1111
import org.vivecraft.listeners.VivecraftNetworkListener;
1212
import org.vivecraft.utils.Quaternion;

src/org/vivecraft/listeners/VivecraftCombatListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.vivecraft.listeners;
22

33
import org.bukkit.Location;
4-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
5-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
4+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
5+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
66
import org.bukkit.entity.AbstractArrow;
77
import org.bukkit.entity.Arrow;
88
import org.bukkit.entity.Entity;

src/org/vivecraft/listeners/VivecraftNetworkListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.io.InputStreamReader;
99
import java.util.Arrays;
1010

11-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
11+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
1212
import org.bukkit.entity.Player;
1313
import org.bukkit.plugin.messaging.PluginMessageListener;
1414
import org.vivecraft.Reflector;
@@ -211,7 +211,7 @@ else if(mode.trim().equalsIgnoreCase("exclude"))
211211
case CLIMBING:
212212
ServerPlayer nms = ((CraftPlayer)sender).getHandle();
213213
nms.fallDistance = 0;
214-
Reflector.setFieldValue(Reflector.aboveGroundCount, nms.connection, 0);
214+
Reflector.setFieldValue(Reflector.aboveGroundTickCount, nms.connection, 0);
215215
break;
216216
case ACTIVEHAND:
217217
ByteArrayInputStream a2 = new ByteArrayInputStream(data);

src/org/vivecraft/utils/AimFixHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
6565
player.setYRot((float)Math.toDegrees(Math.atan2(-aim.x, aim.z)));
6666
player.xRotO = player.getXRot();
6767
player.yRotO = player.yHeadRotO = player.yHeadRot = player.getYRot();
68-
Reflector.setFieldValue(Reflector.Entity_eyesHeight, player, 0);
68+
Reflector.setFieldValue(Reflector.Entity_eyeHeight, player, 0);
6969

7070
// Set up offset to fix relative positions
7171
// P.S. Spigot mappings are stupid
@@ -100,7 +100,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
100100
player.xRotO = oldPrevPitch;
101101
player.yRotO = oldPrevYaw;
102102
player.yHeadRotO = oldPrevYawHead;
103-
Reflector.setFieldValue(Reflector.Entity_eyesHeight, player, oldEyeHeight);
103+
Reflector.setFieldValue(Reflector.Entity_eyeHeight, player, oldEyeHeight);
104104

105105
// Reset offset
106106
if (data != null)

src/org/vivecraft/utils/PoseOverrider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.vivecraft.utils;
22

33
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
4-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
4+
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
55
import org.bukkit.entity.Player;
66
import org.vivecraft.Reflector;
77
import org.vivecraft.VSE;

version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#this file is used to check for updates
2-
1.18.2-1: VSE is up to date.
2+
1.19-1: VSE is up to date.

0 commit comments

Comments
 (0)