Fabric 1.20.4 (#3366)

This commit is contained in:
Jeroen Bollen 2024-01-07 10:39:06 +01:00 committed by GitHub
parent 23d2cc046e
commit fa1ec4f4f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions

View File

@ -36,6 +36,7 @@ public class Contributors {
new Contributor("Antonok", CODE), new Contributor("Antonok", CODE),
new Contributor("Argetan", CODE), new Contributor("Argetan", CODE),
new Contributor("Aurelien", CODE, LANG), new Contributor("Aurelien", CODE, LANG),
new Contributor("Binero", CODE),
new Contributor("BrainStone", CODE), new Contributor("BrainStone", CODE),
new Contributor("Catalina", LANG), new Contributor("Catalina", LANG),
new Contributor("Elguerrero", LANG), new Contributor("Elguerrero", LANG),

View File

@ -8,9 +8,9 @@ dependencies {
shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion" shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
minecraft "com.mojang:minecraft:1.20.2" minecraft "com.mojang:minecraft:1.20.4"
mappings "net.fabricmc:yarn:1.20.2+build.1:v2" mappings "net.fabricmc:yarn:1.20.4+build.3:v2"
modImplementation "net.fabricmc:fabric-loader:0.14.22" modImplementation "net.fabricmc:fabric-loader:0.15.2"
modImplementation('me.lucko:fabric-permissions-api:0.3-SNAPSHOT') modImplementation('me.lucko:fabric-permissions-api:0.3-SNAPSHOT')
// Fabric API // Fabric API
@ -24,7 +24,7 @@ dependencies {
] ]
apiModules.forEach { apiModules.forEach {
modImplementation(fabricApi.module(it, "0.89.1+1.20.2")) modImplementation(fabricApi.module(it, "0.91.2+1.20.4"))
} }
testImplementation project(path: ":common", configuration: 'testArtifacts') testImplementation project(path: ":common", configuration: 'testArtifacts')

View File

@ -48,7 +48,7 @@ public class FabricSensor implements ServerSensor<ServerWorld> {
//Returns the ticks per second of the last 100 ticks //Returns the ticks per second of the last 100 ticks
double totalTickLength = 0; double totalTickLength = 0;
int count = 0; int count = 0;
for (long tickLength : server.lastTickLengths) { for (long tickLength : server.getTickTimes()) {
if (tickLength == 0) continue; // Ignore uninitialized values in array if (tickLength == 0) continue; // Ignore uninitialized values in array
totalTickLength += Math.max(tickLength, TimeUnit.MILLISECONDS.toNanos(50)); totalTickLength += Math.max(tickLength, TimeUnit.MILLISECONDS.toNanos(50));
count++; count++;

View File

@ -45,7 +45,7 @@ public class FabricPlayerData implements PlatformPlayerData {
@Override @Override
public String getName() { public String getName() {
return player.getEntityName(); return player.getNameForScoreboard();
} }
@Override @Override

View File

@ -58,7 +58,7 @@ public abstract class ServerCommandSourceMixin implements CMDSender {
@Override @Override
public Optional<String> getPlayerName() { public Optional<String> getPlayerName() {
return getPlayer().map(ServerPlayerEntity::getEntityName); return getPlayer().map(ServerPlayerEntity::getNameForScoreboard);
} }
@Override @Override