Skip to content

Commit 65c796d

Browse files
tal5tal5
committed
Fix and bump for Paper 26.1.1
1 parent 3b4eb34 commit 65c796d

7 files changed

Lines changed: 23 additions & 19 deletions

File tree

‎paper/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<dependency>
2626
<groupId>io.papermc.paper</groupId>
2727
<artifactId>paper-api</artifactId>
28-
<version>1.21.11-R0.1-SNAPSHOT</version>
28+
<version>26.1.1.build.20-alpha</version>
2929
<scope>provided</scope>
3030
</dependency>
3131
<dependency>
3232
<groupId>net.citizensnpcs</groupId>
3333
<artifactId>citizens-main</artifactId>
34-
<version>2.0.41-SNAPSHOT</version>
34+
<version>2.0.42-SNAPSHOT</version>
3535
<type>jar</type>
3636
<scope>provided</scope>
3737
<exclusions>

‎plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>net.citizensnpcs</groupId>
4646
<artifactId>citizens-main</artifactId>
47-
<version>2.0.41-SNAPSHOT</version>
47+
<version>2.0.42-SNAPSHOT</version>
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
<exclusions>

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/Handler.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@
7979
import org.bukkit.craftbukkit.inventory.CraftItemStack;
8080
import org.bukkit.craftbukkit.legacy.FieldRename;
8181
import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
82-
import org.bukkit.craftbukkit.util.*;
82+
import org.bukkit.craftbukkit.util.ApiVersion;
83+
import org.bukkit.craftbukkit.util.CraftChatMessage;
84+
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
85+
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
8386
import org.bukkit.entity.Player;
8487
import org.bukkit.inventory.Inventory;
8588
import org.bukkit.inventory.InventoryView;
@@ -99,6 +102,10 @@
99102

