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

revert some stuff

Browse Source
This commit is contained in:
LegacyGamerHD
2021-02-04 09:14:28 +01:00
parent 21d24bdfa5
commit 433e18e7d2
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build.sh
View File

@@ -36,7 +36,7 @@ echo "[Akarin] Ready to build"
else
rm -rf Paper-API/src
rm -rf Paper-Server/src
./paper jar
./paper patch
\cp -rf "$basedir/sources/src" "$paperbasedir/Paper-Server/"
\cp -rf "$basedir/sources/pom.xml" "$paperbasedir/Paper-Server/"
mvn clean install
@@ -51,4 +51,4 @@ echo "[Akarin] Ready to build"
echo "[Akarin] Migrated final jar to $basedir/akarin-$minecraftversion.jar"
)
)
)

20
sources/pom.xml
View File

@@ -1,4 +1,4 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>akarin</artifactId>
@@ -18,7 +18,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<parent>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-parent</artifactId>
@@ -26,6 +26,7 @@
</parent>
<dependencies>
<!-- bugfixes (netty#6607) -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
@@ -42,7 +43,7 @@
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper</artifactId>
<version>${minecraft.version}-R0.1-SNAPSHOT</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
@@ -68,6 +69,7 @@
<version>3.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.minecrell</groupId>
<artifactId>terminalconsoleappender</artifactId>
@@ -105,7 +107,7 @@
<artifactId>log4j-iostreams</artifactId>
<version>2.8.1</version>
</dependency>
<!-- Paper - Async loggers -->
<dependency>
<groupId>com.lmax</groupId>
@@ -118,7 +120,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -127,13 +129,13 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<!-- Akarin -->
<!-- Akarin -->
<dependency>
<groupId>io.akarin</groupId>
<artifactId>legacylauncher</artifactId>
<version>1.26</version>
</dependency>
</dependency>
<dependency>
<groupId>org.spongepowered</groupId>
<artifactId>mixin</artifactId>
@@ -182,7 +184,7 @@
</pluginRepository>
</pluginRepositories>
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
<finalName>akarin-${minecraft.version}</finalName>
<defaultGoal>clean install</defaultGoal> <!-- Paper -->

6
sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java
View File

@@ -60,12 +60,12 @@ public abstract class MixinMinecraftServer {
))
private void prerun(CallbackInfo info) {
primaryThread.setPriority(AkarinGlobalConfig.primaryThreadPriority < Thread.NORM_PRIORITY ? Thread.NORM_PRIORITY :
(AkarinGlobalConfig.primaryThreadPriority > Thread.MAX_PRIORITY ? 10 : AkarinGlobalConfig.primaryThreadPriority));
(AkarinGlobalConfig.primaryThreadPriority > Thread.MAX_PRIORITY ? 10 : AkarinGlobalConfig.primaryThreadPriority));
Akari.resizeTickExecutors((cachedWorldSize = worlds.size()));
for (int i = 0; i < worlds.size(); ++i) {
for (int i = 0; i < worlds.size(); ++i) {
WorldServer world = worlds.get(i);
// TileEntityHopper.skipHopperEvents = world.paperConfig.disableHopperMoveEvents || InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0;
TileEntityHopper.skipHopperEvents = world.paperConfig.disableHopperMoveEvents || InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0;
}
AkarinSlackScheduler.get().boot();
}