Remove Mojang Profiler
This commit is contained in:
AlphaKR93
370
.gitignore
vendored
370
.gitignore
vendored
@@ -1,5 +1,4 @@
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/java,kotlin,jetbrains+all,gradle,git,visualstudiocode,eclipse,netbeans,macos,windows,linux,vim,maven
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=java,kotlin,jetbrains+all,gradle,git,visualstudiocode,eclipse,netbeans,macos,windows,linux,vim,maven
|
||||
# Generated from https://gitignore.io/
|
||||
|
||||
### Paperweight ###
|
||||
run/
|
||||
@@ -11,78 +10,9 @@ plazma-api/build.gradle.kts
|
||||
plazma-server/build.gradle.kts
|
||||
plazma-server/src/minecraft/
|
||||
|
||||
### Eclipse ###
|
||||
.metadata
|
||||
bin/
|
||||
tmp/
|
||||
*.tmp
|
||||
*.bak
|
||||
*.swp
|
||||
*~.nib
|
||||
local.properties
|
||||
.settings/
|
||||
.loadpath
|
||||
.recommenders
|
||||
|
||||
# External tool builders
|
||||
.externalToolBuilders/
|
||||
|
||||
# Locally stored "Eclipse launch configurations"
|
||||
*.launch
|
||||
|
||||
# PyDev specific (Python IDE for Eclipse)
|
||||
*.pydevproject
|
||||
|
||||
# CDT-specific (C/C++ Development Tooling)
|
||||
.cproject
|
||||
|
||||
# CDT- autotools
|
||||
.autotools
|
||||
|
||||
# Java annotation processor (APT)
|
||||
.factorypath
|
||||
|
||||
# PDT-specific (PHP Development Tools)
|
||||
.buildpath
|
||||
|
||||
# sbteclipse plugin
|
||||
.target
|
||||
|
||||
# Tern plugin
|
||||
.tern-project
|
||||
|
||||
# TeXlipse plugin
|
||||
.texlipse
|
||||
|
||||
# STS (Spring Tool Suite)
|
||||
.springBeans
|
||||
|
||||
# Code Recommenders
|
||||
.recommenders/
|
||||
|
||||
# Annotation Processing
|
||||
.apt_generated/
|
||||
.apt_generated_test/
|
||||
|
||||
# Scala IDE specific (Scala & Java development for Eclipse)
|
||||
.cache-main
|
||||
.scala_dependencies
|
||||
.worksheet
|
||||
|
||||
# Uncomment this line if you wish to ignore the project description file.
|
||||
# Typically, this file would be tracked if it contains build/dependency configurations:
|
||||
#.project
|
||||
|
||||
### Eclipse Patch ###
|
||||
# Spring Boot Tooling
|
||||
.sts4-cache/
|
||||
|
||||
### Git ###
|
||||
# Created by git for backups. To disable backups in Git:
|
||||
# $ git config --global mergetool.keepBackup false
|
||||
*.orig
|
||||
|
||||
# Created by git when using merge tools for conflicts
|
||||
*.orig
|
||||
*.BACKUP.*
|
||||
*.BASE.*
|
||||
*.LOCAL.*
|
||||
@@ -93,131 +23,120 @@ local.properties
|
||||
*_REMOTE_*.txt
|
||||
|
||||
### Java ###
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
replay_pid*
|
||||
|
||||
### JetBrains+all ###
|
||||
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||
# Kotlin DSL
|
||||
.kotlin/
|
||||
|
||||
### Gradle ###
|
||||
.gradle/
|
||||
build/
|
||||
|
||||
# Avoid ignore Gradle wrappper properties
|
||||
!gradle-wrapper.jar
|
||||
!gradle-wrapper.properties
|
||||
|
||||
# Cache of project
|
||||
.gradletasknamecache
|
||||
|
||||
# Java heap dump
|
||||
*.hprof
|
||||
|
||||
### Eclipse ###
|
||||
*.tmp
|
||||
*.bak
|
||||
*.swp
|
||||
*~.nib
|
||||
local.properties
|
||||
bin/
|
||||
tmp/
|
||||
.project/
|
||||
.metadata/
|
||||
.settings/
|
||||
.loadpath/
|
||||
.recommenders/
|
||||
|
||||
# External tool builders
|
||||
.externalToolBuilders/
|
||||
|
||||
# Locally stored "Eclipse launch configurations"
|
||||
*.launch
|
||||
|
||||
# JDT-specific (Eclipse Java Development Tools)
|
||||
.classpath
|
||||
|
||||
# Java annotation processor (APT)
|
||||
.factorypath
|
||||
|
||||
# Annotation Processing
|
||||
.apt_generated/
|
||||
.apt_generated_test/
|
||||
|
||||
### JetBrains ###
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
# User-specific stuff
|
||||
.idea/**/workspace.xml
|
||||
.idea/**/tasks.xml
|
||||
.idea/**/usage.statistics.xml
|
||||
.idea/**/dictionaries
|
||||
.idea/**/shelf
|
||||
|
||||
# AWS User-specific
|
||||
.idea/**/aws.xml
|
||||
|
||||
# Generated files
|
||||
.idea/**/contentModel.xml
|
||||
|
||||
# Sensitive or high-churn files
|
||||
.idea/**/dataSources/
|
||||
.idea/**/dataSources.ids
|
||||
.idea/**/dataSources.local.xml
|
||||
.idea/**/sqlDataSources.xml
|
||||
.idea/**/dynamic.xml
|
||||
.idea/**/uiDesigner.xml
|
||||
.idea/**/dbnavigator.xml
|
||||
|
||||
# Gradle
|
||||
.idea/**/gradle.xml
|
||||
.idea/**/libraries
|
||||
|
||||
# Gradle and Maven with auto-import
|
||||
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||
# since they will be recreated, and may cause churn. Uncomment if using
|
||||
# auto-import.
|
||||
# .idea/artifacts
|
||||
# .idea/compiler.xml
|
||||
# .idea/jarRepositories.xml
|
||||
# .idea/modules.xml
|
||||
# .idea/*.iml
|
||||
# .idea/modules
|
||||
# *.iml
|
||||
# *.ipr
|
||||
|
||||
# CMake
|
||||
cmake-build-*/
|
||||
|
||||
# Mongo Explorer plugin
|
||||
.idea/**/mongoSettings.xml
|
||||
|
||||
# File-based project format
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Cursive Clojure plugin
|
||||
.idea/replstate.xml
|
||||
|
||||
# SonarLint plugin
|
||||
.idea/sonarlint/
|
||||
|
||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||
com_crashlytics_export_strings.xml
|
||||
crashlytics.properties
|
||||
crashlytics-build.properties
|
||||
fabric.properties
|
||||
|
||||
# Editor-based Rest Client
|
||||
.idea/httpRequests
|
||||
|
||||
# Android studio 3.1+ serialized cache file
|
||||
.idea/caches/build_file_checksums.ser
|
||||
|
||||
### JetBrains+all Patch ###
|
||||
# Ignore everything but code style settings and run configurations
|
||||
# that are supposed to be shared within teams.
|
||||
|
||||
.idea/*
|
||||
.idea/
|
||||
|
||||
!.idea/codeStyles
|
||||
!.idea/runConfigurations
|
||||
|
||||
### Kotlin ###
|
||||
# Compiled class file
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# Log file
|
||||
# Fleet
|
||||
.fleet/
|
||||
|
||||
# BlueJ files
|
||||
### NetBeans ###
|
||||
**/nbproject/private/
|
||||
**/nbproject/Makefile-*.mk
|
||||
**/nbproject/Package-*.bash
|
||||
nbbuild/
|
||||
dist/
|
||||
nbdist/
|
||||
.nb-gradle/
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
### Vim ###
|
||||
# Swap
|
||||
[._]*.s[a-v][a-z]
|
||||
[._]*.sw[a-p]
|
||||
[._]s[a-rt-v][a-z]
|
||||
[._]ss[a-gi-z]
|
||||
[._]sw[a-p]
|
||||
|
||||
# Package Files #
|
||||
# Session
|
||||
Session.vim
|
||||
Sessionx.vim
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
# Temporary
|
||||
.netrwhist
|
||||
|
||||
# Auto-generated tag files
|
||||
tags
|
||||
|
||||
# Persistent undo
|
||||
[._]*.un~
|
||||
|
||||
### VisualStudioCode ###
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
!.vscode/*.code-snippets
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Ignore all local history of files
|
||||
.history
|
||||
.ionide
|
||||
|
||||
### Linux ###
|
||||
*~
|
||||
@@ -243,7 +162,6 @@ fabric.properties
|
||||
# Icon must end with two \r
|
||||
Icon
|
||||
|
||||
|
||||
# Thumbnails
|
||||
._*
|
||||
|
||||
@@ -263,78 +181,9 @@ Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
|
||||
### macOS Patch ###
|
||||
# iCloud generated files
|
||||
*.icloud
|
||||
|
||||
### Maven ###
|
||||
target/
|
||||
pom.xml.tag
|
||||
pom.xml.releaseBackup
|
||||
pom.xml.versionsBackup
|
||||
pom.xml.next
|
||||
release.properties
|
||||
dependency-reduced-pom.xml
|
||||
buildNumber.properties
|
||||
.mvn/timing.properties
|
||||
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
|
||||
.mvn/wrapper/maven-wrapper.jar
|
||||
|
||||
# Eclipse m2e generated files
|
||||
# Eclipse Core
|
||||
.project
|
||||
# JDT-specific (Eclipse Java Development Tools)
|
||||
.classpath
|
||||
|
||||
### NetBeans ###
|
||||
**/nbproject/private/
|
||||
**/nbproject/Makefile-*.mk
|
||||
**/nbproject/Package-*.bash
|
||||
build/
|
||||
nbbuild/
|
||||
dist/
|
||||
nbdist/
|
||||
.nb-gradle/
|
||||
|
||||
### Vim ###
|
||||
# Swap
|
||||
[._]*.s[a-v][a-z]
|
||||
!*.svg # comment out if you don't need vector files
|
||||
[._]*.sw[a-p]
|
||||
[._]s[a-rt-v][a-z]
|
||||
[._]ss[a-gi-z]
|
||||
[._]sw[a-p]
|
||||
|
||||
# Session
|
||||
Session.vim
|
||||
Sessionx.vim
|
||||
|
||||
# Temporary
|
||||
.netrwhist
|
||||
# Auto-generated tag files
|
||||
tags
|
||||
# Persistent undo
|
||||
[._]*.un~
|
||||
|
||||
### VisualStudioCode ###
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
!.vscode/*.code-snippets
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Built Visual Studio Code Extensions
|
||||
*.vsix
|
||||
|
||||
### VisualStudioCode Patch ###
|
||||
# Ignore all local history of files
|
||||
.history
|
||||
.ionide
|
||||
|
||||
### Windows ###
|
||||
# Windows thumbnail cache files
|
||||
Thumbs.db
|
||||
@@ -360,30 +209,3 @@ $RECYCLE.BIN/
|
||||
|
||||
# Windows shortcuts
|
||||
*.lnk
|
||||
|
||||
### Gradle ###
|
||||
.gradle
|
||||
**/build/
|
||||
!src/**/build/
|
||||
|
||||
# Ignore Gradle GUI config
|
||||
gradle-app.setting
|
||||
|
||||
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||
!gradle-wrapper.jar
|
||||
|
||||
# Avoid ignore Gradle wrappper properties
|
||||
!gradle-wrapper.properties
|
||||
|
||||
# Cache of project
|
||||
.gradletasknamecache
|
||||
|
||||
# Eclipse Gradle plugin generated files
|
||||
# Eclipse Core
|
||||
# JDT-specific (Eclipse Java Development Tools)
|
||||
|
||||
### Gradle Patch ###
|
||||
# Java heap dump
|
||||
*.hprof
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/java,kotlin,jetbrains+all,gradle,git,visualstudiocode,eclipse,netbeans,macos,windows,linux,vim,maven
|
||||
@@ -353,8 +353,53 @@ index 626e9feb6a6e7a2cbc7c63e30ba4fb6b923e85c7..22050e61506e1f3c2f4998ac1e3de4a3
|
||||
|
||||
return item;
|
||||
}
|
||||
diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
|
||||
index 97a70f372756e283810921ad39f4d0a7ba840afc..eb2316e5915e973675c75b4358d20f5ef4124503 100644
|
||||
--- a/net/minecraft/server/Main.java
|
||||
+++ b/net/minecraft/server/Main.java
|
||||
@@ -41,7 +41,7 @@ import net.minecraft.server.packs.repository.PackRepository;
|
||||
import net.minecraft.server.packs.repository.ServerPacksSource;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.util.datafix.DataFixers;
|
||||
-import net.minecraft.util.profiling.jfr.Environment;
|
||||
+//import net.minecraft.util.profiling.jfr.Environment; // Plazma - Remove isClientSide on DedicatedServer
|
||||
import net.minecraft.util.profiling.jfr.JvmProfiler;
|
||||
import net.minecraft.util.worldupdate.WorldUpgrader;
|
||||
import net.minecraft.world.flag.FeatureFlags;
|
||||
@@ -102,7 +102,7 @@ public class Main {
|
||||
|
||||
CrashReport.preload();
|
||||
if (optionSet.has("jfrProfile")) { // CraftBukkit
|
||||
- JvmProfiler.INSTANCE.start(Environment.SERVER);
|
||||
+ JvmProfiler.INSTANCE.start(/*Environment.SERVER*/); // Plazma - Remove isClientSide on DedicatedServer
|
||||
}
|
||||
|
||||
// Purpur start - Add toggle for enchant level clamping - load config files early
|
||||
diff --git a/net/minecraft/server/commands/JfrCommand.java b/net/minecraft/server/commands/JfrCommand.java
|
||||
index 5b32584379d946dc424c9d716fd0d9be5ddfdd64..cda646e0487087bd78a9bae64a2baa297e8f6094 100644
|
||||
--- a/net/minecraft/server/commands/JfrCommand.java
|
||||
+++ b/net/minecraft/server/commands/JfrCommand.java
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.commands.Commands;
|
||||
import net.minecraft.network.chat.ClickEvent;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.HoverEvent;
|
||||
-import net.minecraft.util.profiling.jfr.Environment;
|
||||
+//import net.minecraft.util.profiling.jfr.Environment; // Plazma - Remove isClientSide on DedicatedServer
|
||||
import net.minecraft.util.profiling.jfr.JvmProfiler;
|
||||
|
||||
public class JfrCommand {
|
||||
@@ -35,8 +35,7 @@ public class JfrCommand {
|
||||
}
|
||||
|
||||
private static int startJfr(CommandSourceStack source) throws CommandSyntaxException {
|
||||
- Environment environment = Environment.from(source.getServer());
|
||||
- if (!JvmProfiler.INSTANCE.start(environment)) {
|
||||
+ if (!JvmProfiler.INSTANCE.start()) { // Plazma - Remove isClientSide on DedicatedServer
|
||||
throw START_FAILED.create();
|
||||
} else {
|
||||
source.sendSuccess(() -> Component.translatable("commands.jfr.started"), false);
|
||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||
index bfc88babf6f3c1884713723d6094303550097363..7c2ce601dc60b100b47d050f5e3b525263ccd91e 100644
|
||||
index 1b983393fcb170829f981cf0ab1620d92c80ab1d..be4e3533590cd36bbed6f17f3be5941e70f40b8a 100644
|
||||
--- a/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -597,7 +597,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||
@@ -383,6 +428,101 @@ index 3ba4b970c3781ab89a60687ec41ffb1e6297c9f9..c3f9c65052713c177169a6367d2b5e30
|
||||
|
||||
@Deprecated
|
||||
@Override
|
||||
diff --git a/net/minecraft/util/profiling/jfr/Environment.java b/net/minecraft/util/profiling/jfr/Environment.java
|
||||
deleted file mode 100644
|
||||
index 2b27173c700dbd9f418d470ca5ce81eadf0bb8ce..0000000000000000000000000000000000000000
|
||||
--- a/net/minecraft/util/profiling/jfr/Environment.java
|
||||
+++ /dev/null
|
||||
@@ -1,22 +0,0 @@
|
||||
-package net.minecraft.util.profiling.jfr;
|
||||
-
|
||||
-import net.minecraft.server.MinecraftServer;
|
||||
-
|
||||
-public enum Environment {
|
||||
- CLIENT("client"),
|
||||
- SERVER("server");
|
||||
-
|
||||
- private final String description;
|
||||
-
|
||||
- private Environment(final String description) {
|
||||
- this.description = description;
|
||||
- }
|
||||
-
|
||||
- public static Environment from(MinecraftServer server) {
|
||||
- return server.isDedicatedServer() ? SERVER : CLIENT;
|
||||
- }
|
||||
-
|
||||
- public String getDescription() {
|
||||
- return this.description;
|
||||
- }
|
||||
-}
|
||||
diff --git a/net/minecraft/util/profiling/jfr/JfrProfiler.java b/net/minecraft/util/profiling/jfr/JfrProfiler.java
|
||||
index 5dfddd59f8f9ce4c5991e8e3ff14d6fdbdbbf6cb..29468480d9a0edf661bbfecfea7b8c3265b3f5ab 100644
|
||||
--- a/net/minecraft/util/profiling/jfr/JfrProfiler.java
|
||||
+++ b/net/minecraft/util/profiling/jfr/JfrProfiler.java
|
||||
@@ -97,7 +97,7 @@ public class JfrProfiler implements JvmProfiler {
|
||||
}
|
||||
|
||||
@Override
|
||||
- public boolean start(Environment environment) {
|
||||
+ public boolean start(/*Environment environment*/) { // Plazma - Remove isClientSide on DedicatedServer
|
||||
URL resource = JfrProfiler.class.getResource("/flightrecorder-config.jfc");
|
||||
if (resource == null) {
|
||||
LOGGER.warn("Could not find default flight recorder config at {}", "/flightrecorder-config.jfc");
|
||||
@@ -106,7 +106,7 @@ public class JfrProfiler implements JvmProfiler {
|
||||
try {
|
||||
boolean var4;
|
||||
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(resource.openStream()))) {
|
||||
- var4 = this.start(bufferedReader, environment);
|
||||
+ var4 = this.start(bufferedReader/*, environment*/); // Plazma - Remove isClientSide on DedicatedServer
|
||||
}
|
||||
|
||||
return var4;
|
||||
@@ -139,7 +139,7 @@ public class JfrProfiler implements JvmProfiler {
|
||||
return FlightRecorder.isAvailable();
|
||||
}
|
||||
|
||||
- private boolean start(Reader reader, Environment environment) {
|
||||
+ private boolean start(final Reader reader/*, Environment environment*/) { // Plazma - Remove isClientSide on DedicatedServer
|
||||
if (this.isRunning()) {
|
||||
LOGGER.warn("Profiling already in progress");
|
||||
return false;
|
||||
@@ -154,11 +154,11 @@ public class JfrProfiler implements JvmProfiler {
|
||||
recording.setDumpOnExit(true);
|
||||
recording.setToDisk(true);
|
||||
recording.setName(
|
||||
- String.format(Locale.ROOT, "%s-%s-%s", environment.getDescription(), SharedConstants.getCurrentVersion().getName(), string)
|
||||
+ String.format(Locale.ROOT, "server-%s-%s", SharedConstants.getCurrentVersion().getName(), string) // Plazma - Remove isClientSide on DedicatedServer
|
||||
);
|
||||
}
|
||||
);
|
||||
- Path path = Paths.get(String.format(Locale.ROOT, "debug/%s-%s.jfr", environment.getDescription(), string));
|
||||
+ Path path = Paths.get(String.format(Locale.ROOT, "debug/server-%s.jfr", string)); // Plazma - Remove isClientSide on DedicatedServer
|
||||
FileUtil.createDirectoriesSafe(path.getParent());
|
||||
this.recording.setDestination(path);
|
||||
this.recording.start();
|
||||
diff --git a/net/minecraft/util/profiling/jfr/JvmProfiler.java b/net/minecraft/util/profiling/jfr/JvmProfiler.java
|
||||
index 607e176893bbbf2d98f35c413d5d2de82fbe529d..85ca32441df08ac6f404cce6e549e4e1c46b065a 100644
|
||||
--- a/net/minecraft/util/profiling/jfr/JvmProfiler.java
|
||||
+++ b/net/minecraft/util/profiling/jfr/JvmProfiler.java
|
||||
@@ -21,7 +21,7 @@ public interface JvmProfiler {
|
||||
? JfrProfiler.getInstance()
|
||||
: new JvmProfiler.NoOpProfiler());
|
||||
|
||||
- boolean start(Environment environment);
|
||||
+ boolean start(/*Environment environment*/); // Plazma - Remove isClientSide on DedicatedServer
|
||||
|
||||
Path stop();
|
||||
|
||||
@@ -53,7 +53,7 @@ public interface JvmProfiler {
|
||||
static final ProfiledDuration noOpCommit = success -> {};
|
||||
|
||||
@Override
|
||||
- public boolean start(Environment environment) {
|
||||
+ public boolean start(/*Environment environment*/) { // Plazma - Remove isClientSide on DedicatedServer
|
||||
LOGGER.warn("Attempted to start Flight Recorder, but it's not supported on this JVM");
|
||||
return false;
|
||||
}
|
||||
diff --git a/net/minecraft/world/entity/AgeableMob.java b/net/minecraft/world/entity/AgeableMob.java
|
||||
index 179f4e4b9b1eb57f78bbb2f9fa34b11ea79b7a88..1c8c2e246b48c2e76e5805eb7ba4132e8699191c 100644
|
||||
--- a/net/minecraft/world/entity/AgeableMob.java
|
||||
@@ -6377,7 +6517,7 @@ index 8de482367f3d9d91048b7c85cbaefcda9f9fbcdc..05f1d1590d87c3548c724970eb82afda
|
||||
|
||||
public void setNextSpawnData(@Nullable Level level, BlockPos pos, SpawnData nextSpawnData) {
|
||||
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
|
||||
index d350909d37966ecb9e55bf7706b675a18c76e49d..a8375d783280a1b6635ca2bd1768553cdc3d023d 100644
|
||||
index d350909d37966ecb9e55bf7706b675a18c76e49d..df28a59ef9f233916d5d32aea7aa1b6bedb36a58 100644
|
||||
--- a/net/minecraft/world/level/Level.java
|
||||
+++ b/net/minecraft/world/level/Level.java
|
||||
@@ -126,7 +126,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
@@ -6445,37 +6585,23 @@ index d350909d37966ecb9e55bf7706b675a18c76e49d..a8375d783280a1b6635ca2bd1768553c
|
||||
this.updateNeighbourForOutputSignal(blockPos, newBlock.getBlock());
|
||||
}
|
||||
}
|
||||
@@ -1445,15 +1447,26 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
@@ -1445,6 +1447,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
this.playSeededSound(player, entity, BuiltInRegistries.SOUND_EVENT.wrapAsHolder(event), category, volume, pitch, this.threadSafeRandom.nextLong());
|
||||
}
|
||||
|
||||
- public void playLocalSound(BlockPos pos, SoundEvent sound, SoundSource category, float volume, float pitch, boolean distanceDelay) {
|
||||
+ // /* // Plazma - Remove isClientSide on DedicatedServer
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
||||
+ @io.papermc.paper.annotation.DoNotUse
|
||||
+ public void playLocalSound(BlockPos pos, SoundEvent sound, SoundSource category, float volume, float pitch, boolean distanceDelay) throws IOException {
|
||||
+ /* // Plazma - Remove isClientSide on DedicatedServer
|
||||
public void playLocalSound(BlockPos pos, SoundEvent sound, SoundSource category, float volume, float pitch, boolean distanceDelay) {
|
||||
this.playLocalSound(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, sound, category, volume, pitch, distanceDelay);
|
||||
}
|
||||
@@ -1454,6 +1457,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
|
||||
- public void playLocalSound(Entity entity, SoundEvent sound, SoundSource category, float volume, float pitch) {
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
||||
+ @io.papermc.paper.annotation.DoNotUse
|
||||
+ public void playLocalSound(Entity entity, SoundEvent sound, SoundSource category, float volume, float pitch) throws IOException {
|
||||
public void playLocalSound(double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch, boolean distanceDelay) {
|
||||
}
|
||||
|
||||
- public void playLocalSound(double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch, boolean distanceDelay) {
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
||||
+ @io.papermc.paper.annotation.DoNotUse
|
||||
+ public void playLocalSound(double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch, boolean distanceDelay) throws IOException {
|
||||
}
|
||||
+ // */ // Plazma - Remove isClientSide on DedicatedServer
|
||||
+ */ // Plazma - Remove isClientSide on DedicatedServer
|
||||
|
||||
@Override
|
||||
public void addParticle(ParticleOptions particleData, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) {
|
||||
@@ -1680,7 +1693,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
@@ -1680,7 +1684,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
if (this.isOutsideBuildHeight(pos)) {
|
||||
return null;
|
||||
} else {
|
||||
@@ -6484,7 +6610,7 @@ index d350909d37966ecb9e55bf7706b675a18c76e49d..a8375d783280a1b6635ca2bd1768553c
|
||||
? null
|
||||
: this.getChunkAt(pos).getBlockEntity(pos, LevelChunk.EntityCreationType.IMMEDIATE);
|
||||
}
|
||||
@@ -2037,9 +2050,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
@@ -2037,9 +2041,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
||||
return this.worldBorder;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,14 +1,5 @@
|
||||
--- a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
|
||||
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
|
||||
@@ -1059,7 +_,7 @@
|
||||
public void processUnloads() {
|
||||
TickThread.ensureTickThread("Cannot unload chunks off-main");
|
||||
|
||||
- if (BLOCK_TICKET_UPDATES.get() == Boolean.TRUE) {
|
||||
+ if (BLOCK_TICKET_UPDATES.get() == true) {
|
||||
throw new IllegalStateException("Cannot unload chunks recursively");
|
||||
}
|
||||
final int sectionShift = this.unloadQueue.coordinateShift; // sectionShift <= lock shift
|
||||
@@ -1306,12 +_,12 @@
|
||||
}
|
||||
|
||||
@@ -24,15 +15,6 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1330,7 +_,7 @@
|
||||
}
|
||||
|
||||
private boolean processTicketUpdates(final boolean processFullUpdates, List<ChunkProgressionTask> scheduledTasks) {
|
||||
- if (BLOCK_TICKET_UPDATES.get() == Boolean.TRUE) {
|
||||
+ if (BLOCK_TICKET_UPDATES.get() == true) {
|
||||
throw new IllegalStateException("Cannot update ticket level while unloading chunks or updating entity manager");
|
||||
}
|
||||
if (!PlatformHooks.get().allowAsyncTicketUpdates() && !TickThread.isTickThread()) {
|
||||
@@ -1358,7 +_,7 @@
|
||||
scheduledTasks, changedFullStatus
|
||||
);
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
--- a/net/minecraft/network/chat/Style.java
|
||||
+++ b/net/minecraft/network/chat/Style.java
|
||||
@@ -105,23 +_,23 @@
|
||||
}
|
||||
|
||||
public boolean isBold() {
|
||||
- return this.bold == Boolean.TRUE;
|
||||
+ return this.bold == true;
|
||||
}
|
||||
|
||||
public boolean isItalic() {
|
||||
- return this.italic == Boolean.TRUE;
|
||||
+ return this.italic == true;
|
||||
}
|
||||
|
||||
public boolean isStrikethrough() {
|
||||
- return this.strikethrough == Boolean.TRUE;
|
||||
+ return this.strikethrough == true;
|
||||
}
|
||||
|
||||
public boolean isUnderlined() {
|
||||
- return this.underlined == Boolean.TRUE;
|
||||
+ return this.underlined == true;
|
||||
}
|
||||
|
||||
public boolean isObfuscated() {
|
||||
- return this.obfuscated == Boolean.TRUE;
|
||||
+ return this.obfuscated == true;
|
||||
}
|
||||
|
||||
public boolean isEmpty() {
|
||||
@@ -39,7 +39,7 @@
|
||||
- return;
|
||||
+ // Plazma start - Branding
|
||||
+ System.out.println("""
|
||||
+ \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m█\033[38;2;205;27;135m█\033[38;2;202;28;136m█\033[38;2;199;30;136m█\033[38;2;196;31;137m╗\033[38;2;193;33;138m \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m╗\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m \033[38;2;164;45;144m \033[38;2;161;46;144m█\033[38;2;158;47;145m█\033[38;2;155;49;146m█\033[38;2;151;50;146m█\033[38;2;148;52;147m█\033[38;2;145;53;148m╗\033[38;2;142;54;148m \033[38;2;139;56;149m█\033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m█\033[38;2;116;65;153m╗ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m█\033[38;2;104;71;156m╗\033[38;2;101;72;157m \033[38;2;97;73;157m \033[38;2;94;75;158m \033[38;2;91;76;159m█\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m╗ \033[38;2;78;81;161m \033[38;2;75;83;162m█\033[38;2;72;84;163m█\033[38;2;69;86;163m█\033[38;2;66;87;164m█\033[38;2;62;88;165m█\033[38;2;59;90;165m╗\033[38;2;56;91;166m\\s
|
||||
+ \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m█\033[38;2;205;27;135m█\033[38;2;202;28;136m█\033[38;2;199;30;136m█\033[38;2;196;31;137m╗\033[38;2;193;33;138m \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m╗\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m \033[38;2;164;45;144m \033[38;2;161;46;144m█\033[38;2;158;47;145m█\033[38;2;155;49;146m█\033[38;2;151;50;146m█\033[38;2;148;52;147m█\033[38;2;145;53;148m╗\033[38;2;142;54;148m \033[38;2;139;56;149m█\033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m█\033[38;2;116;65;153m╗ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m█\033[38;2;104;71;156m╗\033[38;2;101;72;157m \033[38;2;97;73;157m \033[38;2;94;75;158m \033[38;2;91;76;159m█\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m╗ \033[38;2;78;81;161m \033[38;2;75;83;162m█\033[38;2;72;84;163m█\033[38;2;69;86;163m█\033[38;2;66;87;164m█\033[38;2;62;88;165m█\033[38;2;59;90;165m╗\033[38;2;56;91;166m\s
|
||||
+ \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m╔\033[38;2;205;27;135m═\033[38;2;202;28;136m═\033[38;2;199;30;136m█\033[38;2;196;31;137m█\033[38;2;193;33;138m╗ \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m╔\033[38;2;155;49;146m═\033[38;2;151;50;146m═\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m╗ \033[38;2;139;56;149m╚\033[38;2;135;57;149m═\033[38;2;132;58;150m═\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m╔\033[38;2;116;65;153m╝ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m█\033[38;2;104;71;156m█\033[38;2;101;72;157m╗\033[38;2;97;73;157m \033[38;2;94;75;158m█\033[38;2;91;76;159m█\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m╔\033[38;2;69;86;163m═\033[38;2;66;87;164m═\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m╗
|
||||
+ \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m█\033[38;2;205;27;135m█\033[38;2;202;28;136m█\033[38;2;199;30;136m█\033[38;2;196;31;137m╔\033[38;2;193;33;138m╝ \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m█\033[38;2;155;49;146m█\033[38;2;151;50;146m█\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m \033[38;2;135;57;149m \033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m╔\033[38;2;120;64;153m╝\033[38;2;116;65;153m \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m╔\033[38;2;104;71;156m█\033[38;2;101;72;157m█\033[38;2;97;73;157m█\033[38;2;94;75;158m█\033[38;2;91;76;159m╔\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m█\033[38;2;69;86;163m█\033[38;2;66;87;164m█\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
|
||||
+ \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m╔\033[38;2;205;27;135m═\033[38;2;202;28;136m═\033[38;2;199;30;136m═\033[38;2;196;31;137m╝\033[38;2;193;33;138m \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m╔\033[38;2;155;49;146m═\033[38;2;151;50;146m═\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m \033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m╔\033[38;2;123;62;152m╝\033[38;2;120;64;153m \033[38;2;116;65;153m \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m║\033[38;2;104;71;156m╚\033[38;2;101;72;157m█\033[38;2;97;73;157m█\033[38;2;94;75;158m╔\033[38;2;91;76;159m╝\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m╔\033[38;2;69;86;163m═\033[38;2;66;87;164m═\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
+ biomeProvider,
|
||||
+ env,
|
||||
+ (spigotConfig) -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())),
|
||||
+ () -> server.plazmaConfigurations.createWorldConfig(io.papermc.paper.configuration.Configurations.ContextMap.builder().put(io.papermc.paper.configuration.Configurations.WORLD_DIRECTORY, levelStorageAccess.levelDirectory.path()).put(io.papermc.paper.configuration.Configurations.WORLD_NAME, serverLevelData.getLevelName()).put(io.papermc.paper.configuration.Configurations.WORLD_KEY, dimension.location()).build()),
|
||||
+ () -> server.plazmaConfigurations.createWorldConfig(io.papermc.paper.configuration.Configurations.ContextMap.builder().put(io.papermc.paper.configuration.Configurations.WORLD_DIRECTORY, levelStorageAccess.levelDirectory.path()).put(io.papermc.paper.configuration.Configurations.WORLD_NAME, serverLevelData.getLevelName()).put(io.papermc.paper.configuration.Configurations.WORLD_KEY, dimension.location()).put(io.papermc.paper.configuration.Configurations.REGISTRY_ACCESS, server.registryAccess()).build()),
|
||||
+ dispatcher
|
||||
+ ); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
|
||||
+ // Plazma end - Configurable Plazma
|
||||
|
||||
@@ -13,3 +13,8 @@
|
||||
|
||||
@Override
|
||||
public int getSeaLevel() {
|
||||
@@ -812,4 +_,3 @@
|
||||
}
|
||||
// Paper end
|
||||
}
|
||||
-
|
||||
|
||||
Reference in New Issue
Block a user