100103
public class Handler extends NMSHandler {
101104

105+
public static BlockPos toBlockPos(Location location) { // TODO: Paper renamed 'CraftLocation#toBlockPosition', switch back once on Paper NMS
106+
return new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ());
107+
}
108+
102109
public Handler() {
103110
advancementHelper = new AdvancementHelperImpl();
104111
animationHelper = new AnimationHelperImpl();
@@ -117,7 +124,7 @@ public Handler() {
117124
registerConversion(ElementTag.class, Component.class, element -> componentToNMS(FormattedTextHelper.parse(element.asString(), ChatColor.WHITE)));
118125
registerConversion(MaterialTag.class, BlockState.class, material -> ((CraftBlockData) material.getModernData()).getState());
119126
registerConversion(LocationTag.class, Rotations.class, location -> new Rotations((float) location.getX(), (float) location.getY(), (float) location.getZ()));
120-
registerConversion(LocationTag.class, BlockPos.class, CraftLocation::toBlockPosition);
127+
registerConversion(LocationTag.class, BlockPos.class, Handler::toBlockPos);
121128
registerConversion(MapTag.class, CompoundTag.class, map -> {
122129
CompoundBinaryTag compoundTag = (CompoundBinaryTag) ItemRawNBT.convertObjectToNbt(map, CoreUtilities.noDebugContext, "(item).");
123130
return compoundTag != null ? NBTAdapter.toNMS(compoundTag) : null;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/BlockHelperImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.bukkit.craftbukkit.block.CraftSkull;
4343
import org.bukkit.craftbukkit.entity.CraftEntity;
4444
import org.bukkit.craftbukkit.inventory.CraftItemStack;
45-
import org.bukkit.craftbukkit.util.CraftLocation;
4645
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
4746

4847
import java.lang.invoke.MethodHandle;
@@ -65,7 +64,7 @@ public class BlockHelperImpl implements BlockHelper {
6564

6665
@Override
6766
public void applyPhysics(Location location) {
68-
((CraftWorld) location.getWorld()).getHandle().updateNeighborsAt(CraftLocation.toBlockPosition(location), CraftMagicNumbers.getBlock(location.getBlock().getType()));
67+
((CraftWorld) location.getWorld()).getHandle().updateNeighborsAt(Handler.toBlockPos(location), CraftMagicNumbers.getBlock(location.getBlock().getType()));
6968
}
7069

7170
public static <T extends BlockEntity> T getTE(CraftBlockEntityState<T> cbs) {
@@ -179,7 +178,7 @@ public void setBlockStrength(Material mat, float strength) {
179178

180179
@Override
181180
public void doRandomTick(Location location) {
182-
BlockPos pos = CraftLocation.toBlockPosition(location);
181+
BlockPos pos = Handler.toBlockPos(location);
183182
ChunkAccess nmsChunk = ((CraftChunk) location.getChunk()).getHandle(ChunkStatus.FULL);
184183
net.minecraft.world.level.block.state.BlockState nmsBlock = nmsChunk.getBlockState(pos);
185184
ServerLevel nmsWorld = ((CraftWorld) location.getWorld()).getHandle();

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/EntityHelperImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
import org.bukkit.craftbukkit.block.data.CraftBlockData;
7676
import org.bukkit.craftbukkit.entity.*;
7777
import org.bukkit.craftbukkit.inventory.CraftItemStack;
78-
import org.bukkit.craftbukkit.util.CraftLocation;
7978
import org.bukkit.entity.*;
8079
import org.bukkit.event.entity.EntityDamageEvent;
8180
import org.bukkit.inventory.EquipmentSlot;
@@ -171,7 +170,7 @@ public void forceInteraction(Player player, Location location) {
171170
ServerPlayer nmsPlayer = ((CraftPlayer) player).getHandle();
172171
((CraftBlock) location.getBlock()).getNMS().useItemOn(nmsPlayer.getMainHandItem(), ((CraftWorld) location.getWorld()).getHandle(),
173172
nmsPlayer, InteractionHand.MAIN_HAND,
174-
new BlockHitResult(new Vec3(0, 0, 0), null, CraftLocation.toBlockPosition(location), false));
173+
new BlockHitResult(new Vec3(0, 0, 0), null, Handler.toBlockPos(location), false));
175174
}
176175

177176
@Override

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/PacketHelperImpl.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import org.bukkit.craftbukkit.inventory.CraftItemStack;
5656
import org.bukkit.craftbukkit.map.CraftMapCanvas;
5757
import org.bukkit.craftbukkit.map.CraftMapView;
58-
import org.bukkit.craftbukkit.util.CraftLocation;
5958
import org.bukkit.entity.Entity;
6059
import org.bukkit.entity.EntityType;
6160
import org.bukkit.entity.LivingEntity;
@@ -144,7 +143,7 @@ else if (entityType == EntityType.ENDERMAN) {
144143

145144
@Override
146145
public void showBlockAction(Player player, Location location, int action, int state) {
147-
BlockPos position = CraftLocation.toBlockPosition(location);
146+
BlockPos position = Handler.toBlockPos(location);
148147
Block block = ((CraftWorld) location.getWorld()).getHandle().getBlockState(position).getBlock();
149148
send(player, new ClientboundBlockEventPacket(position, block, action, state));
150149
}
@@ -187,12 +186,12 @@ public void showSignEditor(Player player, Location location) { // TODO: MC 1.18:
187186
}
188187
else {
189188
sign = null;
190-
toOpen = CraftLocation.toBlockPosition(toCheck);
189+
toOpen = Handler.toBlockPos(toCheck);
191190
break;
192191
}
193192
}
194193
if (sign != null) {
195-
toOpen = CraftLocation.toBlockPosition(sign.getLocation());
194+
toOpen = Handler.toBlockPos(sign.getLocation());
196195
SignSide front = sign.getSide(Side.FRONT);
197196
for (int line = 0; line < 4; line++) {
198197
front.setLine(line, "");
@@ -350,9 +349,9 @@ public void enableNetworkManager() {
350349

351350
@Override
352351
public void showDebugTestMarker(Player player, Location location, ColorTag color, String name, int time) {
353-
BlockPos nmsPos = CraftLocation.toBlockPosition(location);
352+
BlockPos nmsPos = Handler.toBlockPos(location);
354353
LocationTag displayPos = !name.isEmpty() ? LocationTag.valueOf(name, CoreUtilities.noDebugContext) : null;
355-
send(player, new ClientboundGameTestHighlightPosPacket(nmsPos, displayPos != null ? CraftLocation.toBlockPosition(displayPos) : nmsPos));
354+
send(player, new ClientboundGameTestHighlightPosPacket(nmsPos, displayPos != null ? Handler.toBlockPos(displayPos) : nmsPos));
356355
}
357356

358357
@Override

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/impl/BiomeNMSImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.denizenscript.denizen.nms.NMSHandler;
44
import com.denizenscript.denizen.nms.abstracts.BiomeNMS;
5+
import com.denizenscript.denizen.nms.v26_1.Handler;
56
import com.denizenscript.denizencore.utilities.ReflectionHelper;
67
import com.denizenscript.denizencore.utilities.debugging.Debug;
78
import net.minecraft.core.BlockPos;
@@ -26,7 +27,6 @@
2627
import org.bukkit.block.Block;
2728
import org.bukkit.craftbukkit.CraftWorld;
2829
import org.bukkit.craftbukkit.entity.CraftEntityType;
29-
import org.bukkit.craftbukkit.util.CraftLocation;
3030
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
3131
import org.bukkit.entity.EntityType;
3232

@@ -57,7 +57,7 @@ private MappedRegistry<Biome> getBiomeRegistry() {
5757

5858
@Override
5959
public DownfallType getDownfallTypeAt(Location location) {
60-
Biome.Precipitation precipitation = biomeHolder.value().getPrecipitationAt(CraftLocation.toBlockPosition(location), world.getSeaLevel());
60+
Biome.Precipitation precipitation = biomeHolder.value().getPrecipitationAt(Handler.toBlockPos(location), world.getSeaLevel());
6161
return switch (precipitation) {
6262
case RAIN -> DownfallType.RAIN;
6363
case SNOW -> DownfallType.SNOW;
@@ -77,7 +77,7 @@ public float getBaseTemperature() {
7777

7878
@Override
7979
public float getTemperatureAt(Location location) {
80-
return biomeHolder.value().getTemperature(CraftLocation.toBlockPosition(location), world.getSeaLevel());
80+
return biomeHolder.value().getTemperature(Handler.toBlockPos(location), world.getSeaLevel());
8181
}
8282

8383
@Override

0 commit comments

Comments
 (0)