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:51:14 +02:00
parent d97e6df36e
commit 9c05bec9a0
27 changed files with 150 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Common/src/main/java/com/hypherionmc/craterlib/api/event/server/MessageBroadcastEvent.java
View File

@@ -1,20 +1,20 @@
package com.hypherionmc.craterlib.api.event.server;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import java.util.function.Function;
import java.util.UUID;
public class MessageBroadcastEvent extends CraterEvent {
private final Component component;
private final Function<ServerPlayer, Component> function;
private final boolean bl;
private final UUID uuid;
private final ChatType bl;
public MessageBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl) {
public MessageBroadcastEvent(Component component, UUID uuid, ChatType bl) {
this.component = component;
this.function = function;
this.uuid = uuid;
this.bl = bl;
}
@@ -22,12 +22,12 @@ public class MessageBroadcastEvent extends CraterEvent {
return component;
}
public boolean isBl() {
return bl;
public ChatType getChatType() {
return this.bl;
}
public Function<ServerPlayer, Component> getFunction() {
return function;
public UUID getUuid() {
return uuid;
}
@Override

25
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
View File

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.client.gui.config;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.client.gui.config.widgets.*;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.hypherionmc.craterlib.core.config.annotations.HideFromScreen;
import com.hypherionmc.craterlib.core.config.annotations.SubConfig;
@@ -48,7 +49,7 @@ public class CraterConfigScreen extends Screen {
private boolean dragging;
public CraterConfigScreen(ModuleConfig config, Screen parent, Object subConfig) {
super(Component.translatable("cl." + config.getClass().getSimpleName().toLowerCase() + ".title"));
super(AbstractComponent.translatable("cl." + config.getClass().getSimpleName().toLowerCase() + ".title"));
this.parent = parent;
this.config = config;
if (subConfig != null) {
@@ -63,11 +64,11 @@ public class CraterConfigScreen extends Screen {
}
private static Component toText(Enum<?> val) {
return Component.translatable(val.toString());
return AbstractComponent.translatable(val.toString());
}
private static Component toText(Boolean bool) {
return Component.translatable(bool.toString());
return AbstractComponent.translatable(bool.toString());
}
private void setupScreenFromConfig(Object object, Class<?> clazz) {
@@ -93,7 +94,7 @@ public class CraterConfigScreen extends Screen {
tooltipLang = field.getAnnotation(Tooltip.class).value();
}
add(Component.translatable(baseLangKey),
add(AbstractComponent.translatable(baseLangKey),
val,
() -> val,
(ret) -> {
@@ -171,8 +172,8 @@ public class CraterConfigScreen extends Screen {
((List) children()).addAll(options);
int buttonWidths = Math.min(200, (width - 50 - 12) / 3);
addRenderableWidget(new InternalConfigButton(this, width / 2 - buttonWidths - 3, height - 22, buttonWidths, 20, Component.empty(), true));
addRenderableWidget(new InternalConfigButton(this, width / 2 + 3, height - 22, buttonWidths, 20, Component.empty(), false));
addRenderableWidget(new InternalConfigButton(this, width / 2 - buttonWidths - 3, height - 22, buttonWidths, 20, AbstractComponent.empty(), true));
addRenderableWidget(new InternalConfigButton(this, width / 2 + 3, height - 22, buttonWidths, 20, AbstractComponent.empty(), false));
}
@Override
@@ -324,10 +325,10 @@ public class CraterConfigScreen extends Screen {
@Override
public void onClose() {
if (isEdited()) {
minecraft.setScreen(new ConfirmScreen(this::acceptConfirm, Component.translatable("t.clc.quit_config"),
Component.translatable("t.clc.quit_config_sure"),
Component.translatable("t.clc.quit_discard"),
Component.translatable("gui.cancel")));
minecraft.setScreen(new ConfirmScreen(this::acceptConfirm, AbstractComponent.translatable("t.clc.quit_config"),
AbstractComponent.translatable("t.clc.quit_config_sure"),
AbstractComponent.translatable("t.clc.quit_discard"),
AbstractComponent.translatable("gui.cancel")));
} else {
minecraft.setScreen(parent);
}
@@ -382,9 +383,9 @@ public class CraterConfigScreen extends Screen {
if (mouseX > startX && mouseX < startX + sizeX) {
if (mouseY > startY && mouseY < startY + sizeY) {
List<Component> list = new ArrayList<>();
list.add(Component.translatable(ChatFormatting.BOLD + "" + ChatFormatting.YELLOW + title));
list.add(AbstractComponent.translatable(ChatFormatting.BOLD + "" + ChatFormatting.YELLOW + title));
for (String desc : description) {
list.add(Component.translatable(desc));
list.add(AbstractComponent.translatable(desc));
}
renderComponentTooltip(stack, list, mouseX, mouseY);
}

6
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java
View File

@@ -1,11 +1,11 @@
package com.hypherionmc.craterlib.client.gui.config.widgets;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.components.Button;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TextColor;
@@ -16,7 +16,7 @@ import net.minecraft.network.chat.TextColor;
public class BaseWidget<T> extends Option<T> {
public static final int resetButtonOffset = 48;
private final Button resetButton = addChild(new Button(0, 0, 46, 20, Component.literal("Reset"), this::onResetPressed));
private final Button resetButton = addChild(new Button(0, 0, 46, 20, AbstractComponent.literal("Reset"), this::onResetPressed));
private boolean hideReset = false;
private boolean isSubConfig = false;
@@ -40,7 +40,7 @@ public class BaseWidget<T> extends Option<T> {
@Override
public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
MutableComponent text = Component.literal(this.text.getString());
MutableComponent text = AbstractComponent.literal(this.text.getString());
boolean edited = isEdited() || hasErrors;
if (edited) {
text.withStyle(ChatFormatting.ITALIC);

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

@@ -1,6 +1,7 @@
package com.hypherionmc.craterlib.client.gui.config.widgets;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.components.AbstractButton;
import net.minecraft.client.gui.narration.NarratedElementType;
@@ -25,11 +26,11 @@ public class InternalConfigButton extends AbstractButton {
@Override
public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
if (cancel) {
setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
setMessage(AbstractComponent.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
} else {
boolean hasErrors = screen.hasErrors();
active = screen.isEdited() && !hasErrors;
setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
setMessage(AbstractComponent.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
}
super.render(poseStack, i, j, f);
}

6
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java
View File

@@ -1,13 +1,13 @@
package com.hypherionmc.craterlib.client.gui.config.widgets;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
/**
* @author HypherionSA
@@ -23,12 +23,12 @@ public class SubConfigWidget<T> extends AbstractConfigWidget<T, Button> {
this.subConfig = subConfig;
this.screen = screen;
this.widget = addChild(new Button(0, 0, 200, buttonHeight, Component.translatable("t.clc.opensubconfig"), this::openSubConfig));
this.widget = addChild(new Button(0, 0, 200, buttonHeight, AbstractComponent.translatable("t.clc.opensubconfig"), this::openSubConfig));
}
@Override
public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
this.text = Component.literal(subConfig.getClass().getSimpleName().toLowerCase());
this.text = AbstractComponent.literal(subConfig.getClass().getSimpleName().toLowerCase());
this.hideReset();
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
}

3
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ToggleButton.java
View File

@@ -1,5 +1,6 @@
package com.hypherionmc.craterlib.client.gui.config.widgets;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import net.minecraft.client.gui.components.Button;
import net.minecraft.network.chat.Component;
@@ -18,7 +19,7 @@ public class ToggleButton<T> extends AbstractConfigWidget<T, Button> {
public ToggleButton(List<T> options, Function<T, Component> toComponent) {
this.options = options;
this.toComponent = toComponent;
this.widget = addChild(new Button(0, 0, buttonWidth, buttonHeight, Component.empty(), this::switchNext));
this.widget = addChild(new Button(0, 0, buttonWidth, buttonHeight, AbstractComponent.empty(), this::switchNext));
}
@Override

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

@@ -1,5 +1,6 @@
package com.hypherionmc.craterlib.client.gui.widgets;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import net.minecraft.client.gui.components.AbstractSliderButton;
import net.minecraft.network.chat.Component;
@@ -35,9 +36,9 @@ public class TimeSliderWidget extends AbstractSliderButton {
if (this.value * this.maxValue >= 1200) {
String appendString = (minutes == 1) ? "Minute" : "Minutes";
String doSeconds = ((seconds - (minutes * 60)) > 0) ? ", " + (seconds - (minutes * 60)) + " Seconds" : "";
return Component.literal(minutes + " " + appendString + doSeconds);
return AbstractComponent.literal(minutes + " " + appendString + doSeconds);
} else {
return Component.literal(seconds + " Seconds");
return AbstractComponent.literal(seconds + " Seconds");
}
}

4
Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/server/AbstractServer.java
View File

@@ -1,12 +1,14 @@
package com.hypherionmc.craterlib.core.abstraction.server;
import net.minecraft.Util;
import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.server.MinecraftServer;
public class AbstractServer {
public static void broadcastMessage(MinecraftServer server, MutableComponent message) {
server.getPlayerList().broadcastSystemMessage(message, false);
server.getPlayerList().broadcastMessage(message, ChatType.CHAT, Util.NIL_UUID);
}
}

18
Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/text/AbstractComponent.java
View File

@@ -1,23 +1,29 @@
package com.hypherionmc.craterlib.core.abstraction.text;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.Style;
import net.minecraft.network.chat.*;
public class AbstractComponent {
public static MutableComponent literal(String component) {
return Component.literal(component);
return new TextComponent(component);
}
public static MutableComponent translatable(String component) {
return Component.translatable(component);
return new TranslatableComponent(component);
}
public static MutableComponent translatable(String component, Object... objects) {
return new TranslatableComponent(component, objects);
}
public static Component safeCopy(Component inComponent) {
String value = inComponent.getString();
Style style = inComponent.getStyle();
return Component.literal(value).withStyle(style);
return new TextComponent(value).withStyle(style);
}
public static Component empty() {
return new TextComponent("");
}
}

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

@@ -3,10 +3,14 @@ package com.hypherionmc.craterlib.mixin.events;
import com.google.common.base.Throwables;
import com.hypherionmc.craterlib.api.event.server.CraterCommandEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.ParseResults;
import com.mojang.brigadier.StringReader;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -14,24 +18,38 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Commands.class)
public class CommandMixin {
@Inject(method = "performCommand",
at = @At(value = "INVOKE",
target = "Lcom/mojang/brigadier/CommandDispatcher;execute(Lcom/mojang/brigadier/ParseResults;)I",
shift = At.Shift.BEFORE
), cancellable = true
@Shadow @Final private CommandDispatcher<CommandSourceStack> dispatcher;
@Inject(
method = "performCommand",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/util/profiling/ProfilerFiller;push(Ljava/lang/String;)V",
shift = At.Shift.AFTER
),
cancellable = true
)
private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfoReturnable<Integer> cir) {
CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command);
CraterEventBus.INSTANCE.postEvent(commandEvent);
if (commandEvent.wasCancelled()) {
cir.setReturnValue(1);
return;
private void injectCommandEvent(CommandSourceStack stack, String command, CallbackInfoReturnable<Integer> cir) {
StringReader stringreader = new StringReader(command);
if (stringreader.canRead() && stringreader.peek() == '/') {
stringreader.skip();
}
if (commandEvent.getException() != null) {
Throwables.throwIfUnchecked(commandEvent.getException());
cir.setReturnValue(1);
}
try {
ParseResults<CommandSourceStack> parse = dispatcher.parse(stringreader, stack);
CraterCommandEvent commandEvent = new CraterCommandEvent(parse, command);
CraterEventBus.INSTANCE.postEvent(commandEvent);
if (commandEvent.wasCancelled()) {
cir.setReturnValue(1);
return;
}
if (commandEvent.getException() != null) {
Throwables.throwIfUnchecked(commandEvent.getException());
cir.setReturnValue(1);
}
} catch (Exception ignored) {}
}
}
}

9
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerListMixin.java
View File

@@ -6,6 +6,7 @@ import com.hypherionmc.craterlib.api.event.server.PlayerPreLoginEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.mojang.authlib.GameProfile;
import net.minecraft.network.Connection;
import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.players.PlayerList;
@@ -16,14 +17,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.net.SocketAddress;
import java.util.function.Function;
import java.util.UUID;
@Mixin(PlayerList.class)
public class PlayerListMixin {
@Inject(method = "broadcastSystemMessage(Lnet/minecraft/network/chat/Component;Ljava/util/function/Function;Z)V", at = @At("HEAD"))
private void injectBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl, CallbackInfo ci) {
MessageBroadcastEvent event = new MessageBroadcastEvent(component, function, bl);
@Inject(method = "broadcastMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/ChatType;Ljava/util/UUID;)V", at = @At("HEAD"))
private void injectBroadcast(Component component, ChatType chatType, UUID uUID, CallbackInfo ci) {
MessageBroadcastEvent event = new MessageBroadcastEvent(component, uUID, chatType);
CraterEventBus.INSTANCE.postEvent(event);
}

2
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerMixin.java
View File

@@ -14,7 +14,7 @@ public class PlayerMixin {
@Inject(method = "die", at = @At("HEAD"), cancellable = true)
private void injectPlayerDeathEvent(DamageSource damageSource, CallbackInfo ci) {
CraterLivingDeathEvent event = new CraterLivingDeathEvent(((Player) (Object) this), damageSource);
CraterLivingDeathEvent event = new CraterLivingDeathEvent(((Player)(Object) this), damageSource);
CraterEventBus.INSTANCE.postEvent(event);
if (event.wasCancelled())
ci.cancel();

17
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerGamePacketListenerImplMixin.java
View File

@@ -2,9 +2,11 @@ package com.hypherionmc.craterlib.mixin.events;
import com.hypherionmc.craterlib.api.event.server.CraterServerChatEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.server.network.TextFilter;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
@@ -14,12 +16,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ServerGamePacketListenerImpl.class)
public class ServerGamePacketListenerImplMixin {
@Shadow
public ServerPlayer player;
@Shadow public ServerPlayer player;
@Inject(method = "broadcastChatMessage", at = @At("HEAD"), cancellable = true)
private void injectChatEvent(PlayerChatMessage chatMessage, CallbackInfo ci) {
CraterServerChatEvent event = new CraterServerChatEvent(this.player, chatMessage.serverContent().getString(), chatMessage.serverContent());
@Inject(method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V", at = @At("HEAD"), cancellable = true)
private void injectChatEvent(TextFilter.FilteredText filteredText, CallbackInfo ci) {
Component message = new TextComponent(filteredText.getRaw());
if (message.getString().startsWith("/"))
return;
CraterServerChatEvent event = new CraterServerChatEvent(this.player, message.getString(), message);
CraterEventBus.INSTANCE.postEvent(event);
if (event.wasCancelled())
ci.cancel();

9
Common/src/main/java/com/hypherionmc/craterlib/util/LangUtils.java
View File

@@ -1,5 +1,6 @@
package com.hypherionmc.craterlib.util;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
@@ -10,19 +11,19 @@ import net.minecraft.network.chat.Component;
public class LangUtils {
public static Component getTooltipTitle(String key) {
return Component.literal(ChatFormatting.YELLOW + Component.translatable(key).getString());
return AbstractComponent.literal(ChatFormatting.YELLOW + AbstractComponent.translatable(key).getString());
}
public static String resolveTranslation(String key) {
return Component.translatable(key).getString();
return AbstractComponent.translatable(key).getString();
}
public static Component getTranslation(String key) {
return Component.translatable(key);
return AbstractComponent.translatable(key);
}
public static Component makeComponent(String text) {
return Component.translatable(text);
return AbstractComponent.translatable(text);
}
}

25
Common/src/main/java/com/hypherionmc/craterlib/util/RenderUtils.java
View File

@@ -1,5 +1,6 @@
package com.hypherionmc.craterlib.util;
import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
import com.mojang.math.Vector4f;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
@@ -26,7 +27,7 @@ public class RenderUtils {
amount = amount / 81;
capacity = capacity / 81;
String text = String.valueOf((int) (((float) amount / capacity) * 100));
return amount > 0 ? Component.literal(ChatFormatting.AQUA + text + "%") : Component.literal(text + "%");
return amount > 0 ? AbstractComponent.literal(ChatFormatting.AQUA + text + "%") : AbstractComponent.literal(text + "%");
}
public static Component getTimeDisplayString(double value) {
@@ -35,21 +36,12 @@ public class RenderUtils {
if (seconds >= 60) {
String appendString = (minutes == 1) ? "Minute" : "Minutes";
String doSeconds = ((seconds - (minutes * 60)) > 0) ? ", " + (seconds - (minutes * 60)) + " Seconds" : "";
return Component.literal(minutes + " " + appendString + doSeconds);
return AbstractComponent.literal(minutes + " " + appendString + doSeconds);
} else {
return Component.literal(seconds + " Seconds");
return AbstractComponent.literal(seconds + " Seconds");
}
}
public static int renderColorFromDye(DyeColor color) {
return color.getMaterialColor().col | 0xFF000000;
}
public static int alphaColorFromDye(DyeColor color, float alpha) {
float[] colors = color.getTextureDiffuseColors();
return new Color(colors[0], colors[1], colors[2], alpha).getRGB();
}
public static class ARGB32 {
public static int alpha(int pPackedColor) {
return pPackedColor >>> 24;
@@ -67,4 +59,13 @@ public class RenderUtils {
return pPackedColor & 255;
}
}
public static int renderColorFromDye(DyeColor color) {
return color.getMaterialColor().col | 0xFF000000;
}
public static int alphaColorFromDye(DyeColor color, float alpha) {
float[] colors = color.getTextureDiffuseColors();
return new Color(colors[0], colors[1], colors[2], alpha).getRGB();
}
}