Skip to content

Commit

Permalink
Rebase (#41)
Browse files Browse the repository at this point in the history 
* added 1.18.2 Support (#39)

* Fix ClassLookups not being setup (#40)

Co-authored-by: SyntaxJason <[email protected]>
  • Loading branch information
@Lauriichan @SyntaxJason
Lauriichan and SyntaxJason committed Jun 23, 2022
1 parent 839f060 commit 86931bc
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 68 deletions.
5 changes: 4 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat-parent</artifactId>
<version>3.0.4</version>
<version>3.0.5</version>
<packaging>pom</packaging>

<distributionManagement>
Expand Down Expand Up @@ -91,6 +91,9 @@
<module>vcompat-1_17_R1</module>
<module>vcompat-1_18_R1</module>
<module>vcompat-1_18_R2</module>
<<<<<<< HEAD
<module>vcompat-1_19_R1</module>
=======
>>>>>>> ef8c634 (Rebase (#41))
</modules>
</project>
2 changes: 1 addition & 1 deletion scripts/data/mappings.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.17.1
1.18.1
1.18.2
1.19
1.19
2 changes: 1 addition & 1 deletion scripts/data/servers.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
1.17.1
1.18.1
1.18.2
1.19
1.19
8 changes: 3 additions & 5 deletions vcompat-1_17_R1/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat-parent</artifactId>
<version>3.0.5</version>
<version>3.0.5</version>
</parent>
<artifactId>vcompat-1_17_R1</artifactId>

Expand All @@ -19,7 +17,7 @@
<dependency>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat-api</artifactId>
<version>${project.parent.version}</version>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
8 changes: 3 additions & 5 deletions vcompat-1_18_R1/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat-parent</artifactId>
<version>3.0.5</version>
<version>3.0.5</version>
</parent>
<artifactId>vcompat-1_18_R1</artifactId>

Expand Down Expand Up @@ -59,7 +57,7 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
8 changes: 3 additions & 5 deletions vcompat-1_18_R2/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat-parent</artifactId>
<version>3.0.5</version>
<version>3.0.5</version>
</parent>
<artifactId>vcompat-1_18_R2</artifactId>

Expand Down Expand Up @@ -65,7 +63,7 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
5 changes: 5 additions & 0 deletions ...java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,13 @@ private final void update(boolean flag) {
properties.put("textures", new Property("textures", skin.getValue(), skin.getSignature()));
}

<<<<<<< HEAD
String name = dataAdapter.get("name", WrapType.STRING);
if (name != null && !name.isBlank()) {
=======
String name = getName();
if (name != null) {
>>>>>>> ef8c634 (Rebase (#41))
VersionCompatProvider.get().getLookupProvider().getLookup("mjGameProfile").setFieldValue(profile, "name", name);
}

Expand Down
100 changes: 50 additions & 50 deletions vcompat-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
</parent>
<artifactId>vcompat</artifactId>

<dependencies>
<dependencies>

<!-- vCompat Api -->
<!-- vCompat Api -->

<dependency>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat-api</artifactId>
<version>${project.parent.version}</version>
</dependency>

<!-- vCompat Versions -->
<!-- vCompat Versions -->

<dependency>
<groupId>net.sourcewriters.minecraft</groupId>
Expand Down Expand Up @@ -46,46 +46,46 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com.syntaxphoenix.syntaxapi</pattern>
<shadedPattern>net.sourcewriters.minecraft.vcompat.shaded.syntaxapi</shadedPattern>
</relocation>
</relocations>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M2</version>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com.syntaxphoenix.syntaxapi</pattern>
<shadedPattern>net.sourcewriters.minecraft.vcompat.shaded.syntaxapi</shadedPattern>
</relocation>
</relocations>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M2</version>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 86931bc

Please sign in to comment.