firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[CHORE] Backport from 1.20.3

Browse Source
This commit is contained in:
HypherionSA
2024-01-02 00:04:27 +02:00
parent 98d3a60bc8
commit dfa8a3d55f
27 changed files with 38 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/build.gradle
View File

@@ -2,7 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
implementation "com.hypherionmc:rpcsdk:1.0"
implementation("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
implementation("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
}
shadowJar {
@@ -10,7 +10,7 @@ shadowJar {
dependencies {
include(dependency("me.hypherionmc.moon-config:core:${moon_config}"))
include(dependency("me.hypherionmc.moon-config:toml:${moon_config}"))
include(dependency("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0"))
include(dependency("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0"))
relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'

5
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java
View File

@@ -6,6 +6,7 @@ import net.minecraft.client.gui.components.AbstractButton;
import net.minecraft.client.gui.narration.NarratedElementType;
import net.minecraft.client.gui.narration.NarrationElementOutput;
import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.NotNull;
/**
* @author HypherionSA
@@ -22,7 +23,7 @@ public class InternalConfigButton extends AbstractButton {
}
@Override
protected void renderWidget(GuiGraphics arg, int i, int j, float f) {
public void render(@NotNull GuiGraphics poseStack, int i, int j, float f) {
if (cancel) {
setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
} else {
@@ -30,7 +31,7 @@ public class InternalConfigButton extends AbstractButton {
active = screen.isEdited() && !hasErrors;
setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
}
super.renderWidget(arg, i, j, f);
super.render(poseStack, i, j, f);
}
@Override

10
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
View File

@@ -9,28 +9,28 @@ import net.minecraft.commands.Commands;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Commands.class)
public class CommandMixin {
@Inject(method = "performCommand",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/commands/Commands;finishParsing(Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;Lnet/minecraft/commands/CommandSourceStack;)Lcom/mojang/brigadier/context/ContextChain;",
target = "Lcom/mojang/brigadier/CommandDispatcher;execute(Lcom/mojang/brigadier/ParseResults;)I",
shift = At.Shift.BEFORE
), cancellable = true
)
private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfo ci) {
private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfoReturnable<Integer> cir) {
CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command);
CraterEventBus.INSTANCE.postEvent(commandEvent);
if (commandEvent.wasCancelled()) {
ci.cancel();
cir.setReturnValue(1);
return;
}
if (commandEvent.getException() != null) {
Throwables.throwIfUnchecked(commandEvent.getException());
ci.cancel();
cir.setReturnValue(1);
}
}