mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-25 09:12:02 -07:00
Use paperclip.properties so CI can work
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -49,3 +49,4 @@ Paperclip
|
||||
Paperclip.jar
|
||||
paperclip.jar
|
||||
paperclip-*.jar
|
||||
paperclip.properties
|
Submodule Paperclip updated: 9bb246f7f1...6bff72410e
@@ -83,4 +83,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
|
||||
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
|
||||
@@ -0,0 +0,0 @@ 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();
|
||||
--
|
@@ -58,6 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
|
||||
<!-- 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>
|
||||
|
11
init.sh
11
init.sh
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user