Skip to content

Commit 31cc95f

Browse files
GeorgH93GeorgH93
committed
Add support for MC 1.21.11
1 parent afaba14 commit 31cc95f

12 files changed

Lines changed: 319 additions & 1 deletion

File tree

‎pcgf_pluginlib-mcversion/src/at/pcgamingfreaks/Bukkit/MCVersion.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ public enum MCVersion
150150
MC_1_21_9(156, 773, "1_21", "1.21.9"),
151151
MC_1_21_10(156, 773, "1_21", "1.21.10"),
152152
MC_NMS_1_21_R6(156, 773, "1_21", "1.21_NMS_R6", MC_1_21),
153+
MC_1_21_11(157, 774, "1_21", "1.21.11"),
154+
MC_NMS_1_21_R7(157, 774, "1_21", "1.21_NMS_R7", MC_1_21),
153155
MC_1_22(161, Integer.MAX_VALUE, "1_22", "1.22"),
154156
MC_NMS_1_22_R1(161, Integer.MAX_VALUE, "1_22", "1.22_NMS_R1", MC_1_22);
155157

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms-reflection/resources/mappings/1_21_R7/ClassMappings.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
EntityHuman net.minecraft.world.entity.player.EntityHuman
2+
PacketDataSerializer net.minecraft.network.PacketDataSerializer
3+
SharedConstants net.minecraft.SharedConstants
4+
PacketPlayOutCustomPayload net.minecraft.network.protocol.game.PacketPlayOutCustomPayload
5+
Containers net.minecraft.world.inventory.Containers
6+
IChatBaseComponent net.minecraft.network.chat.IChatBaseComponent
7+
MinecraftKey net.minecraft.resources.MinecraftKey
8+
MinecraftServer net.minecraft.server.MinecraftServer
9+
Container net.minecraft.world.inventory.Container
10+
GameProfileSerializer net.minecraft.nbt.GameProfileSerializer
11+
ItemStack net.minecraft.world.item.ItemStack
12+
PacketPlayOutOpenWindow net.minecraft.network.protocol.game.PacketPlayOutOpenWindow
13+
IScoreboardCriteria net.minecraft.world.scores.criteria.IScoreboardCriteria
14+
DataVersion net.minecraft.world.level.storage.DataVersion

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms-reflection/resources/mappings/1_21_R7/FieldMappings.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#EntityPlayer mappings
2+
net.minecraft.server.level.EntityPlayer#playerConnection b
3+
net.minecraft.server.level.EntityPlayer#ping e
4+
5+
net.minecraft.world.entity.player.EntityHuman#activeContainer bV
6+
7+
net.minecraft.world.inventory.Container#windowId q
8+
9+
#Containers enum mappings
10+
net.minecraft.world.inventory.Containers#GENERIC_9X1 a
11+
net.minecraft.world.inventory.Containers#GENERIC_9X2 b
12+
net.minecraft.world.inventory.Containers#GENERIC_9X3 c
13+
net.minecraft.world.inventory.Containers#GENERIC_9X4 d
14+
net.minecraft.world.inventory.Containers#GENERIC_9X5 e
15+
net.minecraft.world.inventory.Containers#GENERIC_9X6 f
16+
net.minecraft.world.inventory.Containers#GENERIC_3X3 g
17+
net.minecraft.world.inventory.Containers#CRAFTER h
18+
net.minecraft.world.inventory.Containers#CRAFTER_3x3 h
19+
net.minecraft.world.inventory.Containers#ANVIL i
20+
net.minecraft.world.inventory.Containers#BEACON j
21+
net.minecraft.world.inventory.Containers#BLAST_FURNACE k
22+
net.minecraft.world.inventory.Containers#BREWING_STAND l
23+
net.minecraft.world.inventory.Containers#CRAFTING m
24+
net.minecraft.world.inventory.Containers#ENCHANTMENT n
25+
net.minecraft.world.inventory.Containers#FURNACE o
26+
net.minecraft.world.inventory.Containers#GRINDSTONE p
27+
net.minecraft.world.inventory.Containers#HOPPER q
28+
net.minecraft.world.inventory.Containers#LECTERN r
29+
net.minecraft.world.inventory.Containers#LOOM s
30+
net.minecraft.world.inventory.Containers#MERCHANT t
31+
net.minecraft.world.inventory.Containers#SHULKER_BOX u
32+
net.minecraft.world.inventory.Containers#SMITHING v
33+
net.minecraft.world.inventory.Containers#SMOKER w
34+
net.minecraft.world.inventory.Containers#CARTOGRAPHY_TABLE x
35+
net.minecraft.world.inventory.Containers#STONECUTTER y

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms-reflection/resources/mappings/1_21_R7/MethodMappings.txt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
net.minecraft.world.scores.criteria.IScoreboardCriteria#getName d
2+
net.minecraft.server.network.PlayerConnection#sendPacket a
3+
net.minecraft.nbt.NBTTagCompound#setInt a
4+
net.minecraft.nbt.NBTTagCompound#setByte a
5+
net.minecraft.nbt.NBTTagCompound#setDouble a
6+
net.minecraft.nbt.NBTTagCompound#setFloat a
7+
net.minecraft.nbt.NBTTagCompound#setLong a
8+
net.minecraft.nbt.NBTTagCompound#set a
9+
net.minecraft.nbt.NBTTagCompound#hasKeyOfType b
10+
net.minecraft.nbt.NBTTagCompound#getList c
11+
net.minecraft.nbt.NBTTagCompound#getByte f
12+
net.minecraft.nbt.NBTTagCompound#getShort h
13+
net.minecraft.nbt.NBTTagCompound#getInt h
14+
net.minecraft.nbt.NBTTagCompound#getLong i
15+
net.minecraft.nbt.NBTTagCompound#getFloat j
16+
net.minecraft.nbt.NBTTagCompound#getDouble k
17+
net.minecraft.nbt.NBTTagCompound#getString l
18+
net.minecraft.nbt.NBTTagCompound#getCompound p
19+
net.minecraft.nbt.NBTTagList#getCompound a
20+
net.minecraft.world.item.ItemStack#save b
21+
net.minecraft.server.MinecraftServer#getDataFixer ay
22+
net.minecraft.SharedConstants#getGameVersion b
23+
net.minecraft.WorldVersion#getWorldVersion d
24+
net.minecraft.world.level.storage.DataVersion#getVersion c
25+
26+
#sendAllDataToRemote
27+
net.minecraft.world.inventory.Container#updateInventory b
28+
29+
net.minecraft.network.chat.IChatBaseComponent#literal b

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms-reflection/resources/mappings/1_21_R7_Paper/ClassMappings.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
EntityHuman net.minecraft.world.entity.player.EntityHuman
2+
PacketDataSerializer net.minecraft.network.PacketDataSerializer
3+
NBTCompressedStreamTools net.minecraft.nbt.NBTCompressedStreamTools
4+
DataFixTypes net.minecraft.util.datafix.DataFixTypes
5+
SharedConstants net.minecraft.SharedConstants
6+
PacketPlayOutCustomPayload net.minecraft.network.protocol.game.PacketPlayOutCustomPayload
7+
Containers net.minecraft.world.inventory.MenuType
8+
NBTTagCompound net.minecraft.nbt.CompoundTag
9+
IChatBaseComponent net.minecraft.network.chat.IChatBaseComponent
10+
MinecraftKey net.minecraft.resources.MinecraftKey
11+
MinecraftServer net.minecraft.server.MinecraftServer
12+
NBTTagList net.minecraft.nbt.ListTag
13+
Container net.minecraft.world.inventory.Container
14+
GameProfileSerializer net.minecraft.nbt.GameProfileSerializer
15+
NBTBase net.minecraft.nbt.NBTBase
16+
ItemStack net.minecraft.world.item.ItemStack
17+
PacketPlayOutOpenWindow net.minecraft.network.protocol.game.PacketPlayOutOpenWindow
18+
IScoreboardCriteria net.minecraft.world.scores.criteria.IScoreboardCriteria
19+
DataVersion net.minecraft.world.level.storage.DataVersion

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms-reflection/resources/mappings/1_21_R7_Paper/FieldMappings.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#EntityPlayer mappings
2+
net.minecraft.server.level.EntityPlayer#playerConnection b
3+
net.minecraft.server.level.EntityPlayer#ping e
4+
5+
net.minecraft.world.entity.player.EntityHuman#activeContainer bV
6+
7+
net.minecraft.world.inventory.Container#windowId q
8+
9+
#Containers enum mappings
10+
net.minecraft.world.inventory.MenuType#GENERIC_9X1 a
11+
net.minecraft.world.inventory.MenuType#GENERIC_9X2 b
12+
net.minecraft.world.inventory.MenuType#GENERIC_9X3 c
13+
net.minecraft.world.inventory.MenuType#GENERIC_9X4 d
14+
net.minecraft.world.inventory.MenuType#GENERIC_9X5 e
15+
net.minecraft.world.inventory.MenuType#GENERIC_9X6 f
16+
net.minecraft.world.inventory.MenuType#GENERIC_3X3 g
17+
net.minecraft.world.inventory.MenuType#CRAFTER h
18+
net.minecraft.world.inventory.MenuType#CRAFTER_3x3 h
19+
net.minecraft.world.inventory.MenuType#ANVIL i
20+
net.minecraft.world.inventory.MenuType#BEACON j
21+
net.minecraft.world.inventory.MenuType#BLAST_FURNACE k
22+
net.minecraft.world.inventory.MenuType#BREWING_STAND l
23+
net.minecraft.world.inventory.MenuType#CRAFTING m
24+
net.minecraft.world.inventory.MenuType#ENCHANTMENT n
25+
net.minecraft.world.inventory.MenuType#FURNACE o
26+
net.minecraft.world.inventory.MenuType#GRINDSTONE p
27+
net.minecraft.world.inventory.MenuType#HOPPER q
28+
net.minecraft.world.inventory.MenuType#LECTERN r
29+
net.minecraft.world.inventory.MenuType#LOOM s
30+
net.minecraft.world.inventory.MenuType#MERCHANT t
31+
net.minecraft.world.inventory.MenuType#SHULKER_BOX u
32+
net.minecraft.world.inventory.MenuType#SMITHING v
33+
net.minecraft.world.inventory.MenuType#SMOKER w
34+
net.minecraft.world.inventory.MenuType#CARTOGRAPHY_TABLE x
35+
net.minecraft.world.inventory.MenuType#STONECUTTER y

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms-reflection/resources/mappings/1_21_R7_Paper/MethodMappings.txt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
net.minecraft.world.scores.criteria.IScoreboardCriteria#getName d
2+
net.minecraft.server.network.PlayerConnection#sendPacket a
3+
net.minecraft.nbt.CompoundTag#setInt putInt
4+
net.minecraft.nbt.CompoundTag#setByte putByte
5+
net.minecraft.nbt.CompoundTag#setDouble putDouble
6+
net.minecraft.nbt.CompoundTag#setFloat putFloat
7+
net.minecraft.nbt.CompoundTag#setLong putLong
8+
net.minecraft.nbt.CompoundTag#set put
9+
net.minecraft.nbt.CompoundTag#hasKeyOfType b
10+
net.minecraft.nbt.CompoundTag#getList c
11+
net.minecraft.nbt.CompoundTag#getByte f
12+
net.minecraft.nbt.CompoundTag#getShort h
13+
net.minecraft.nbt.CompoundTag#getInt h
14+
net.minecraft.nbt.CompoundTag#getLong i
15+
net.minecraft.nbt.CompoundTag#getFloat j
16+
net.minecraft.nbt.CompoundTag#getDouble k
17+
net.minecraft.nbt.CompoundTag#getString l
18+
net.minecraft.nbt.CompoundTag#getCompound p
19+
net.minecraft.nbt.ListTag#getCompound a
20+
net.minecraft.world.item.ItemStack#save b
21+
net.minecraft.server.MinecraftServer#getDataFixer ay
22+
net.minecraft.SharedConstants#getGameVersion b
23+
net.minecraft.WorldVersion#getWorldVersion d
24+
net.minecraft.world.level.storage.DataVersion#getVersion c
25+
26+
#sendAllDataToRemote
27+
net.minecraft.world.inventory.Container#updateInventory b
28+
29+
net.minecraft.network.chat.IChatBaseComponent#literal b

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms_mm-1_21_R7/pom.xml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>pcgf_pluginlib-platform-nms-1_21_R7</artifactId>
5+
<parent>
6+
<groupId>at.pcgamingfreaks.pcgf_pluginlib.platform</groupId>
7+
<artifactId>pcgf_pluginlib-platform-nms_mojang_mapped</artifactId>
8+
<version>${revision}</version>
9+
<relativePath>../pom_mojang_mapped.xml</relativePath>
10+
</parent>
11+
<version>${revision}</version>
12+
<packaging>jar</packaging>
13+
14+
<url>${website}</url>
15+
16+
<properties>
17+
<nmsVersion>1_21_R7</nmsVersion>
18+
<mcVersion>100210011</mcVersion>
19+
<mojangMapped>true</mojangMapped>
20+
<spigotVersion>1.21.11-R0.1-SNAPSHOT</spigotVersion>
21+
</properties>
22+
23+
<dependencies>
24+
<dependency>
25+
<groupId>org.spigotmc</groupId>
26+
<artifactId>spigot</artifactId>
27+
<version>${spigotVersion}</version>
28+
<classifier>remapped-mojang</classifier>
29+
<scope>provided</scope>
30+
</dependency>
31+
</dependencies>
32+
33+
<build>
34+
<plugins>
35+
<!-- Configures used Java version -->
36+
<plugin>
37+
<artifactId>maven-compiler-plugin</artifactId>
38+
<version>3.8.1</version>
39+
<configuration>
40+
<source>21</source>
41+
<target>21</target>
42+
</configuration>
43+
</plugin>
44+
<plugin>
45+
<artifactId>maven-clean-plugin</artifactId>
46+
</plugin>
47+
<plugin>
48+
<groupId>org.fugerit.java</groupId>
49+
<artifactId>freemarker-maven-plugin</artifactId>
50+
</plugin>
51+
<plugin>
52+
<artifactId>maven-resources-plugin</artifactId>
53+
</plugin>
54+
<plugin>
55+
<groupId>net.md-5</groupId>
56+
<artifactId>specialsource-maven-plugin</artifactId>
57+
</plugin>
58+
</plugins>
59+
</build>
60+
</project>

