icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

22w03a

Browse Source
This commit is contained in:
gnembon committed 2022-01-20 00:20:52 +01:00
1 parent 5f8bb863aa
commit f469810fbc
7 files changed
+12 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+3 -3
View File
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html
minecraft_version=1.18.1
yarn_mappings=1.18.1+build.22
minecraft_version=22w03a
yarn_mappings=22w03a+build.1
loader_version=0.12.12
fabric_version=0.46.1+1.18
@@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx1G
# The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5)
# This is needed because CF uses too vague names for prereleases and release candidates
# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
release-curse-versions = 1.18.1
release-curse-versions = 1.18.2
# Whether or not to build another branch on release
release-extra-branch = false
# The name of the second branch to release
src/main/java/carpet/mixins/CommandManagerMixin.java
+2 -2
View File
@@ -5,7 +5,7 @@ import carpet.CarpetSettings;
import com.mojang.brigadier.CommandDispatcher;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import org.apache.logging.log4j.Logger;
import org.slf4j.Logger;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@@ -46,7 +46,7 @@ public abstract class CommandManagerMixin
@SuppressWarnings("UnresolvedMixinReference")
@Redirect(method = "execute", at = @At(
value = "INVOKE",
target = "Lorg/apache/logging/log4j/Logger;isDebugEnabled()Z"
target = "Lorg/slf4j/Logger;isDebugEnabled()Z"
),
require = 0
)
src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
+3 -3
View File
@@ -12,7 +12,7 @@ import net.minecraft.util.profiler.ProfileResult;
import net.minecraft.util.profiler.Profiler;
import net.minecraft.util.thread.ReentrantThreadExecutor;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.Logger;
import org.slf4j.Logger;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@@ -193,7 +193,7 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantThreadExec
@Inject(method = "tick", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/server/MinecraftServer;method_39218(ZZZ)Z", // save
target = "Lnet/minecraft/server/MinecraftServer;saveAll(ZZZ)Z", // save
shift = At.Shift.BEFORE
))
private void startAutosave(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
@@ -203,7 +203,7 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantThreadExec
@Inject(method = "tick", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/server/MinecraftServer;method_39218(ZZZ)Z",
target = "Lnet/minecraft/server/MinecraftServer;saveAll(ZZZ)Z",
shift = At.Shift.AFTER
))
private void finishAutosave(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java
-21
View File
@@ -1,21 +0,0 @@
package carpet.mixins;
import carpet.CarpetSettings;
import net.minecraft.world.gen.heightprovider.TrapezoidHeightProvider;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(TrapezoidHeightProvider.class)
public class TrapezoidHeightProvider_cleanLogsMixin {
@SuppressWarnings("UnresolvedMixinReference")
@Redirect(method = "get",
at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V")
)
private void skipLogs(Logger logger, String message, Object p0)
{
if (!CarpetSettings.cleanLogs) logger.warn(message, p0);
}
}
src/main/java/carpet/mixins/VeryBiasedToBottomHeightProvider_cleanLogsMixin.java
-21
View File
@@ -1,21 +0,0 @@
package carpet.mixins;
import carpet.CarpetSettings;
import net.minecraft.world.gen.heightprovider.VeryBiasedToBottomHeightProvider;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(VeryBiasedToBottomHeightProvider.class)
public class VeryBiasedToBottomHeightProvider_cleanLogsMixin {
//@SuppressWarnings("UnresolvedMixinReference")
@Redirect(method = "get",
at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V")
)
private void skipLogs(Logger logger, String message, Object p0)
{
if (!CarpetSettings.cleanLogs) logger.warn(message, p0);
}
}
src/main/java/carpet/script/api/Auxiliary.java
+4 -1
View File
@@ -650,7 +650,10 @@ public class Auxiliary {
ServerCommandSource s = ((CarpetContext)c).s;
s.getServer().getPlayerManager().saveAllPlayerData();
s.getServer().save(true,true,true);
s.getWorld().getChunkManager().tick(() -> true);
for (ServerWorld world : s.getServer().getWorlds())
{
world.getChunkManager().tick(() -> true, false);
}
CarpetScriptServer.LOG.warn("Saved chunks");
return Value.TRUE;
});
src/main/resources/carpet.mixins.json
-3
View File
@@ -221,9 +221,6 @@
"EndGatewayBlockEntity_creativeNoClipMixin",
"LivingEntity_creativeFlyMixin",
"VeryBiasedToBottomHeightProvider_cleanLogsMixin",
"TrapezoidHeightProvider_cleanLogsMixin",
"World_updateSuppressionCrashFixMixin",
"MinecraftServer_updateSuppressionCrashFixMixin",
"ServerPlayerEntity_updateSuppressionCrashFixMixin"