Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

update campfire to the latest 1.14.4 version on craftbukkit

Browse Source 
update pom.xml to use a repo with almost every single lib you would ever need since nallar has been down for a year
update maven command to fully skip tests propperly
update work/paper
This commit is contained in:
bradd evans
2019-12-20 16:58:56 +00:00
parent d1569d7502
commit 5c9567e797
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -210,8 +210,8 @@
</repository> </repository>
<!-- Akarin --> <!-- Akarin -->
<repository> <repository>
<id>nallar-repo</id> <id>piratescode</id>
<url>https://repo.nallar.me/</url> <url>https://nexus.piratescode.co.uk/</url>
</repository> </repository>
<repository> <repository>
<id>spongepowered-repo</id> <id>spongepowered-repo</id>

4
scripts/build.sh Normal file → Executable file
View File

@@ -35,7 +35,7 @@ echo "[Akarin] Ready to build"
\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/" \cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/"
\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/" \cp -rf "$basedir/src" "$paperbasedir/Paper-Server/"
\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/" \cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/"
mvn clean install -DskipTests mvn clean install -Dmaven.test.skip=true
else else
rm -rf Paper-API/src rm -rf Paper-API/src
rm -rf Paper-Server/src rm -rf Paper-Server/src
@@ -44,7 +44,7 @@ echo "[Akarin] Ready to build"
\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/" \cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/"
\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/" \cp -rf "$basedir/src" "$paperbasedir/Paper-Server/"
\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/" \cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/"
mvn clean install -DskipTests mvn clean install -Dmaven.test.skip=true
fi fi
minecraftversion=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) minecraftversion=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)

0
scripts/inst.sh Normal file → Executable file
View File

21
src/main/java/org/bukkit/craftbukkit/block/impl/CraftCampfire.java
View File

@@ -3,7 +3,7 @@
*/ */
package org.bukkit.craftbukkit.block.impl; package org.bukkit.craftbukkit.block.impl;
public final class CraftCampfire extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.Campfire, org.bukkit.block.data.Lightable, org.bukkit.block.data.Waterlogged { public final class CraftCampfire extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.Campfire, org.bukkit.block.data.Directional, org.bukkit.block.data.Lightable, org.bukkit.block.data.Waterlogged {
public CraftCampfire() { public CraftCampfire() {
super(); super();
@@ -27,6 +27,25 @@ public final class CraftCampfire extends org.bukkit.craftbukkit.block.data.Craft
set(SIGNAL_FIRE, signalFire); set(SIGNAL_FIRE, signalFire);
} }
// org.bukkit.craftbukkit.block.data.CraftDirectional
private static final net.minecraft.server.BlockStateEnum<?> FACING = getEnum(net.minecraft.server.BlockCampfire.class, "facing");
@Override
public org.bukkit.block.BlockFace getFacing() {
return get(FACING, org.bukkit.block.BlockFace.class);
}
@Override
public void setFacing(org.bukkit.block.BlockFace facing) {
set(FACING, facing);
}
@Override
public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
return getValues(FACING, org.bukkit.block.BlockFace.class);
}
// org.bukkit.craftbukkit.block.data.CraftLightable // org.bukkit.craftbukkit.block.data.CraftLightable
private static final net.minecraft.server.BlockStateBoolean LIT = getBoolean(net.minecraft.server.BlockCampfire.class, "lit"); private static final net.minecraft.server.BlockStateBoolean LIT = getBoolean(net.minecraft.server.BlockCampfire.class, "lit");

2
work/Paper

Submodule work/Paper updated: 10c29e7369...1c38436266