Skip to content

Commit

Permalink
1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Fallen-Breath committed Dec 4, 2024
1 parent 35b959e commit 79fbe2b
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;

//#if MC >= 12104
//$$ import java.util.function.BiConsumer;
//#endif

//#if MC >= 12002
//$$ import org.spongepowered.asm.mixin.injection.ModifyArg;
//$$ import java.util.function.Consumer;
Expand Down Expand Up @@ -65,7 +69,9 @@ private static boolean fakePlayerRejoin_disableFixerOnRejoin(EntityPlayerMPFake
//$$ method = "createFake",
//$$ at = @At(
//$$ value = "INVOKE",
//$$ //#if MC >= 12005
//$$ //#if MC >= 12104
//$$ //$$ target = "Ljava/util/concurrent/CompletableFuture;whenCompleteAsync(Ljava/util/function/BiConsumer;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;",
//$$ //#elseif MC >= 12005
//$$ //$$ target = "Ljava/util/concurrent/CompletableFuture;thenAcceptAsync(Ljava/util/function/Consumer;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;",
//$$ //#else
//$$ target = "Ljava/util/concurrent/CompletableFuture;thenAccept(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;",
Expand All @@ -74,17 +80,29 @@ private static boolean fakePlayerRejoin_disableFixerOnRejoin(EntityPlayerMPFake
//$$ ),
//$$ remap = true
//$$ )
//$$ //#if MC >= 12104
//$$ //$$ private static <T> BiConsumer<? super T, ? super Throwable> fakePlayerRejoin_forwardTheFlag(BiConsumer<? super T, ? super Throwable> action)
//$$ //#else
//$$ private static <T> Consumer<? super T> fakePlayerRejoin_forwardTheFlag(Consumer<? super T> action)
//$$ //#endif
//$$ {
//$$ boolean isRejoin = FakePlayerRejoinHelper.isRejoin.get();
//$$ //#if MC >= 12104
//$$ //$$ return (value, t) -> {
//$$ //#else
//$$ return value -> {
//$$ //#endif
//$$ if (isRejoin)
//$$ {
//$$ FakePlayerRejoinHelper.isRejoin.set(true);
//$$ }
//$$ try
//$$ {
//$$ //#if MC >= 12104
//$$ //$$ action.accept(value, t);
//$$ //#else
//$$ action.accept(value);
//$$ //#endif
//$$ }
//$$ finally
//$$ {
Expand Down
20 changes: 10 additions & 10 deletions versions/1.21.4/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Fabric Properties
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.4-rc3
minecraft_version=1.21.4-rc3
yarn_mappings=1.21.4-rc3+build.3
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.4
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.1

# Fabric Mod Metadata
carpet_dependency=>=1.4.159
minecraft_dependency=>=1.21.4-
carpet_dependency=>=1.4.161
minecraft_dependency=>=1.21.4 1.21.x
lithium_confliction=<0.14.0

# Build Information
# The target mc versions for the mod during mod publishing, separated with \n
game_versions=1.21.4-rc3
game_versions=1.21.4

# Mod Dependency
# check available versions on maven for the given minecraft version you are using
# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version=24w46a-1.4.160+v241113
carpet_core_version=1.21.4-1.4.161+v241203

# Lithium mc1.21.3-0.14.2 for Fabric
# https://www.curseforge.com/minecraft/mc-mods/lithium/files/5909378
lithium_dependency=curse.maven:lithium-360438:5909378
# Lithium mc1.21.4-0.14.3 for Fabric
# https://www.curseforge.com/minecraft/mc-mods/lithium/files/5959998
lithium_dependency=curse.maven:lithium-360438:5959998

0 comments on commit 79fbe2b

Please sign in to comment.