9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-21 15:59:28 +00:00

Use timin.gs by default

This commit is contained in:
MartijnMuijsers
2022-12-01 17:27:21 +01:00
parent fd5551f54c
commit a616b367fd
111 changed files with 29 additions and 10 deletions

View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MartijnMuijsers <martijnmuijsers@live.nl>
Date: Thu, 1 Dec 2022 17:26:18 +0100
Subject: [PATCH] Use timin.gs by default
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..20bbb6473f7e8574bc52842e72c12ffb29c68d23 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart {
public class Timings extends ConfigurationPart.Post {
public boolean enabled = true;
public boolean verbose = true;
- public String url = "https://timings.aikar.co/";
+ public String url = "https://timin.gs/"; // Gale - use timin.gs by default
public boolean serverNamePrivacy = false;
public List<String> hiddenConfigEntries = List.of(
"database",

View File

@@ -30,7 +30,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..068ff7593dcf0ca1cd2b01a112dd15a7a43d9613 100644
index 20bbb6473f7e8574bc52842e72c12ffb29c68d23..81a7e10a0cb30e6c51c985afdc6a11e023b3e3d2 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -7,6 +7,7 @@ import net.kyori.adventure.text.Component;
@@ -59,7 +59,7 @@ index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..068ff7593dcf0ca1cd2b01a112dd15a7
+ public boolean warnIfEnabled = true;
+ // Gale end - recommend disabling timings on startup
public boolean verbose = true;
public String url = "https://timings.aikar.co/";
public String url = "https://timin.gs/"; // Gale - use timin.gs by default
public boolean serverNamePrivacy = false;
@@ -64,6 +69,13 @@ public class GlobalConfiguration extends ConfigurationPart {

View File

@@ -64,7 +64,7 @@ index 8818ca46af000926ed9eacb47953f440bdac1342..2bf1663dc1e969ea9e192c9941155eb9
int i = 29999999;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index e92a4fc4a503a420b09e5373a6c1f5d2d71d32d6..1a8e57b9891a8f54da6024284ba0ed0cb4562a23 100644
index e92a4fc4a503a420b09e5373a6c1f5d2d71d32d6..ef430bc8b0527b919c91361aa9ddefc8eb2386d8 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -43,6 +43,25 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -83,11 +83,11 @@ index e92a4fc4a503a420b09e5373a6c1f5d2d71d32d6..1a8e57b9891a8f54da6024284ba0ed0c
+ * Given in ticks.
+ * Any value <= 0 behaves like 1.
+ * <ul>
+ * <li><i>Default</i>: 20 (1 second)</li>
+ * <li><i>Default</i>: 100 (5 seconds)</li>
+ * <li><i>Vanilla</i>: 1</li>
+ * </ul>
+ */
+ public int increaseTimeStatistics = 20;
+ public int increaseTimeStatistics = 100;
+ // Gale end - Hydrinity - increase time statistics in intervals
+
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index f6b9c9c55effdc169d8226308b3163bc5c54b3ed..cb4b8628413f019621e07144f02e8d4738b21eff 100644
index f6b9c9c55effdc169d8226308b3163bc5c54b3ed..dbba8559117287932e7e400f03cd80ac7418c004 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1195,9 +1195,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -15,13 +15,13 @@ index f6b9c9c55effdc169d8226308b3163bc5c54b3ed..cb4b8628413f019621e07144f02e8d47
this.tryCheckInsideBlocks();
+ // Gale start - skip negligible planar movement multiplication
+ Vec3 oldDeltaMovement = this.getDeltaMovement();
+ if (oldDeltaMovement.x < -1e-7 || oldDeltaMovement.x > 1e-7 || oldDeltaMovement.z < -1e-7 || oldDeltaMovement.z > 1e-7) {
+ if (oldDeltaMovement.x < -1e-6 || oldDeltaMovement.x > 1e-6 || oldDeltaMovement.z < -1e-6 || oldDeltaMovement.z > 1e-6) {
+ // Gale end - skip negligible planar movement multiplication
float f2 = this.getBlockSpeedFactor();
- this.setDeltaMovement(this.getDeltaMovement().multiply((double) f2, 1.0D, (double) f2));
+ // Gale start - skip negligible planar movement multiplication
+ if (f2 < 1 - 1e-7 || f2 > 1 + 1e-7) {
+ if (f2 < 1 - 1e-6 || f2 > 1 + 1e-6) {
+ this.setDeltaMovement(oldDeltaMovement.multiply(f2, 1.0D, f2));
+ }
+ }

Some files were not shown because too many files have changed in this diff Show More