‎platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms_paper-1_21_R7/pom.xml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>pcgf_pluginlib-platform-nms-1_21_R7_Paper</artifactId>
5+
<parent>
6+
<groupId>at.pcgamingfreaks.pcgf_pluginlib.platform</groupId>
7+
<artifactId>pcgf_pluginlib-platform-nms</artifactId>
8+
<version>${revision}</version>
9+
<relativePath>../pom.xml</relativePath>
10+
</parent>
11+
<version>${revision}</version>
12+
<packaging>jar</packaging>
13+
14+
<url>${website}</url>
15+
16+
<properties>
17+
<nmsVersion>1_21_R7</nmsVersion>
18+
<mcVersion>100210011</mcVersion>
19+
<mojangMapped>true</mojangMapped>
20+
<spigotVersion>1.21.11-R0.1-SNAPSHOT</spigotVersion>
21+
<nmsExtension>_Paper</nmsExtension>
22+
</properties>
23+
24+
<dependencies>
25+
<dependency>
26+
<groupId>org.spigotmc</groupId>
27+
<artifactId>spigot</artifactId>
28+
<version>${spigotVersion}</version>
29+
<classifier>remapped-mojang</classifier>
30+
<scope>provided</scope>
31+
</dependency>
32+
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
<!-- Configures used Java version -->
37+
<plugin>
38+
<artifactId>maven-compiler-plugin</artifactId>
39+
<version>3.8.1</version>
40+
<configuration>
41+
<source>21</source>
42+
<target>21</target>
43+
</configuration>
44+
</plugin>
45+
<plugin>
46+
<artifactId>maven-clean-plugin</artifactId>
47+
</plugin>
48+
<plugin>
49+
<groupId>org.fugerit.java</groupId>
50+
<artifactId>freemarker-maven-plugin</artifactId>
51+
</plugin>
52+
<plugin>
53+
<artifactId>maven-resources-plugin</artifactId>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-shade-plugin</artifactId>
58+
<version>${mavenShade.version}</version>
59+
<executions>
60+
<execution>
61+
<phase>package</phase>
62+
<goals>
63+
<goal>shade</goal>
64+
</goals>
65+
<configuration>
66+
<artifactSet>
67+
<includes>
68+
<include>org.spigotmc:*</include>
69+
</includes>
70+
</artifactSet>
71+
<relocations>
72+
<relocation>
73+
<pattern>org.bukkit.craftbukkit.v${nmsVersion}</pattern>
74+
<shadedPattern>org.bukkit.craftbukkit</shadedPattern>
75+
</relocation>
76+
</relocations>
77+
</configuration>
78+
</execution>
79+
</executions>
80+
</plugin>
81+
</plugins>
82+
</build>
83+
</project>

‎platform/pcgf_pluginlib-platform-nms/pom_mojang_mapped.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
<module>pcgf_pluginlib-platform-nms_paper-1_21_R5</module>
9191
<module>pcgf_pluginlib-platform-nms_mm-1_21_R6</module>
9292
<module>pcgf_pluginlib-platform-nms_paper-1_21_R6</module>
93+
<module>pcgf_pluginlib-platform-nms_mm-1_21_R7</module>
94+
<module>pcgf_pluginlib-platform-nms_paper-1_21_R7</module>
9395
</modules>
9496
</profile>
9597
</profiles>

0 commit comments

Comments
 (0)