Archiviert
13
0

Use paperclip.properties so CI can work

Dieser Commit ist enthalten in:
Aikar 2016-03-30 21:27:13 -04:00
Ursprung 3a653d5605
Commit fb74f6dbfd
6 geänderte Dateien mit 33 neuen und 17 gelöschten Zeilen

1
.gitignore vendored
Datei anzeigen

@ -49,3 +49,4 @@ Paperclip
Paperclip.jar
paperclip.jar
paperclip-*.jar
paperclip.properties

@ -1 +1 @@
Subproject commit 9bb246f7f19963ef91e22af3e05a315ee5e5e746
Subproject commit 6bff72410effad0b2b0b0d8471a477f42bd484ff

Datei anzeigen

@ -1,11 +1,11 @@
From b068b16c1082061d7c28b75c62f3233b7c5b4713 Mon Sep 17 00:00:00 2001
From 99e0482b0bdb8105b8a6d5a6220ece2edcc25190 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index d775f7b..b01ebdf 100644
index d775f7b..8899e3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -54,10 +54,11 @@ index d775f7b..b01ebdf 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -93,34 +94,21 @@
@@ -93,34 +94,22 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
+ <finalName>paper-${minecraft.version}</finalName>
+ <defaultGoal>clean install</defaultGoal> <!-- Paper -->
<plugins>
<plugin>
@ -99,7 +100,7 @@ index d775f7b..b01ebdf 100644
</goals>
</execution>
</executions>
@@ -130,11 +118,12 @@
@@ -130,11 +119,12 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
@ -113,7 +114,7 @@ index d775f7b..b01ebdf 100644
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
@@ -164,26 +153,6 @@
@@ -164,26 +154,6 @@
</configuration>
</plugin>
<plugin>
@ -140,7 +141,7 @@ index d775f7b..b01ebdf 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
@@ -194,6 +163,7 @@
@@ -194,6 +164,7 @@
<goal>shade</goal>
</goals>
<configuration>
@ -148,7 +149,7 @@ index d775f7b..b01ebdf 100644
<relocations>
<relocation>
<pattern>joptsimple</pattern>
@@ -232,20 +202,6 @@
@@ -232,20 +203,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<!-- versions after this appear to be broken -->
<version>3.1</version>

Datei anzeigen

@ -1,4 +1,4 @@
From 9588a00f0ac51c242d71abc1d9b9c43f905d5f14 Mon Sep 17 00:00:00 2001
From 6c59912ddf9adcda60b7bd1f59ac2624b4674946 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 30 Mar 2016 19:36:20 -0400
Subject: [PATCH] MC Dev fixes
@ -83,6 +83,19 @@ index 156922a..f2feee5 100644
return this.a((ICommand) object);
}
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
index f5bcbdb..3190cad 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
@@ -20,7 +20,7 @@ public class ItemFactoryTest extends AbstractTestingBase {
@Test
public void testKnownAttributes() throws Throwable {
- final ZipInputStream nmsZipStream = new ZipInputStream(CommandAbstract.class/* Magic class that isn't imported! */.getProtectionDomain().getCodeSource().getLocation().openStream());
+ final ZipInputStream nmsZipStream = new ZipInputStream(net.minecraft.server.HttpUtilities.class/* Magic class that isn't imported! */.getProtectionDomain().getCodeSource().getLocation().openStream()); // Paper
final Collection<String> names = new HashSet<String>();
for (ZipEntry clazzEntry; (clazzEntry = nmsZipStream.getNextEntry()) != null; ) {
final String entryName = clazzEntry.getName();
--
2.8.0

11
init.sh
Datei anzeigen

@ -2,12 +2,17 @@
PS1="$"
basedir=`pwd`
workdir=$basedir/work
workdir="$basedir/work"
minecraftversion=$(cat BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
decompiledir=$workdir/$minecraftversion
nms=$decompiledir/net/minecraft/server
decompiledir="$workdir/$minecraftversion"
nms="$decompiledir/net/minecraft/server"
cb=src/main/java/net/minecraft/server
paperjar="$basedir/Paper-Server/target/paper-${minecraftversion}.jar"
vanillajar="${decompiledir}/${minecraftversion}.jar"
echo -e "mcver=${minecraftversion}\npaperjar=${paperjar}\nvanillajar=${vanillajar}" > paperclip.properties
patch=$(which patch 2>/dev/null)
if [ "x$patch" == "x" ]; then
patch=$basedir/hctap.exe

Datei anzeigen

@ -2,13 +2,9 @@
basedir=`pwd`
workdir=$basedir/work
mcver=$(cat BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$mcver"
paperjar="$basedir/$(ls ./Paper-Server/target/paper*-SNAPSHOT.jar)"
vanillajar="${decompiledir}/${mcver}.jar"
cd ./Paperclip
mvn clean package -Dmcver=${mcver} -Dpaperjar="${paperjar}" -Dvanillajar="${vanillajar}"
mvn clean package
cd ..
cp ./Paperclip/target/paperclip-${mcver}.jar ./paperclip.jar