Skip to content

Commit 0522be8

Browse files
authored
Merge pull request InsightsPlugin#248 from Euphillya/support/26.2
Added support for version 26.2 and dropped support for version 1.21.10.
2 parents 08efcca + 49e22d8 commit 0522be8

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies {
2-
paperweight.paperDevBundle("26.1.2.build.+")
2+
paperweight.paperDevBundle("26.2.build.+")
33
}

Insights-NMS/Current/src/main/java/dev/frankheijden/insights/nms/impl/InsightsNMSImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
import dev.frankheijden.insights.nms.core.ChunkEntity;
88
import dev.frankheijden.insights.nms.core.ChunkSection;
99
import dev.frankheijden.insights.nms.core.InsightsNMS;
10+
import net.minecraft.core.registries.BuiltInRegistries;
1011
import net.minecraft.nbt.CompoundTag;
1112
import net.minecraft.nbt.ListTag;
1213
import net.minecraft.nbt.NbtOps;
1314
import net.minecraft.nbt.Tag;
15+
import net.minecraft.resources.Identifier;
1416
import net.minecraft.util.Mth;
1517
import net.minecraft.world.entity.Entity;
1618
import net.minecraft.world.level.ChunkPos;
@@ -165,7 +167,7 @@ private void readChunkEntities(ListTag listTag, Consumer<ChunkEntity> entityCons
165167
}
166168

167169
private void readChunkEntities(CompoundTag nbt, Consumer<ChunkEntity> entityConsumer) {
168-
var typeOptional = net.minecraft.world.entity.EntityType.byString(nbt.getString("id").orElseThrow());
170+
var typeOptional = BuiltInRegistries.ENTITY_TYPE.getOptional(Identifier.tryParse(nbt.getString("id").orElseThrow()));
169171
if (typeOptional.isPresent()) {
170172
String entityTypeName = net.minecraft.world.entity.EntityType.getKey(typeOptional.get()).getPath();
171173
ListTag posList = nbt.getList("Pos").orElseThrow();

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins {
1515
group = "dev.frankheijden.insights"
1616
version = "6.21.2"
1717
val dependencyDir = "$group.dependencies"
18-
val targetMinecraftVersions = listOf("26.1.2", "1.21.11", "1.21.10")
18+
val targetMinecraftVersions = listOf("26.2", "26.1.2", "1.21.11")
1919

2020
subprojects {
2121
apply(plugin = "java")

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
# libraries
33
semver = "0.10.2"
4-
minecraft = "26.1.2.build.+"
4+
minecraft = "26.2.build.+"
55
bStats = "3.0.0"
66
adventure = "4.17.0"
77
adventurePlatformBukkit = "4.4.1"

0 commit comments

Comments
 (0)