fix NMSBridgeImpl register

tanyaofei · Jul 6, 2024 · 107598b · 107598b
1 parent fdbbd65
commit 107598b
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -128,4 +128,6 @@ fabric.properties
 /purpur/
 /server
 
-buildtool/
+buildtool/
+
+.flattened-pom.xml
diff --git a/fakeplayer-api/pom.xml b/fakeplayer-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.hello09x.fakeplayer</groupId>
         <artifactId>fakeplayer-parent</artifactId>
-        <version>1.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>fakeplayer-api</artifactId>

diff --git a/fakeplayer-core/pom.xml b/fakeplayer-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.hello09x.fakeplayer</groupId>
         <artifactId>fakeplayer-parent</artifactId>
-        <version>1.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>fakeplayer-core</artifactId>

diff --git a/fakeplayer-core/src/main/resources/plugin.yml b/fakeplayer-core/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: fakeplayer
-version: '${plugin.version}'
+version: '${revision}'
 main: io.github.hello09x.fakeplayer.core.Main
 api-version: '1.20'
 author: hello09x

diff --git a/fakeplayer-dist/pom.xml b/fakeplayer-dist/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.hello09x.fakeplayer</groupId>
         <artifactId>fakeplayer-parent</artifactId>
-        <version>1.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>fakeplayer-dist</artifactId>
@@ -38,7 +38,7 @@
 
     <build>
         <directory>../target</directory>
-        <finalName>fakeplayer-${plugin.version}</finalName>
+        <finalName>fakeplayer-${revision}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -75,7 +75,7 @@
                             <target>
                                 <copy todir="../server/plugins">
                                     <fileset dir="${project.build.directory}">
-                                        <include name="fakeplayer-${plugin.version}.jar"/>
+                                        <include name="fakeplayer-${revision}.jar"/>
                                     </fileset>
                                 </copy>
                             </target>

diff --git a/fakeplayer-v1_21_R1/pom.xml b/fakeplayer-v1_21_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.hello09x.fakeplayer</groupId>
         <artifactId>fakeplayer-parent</artifactId>
-        <version>1.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>fakeplayer-v1_21_R1</artifactId>
@@ -54,6 +54,31 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>net.md-5</groupId>
                 <artifactId>specialsource-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.hello09x.fakeplayer</groupId>
     <artifactId>fakeplayer-parent</artifactId>
-    <version>1.0.0</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <name>fakeplayer-parent</name>
@@ -20,7 +20,7 @@
     <properties>
         <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <plugin.version>0.3.2</plugin.version>
+        <revision>0.3.3</revision>
     </properties>
 
     <repositories>
@@ -85,19 +85,19 @@
             <dependency>
                 <groupId>io.github.hello09x.fakeplayer</groupId>
                 <artifactId>fakeplayer-api</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.github.hello09x.fakeplayer</groupId>
                 <artifactId>fakeplayer-core</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.github.hello09x.fakeplayer</groupId>
                 <artifactId>fakeplayer-v1_21_R1</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <dependency>