[NO-ORBIT] Unified Porting Branch
This commit is contained in:
@@ -1,56 +0,0 @@
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
}
|
||||
}
|
||||
|
||||
stages {
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
title: "Deploy Started: CraterLib 1.20.4 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
}
|
||||
}
|
||||
stage("Prepare") {
|
||||
steps {
|
||||
sh "chmod +x ./gradlew"
|
||||
sh "./gradlew cleanWorkspace"
|
||||
sh "./gradlew setupWorkspace"
|
||||
}
|
||||
}
|
||||
stage("Publish to Modrinth/Curseforge") {
|
||||
steps {
|
||||
dir('dev') {
|
||||
sh "chmod +x ./gradlew"
|
||||
sh "./gradlew publishMod -Prelease=true"
|
||||
}
|
||||
}
|
||||
}
|
||||
stage("Publish to Maven") {
|
||||
steps {
|
||||
dir('dev') {
|
||||
sh "./gradlew publish -Prelease=true"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
post {
|
||||
always {
|
||||
dir('dev') {
|
||||
sh "./gradlew --stop"
|
||||
}
|
||||
deleteDir()
|
||||
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
title: "CraterLib 1.20.4 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: currentBuild.currentResult,
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,71 +0,0 @@
|
||||
def projectName = "CraterLib";
|
||||
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
|
||||
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
}
|
||||
}
|
||||
|
||||
stages {
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.SSS_WEBHOOK,
|
||||
title: "Deploy Started: ${projectName} 1.20.4 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
}
|
||||
}
|
||||
|
||||
stage("Prepare") {
|
||||
steps {
|
||||
sh "chmod +x ./gradlew"
|
||||
sh "./gradlew cleanWorkspace"
|
||||
sh "./gradlew setupWorkspace"
|
||||
}
|
||||
}
|
||||
|
||||
stage("Build") {
|
||||
steps {
|
||||
dir('dev') {
|
||||
sh "chmod +x ./gradlew"
|
||||
sh "./gradlew clean"
|
||||
sh "./gradlew build -PreleaseType=snapshot"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage("Publish to Maven") {
|
||||
steps {
|
||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||
dir('dev') {
|
||||
sh "./gradlew publish -PreleaseType=snapshot"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
always {
|
||||
dir('dev') {
|
||||
sh "./gradlew --stop"
|
||||
archiveArtifacts artifacts: 'artifacts/*.jar'
|
||||
|
||||
fddsnapshotter apiKey: env.PLATFORM_KEY,
|
||||
projectSlug: "craterlib",
|
||||
projectName: "${projectName}",
|
||||
projectIcon: "${projectIcon}",
|
||||
modLoaders: "forge|neoforge|fabric|quilt",
|
||||
minecraftVersions: "1.20.4",
|
||||
failWebhook: env.SSS_WEBHOOK,
|
||||
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
|
||||
|
||||
}
|
||||
deleteDir()
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,8 +1,9 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id "com.hypherionmc.modutils.orion" version "1.0.14"
|
||||
id "com.hypherionmc.modutils.orion" version "1.0.16"
|
||||
}
|
||||
|
||||
orionporting {
|
||||
upstreamBranch = "dev"
|
||||
porting("1.20.4", "1.20.2", "1.20", "1.19.3", "1.19.2", "1.18.2")
|
||||
}
|
4
orbit.json
Normal file
4
orbit.json
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"action": "split",
|
||||
"targetBranches": ["1.20.4", "1.20.2", "1.20", "1.19.3", "1.19.2", "1.18.2"]
|
||||
}
|
29
patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch
Normal file
29
patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
--- a/.jenkins/Jenkinsfile.deploy
|
||||
+++ b/.jenkins/Jenkinsfile.deploy
|
||||
@@ -1,7 +1,7 @@
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
- image "registry.firstdark.dev/java21:latest"
|
||||
+ image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
- title: "Deploy Started: CraterLib Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "Deploy Started: CraterLib 1.18.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
@@ -39,7 +39,7 @@
|
||||
deleteDir()
|
||||
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
- title: "CraterLib Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "CraterLib 1.18.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: currentBuild.currentResult,
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"
|
52
patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
Normal file
52
patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
Normal file
@@ -0,0 +1,52 @@
|
||||
--- a/.jenkins/Jenkinsfile.snapshot
|
||||
+++ b/.jenkins/Jenkinsfile.snapshot
|
||||
@@ -1,10 +1,11 @@
|
||||
def projectName = "CraterLib";
|
||||
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
|
||||
+def relType = "snapshot"
|
||||
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
- image "registry.firstdark.dev/java21:latest"
|
||||
+ image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
}
|
||||
}
|
||||
@@ -13,7 +14,7 @@
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.SSS_WEBHOOK,
|
||||
- title: "Deploy Started: ${projectName} Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "Deploy Started: ${projectName} 1.18.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
@@ -29,14 +30,14 @@
|
||||
|
||||
stage("Build") {
|
||||
steps {
|
||||
- sh "./gradlew build -PreleaseType=port"
|
||||
+ sh "./gradlew build -PreleaseType=${relType}"
|
||||
}
|
||||
}
|
||||
|
||||
stage("Publish to Maven") {
|
||||
steps {
|
||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||
- sh "./gradlew publish -PreleaseType=port"
|
||||
+ sh "./gradlew publish -PreleaseType=${relType}"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -51,8 +52,8 @@
|
||||
projectSlug: "craterlib",
|
||||
projectName: "${projectName}",
|
||||
projectIcon: "${projectIcon}",
|
||||
- modLoaders: "forge|neoforge|fabric|quilt",
|
||||
- minecraftVersions: "1.20.6",
|
||||
+ modLoaders: "forge|fabric|quilt",
|
||||
+ minecraftVersions: "1.18.2",
|
||||
failWebhook: env.SSS_WEBHOOK,
|
||||
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
|
||||
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
|
||||
@@ -37,7 +37,7 @@
|
||||
@Nullable
|
||||
public BridgedPlayer getPlayer() {
|
||||
try {
|
||||
- Player p = parseResults.getContext().getLastChild().getSource().getPlayer();
|
||||
+ Player p = parseResults.getContext().getLastChild().getSource().getPlayerOrException();
|
||||
|
||||
if (p != null)
|
||||
return BridgedPlayer.of(p);
|
@@ -0,0 +1,155 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
|
||||
@@ -8,19 +8,20 @@
|
||||
import com.hypherionmc.craterlib.core.config.annotations.Tooltip;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.*;
|
||||
+import com.mojang.math.Matrix4f;
|
||||
import me.hypherionmc.moonconfig.core.conversion.SpecComment;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.screens.ConfirmScreen;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.renderer.GameRenderer;
|
||||
import net.minecraft.network.chat.Component;
|
||||
+import net.minecraft.network.chat.TextComponent;
|
||||
+import net.minecraft.network.chat.TranslatableComponent;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.util.Mth;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
-import org.joml.Matrix4f;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
@@ -49,7 +50,7 @@
|
||||
private boolean dragging;
|
||||
|
||||
public CraterConfigScreen(ModuleConfig config, Screen parent, Object subConfig) {
|
||||
- super(Component.translatable("cl." + config.getClass().getSimpleName().toLowerCase() + ".title"));
|
||||
+ super(new TranslatableComponent("cl." + config.getClass().getSimpleName().toLowerCase() + ".title"));
|
||||
this.parent = parent;
|
||||
this.config = config;
|
||||
if (subConfig != null) {
|
||||
@@ -64,11 +65,11 @@
|
||||
}
|
||||
|
||||
private static Component toText(Enum<?> val) {
|
||||
- return Component.translatable(val.toString());
|
||||
+ return new TranslatableComponent(val.toString());
|
||||
}
|
||||
|
||||
private static Component toText(Boolean bool) {
|
||||
- return Component.translatable(bool.toString());
|
||||
+ return new TranslatableComponent(bool.toString());
|
||||
}
|
||||
|
||||
private void setupScreenFromConfig(Object object, Class<?> clazz) {
|
||||
@@ -94,7 +95,7 @@
|
||||
tooltipLang = field.getAnnotation(Tooltip.class).value();
|
||||
}
|
||||
|
||||
- add(Component.translatable(baseLangKey),
|
||||
+ add(new TranslatableComponent(baseLangKey),
|
||||
val,
|
||||
() -> val,
|
||||
(ret) -> {
|
||||
@@ -172,24 +173,24 @@
|
||||
((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, new TextComponent(""), true));
|
||||
+ addRenderableWidget(new InternalConfigButton(this, width / 2 + 3, height - 22, buttonWidths, 20, new TextComponent(""), false));
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
- overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
|
||||
+ public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
|
||||
+ overlayBackground(matrices, TOP, height - BOTTOM, 32);
|
||||
+
|
||||
renderScrollBar();
|
||||
|
||||
- matrices.pose().pushPose();
|
||||
- matrices.pose().translate(0, 0, 500.0);
|
||||
- overlayBackground(matrices.pose(), 0, TOP, 64);
|
||||
- overlayBackground(matrices.pose(), height - BOTTOM, height, 64);
|
||||
- renderShadow(matrices.pose());
|
||||
- matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF);
|
||||
- matrices.pose().popPose();
|
||||
-
|
||||
+ matrices.pushPose();
|
||||
+ matrices.translate(0, 0, 500.0);
|
||||
+ overlayBackground(matrices, 0, TOP, 64);
|
||||
+ overlayBackground(matrices, height - BOTTOM, height, 64);
|
||||
+ renderShadow(matrices);
|
||||
+ drawCenteredString(matrices, font, getTitle(), width / 2, 9, 0xFFFFFF);
|
||||
super.render(matrices, mouseX, mouseY, delta);
|
||||
+ matrices.popPose();
|
||||
|
||||
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
|
||||
for (Option<?> option : options) {
|
||||
@@ -268,9 +269,9 @@
|
||||
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
|
||||
Tesselator tesselator = Tesselator.getInstance();
|
||||
BufferBuilder buffer = tesselator.getBuilder();
|
||||
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
|
||||
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
|
||||
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
|
||||
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
|
||||
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
|
||||
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
|
||||
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
|
||||
@@ -324,22 +325,22 @@
|
||||
@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, new TranslatableComponent("t.clc.quit_config"),
|
||||
+ new TranslatableComponent("t.clc.quit_config_sure"),
|
||||
+ new TranslatableComponent("t.clc.quit_discard"),
|
||||
+ new TranslatableComponent("gui.cancel")));
|
||||
} else {
|
||||
minecraft.setScreen(parent);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
- public boolean mouseScrolled(double d, double e, double f, double g) {
|
||||
+ public boolean mouseScrolled(double d, double e, double f) {
|
||||
if (e >= TOP && e <= height - BOTTOM) {
|
||||
scrollerAmount = Mth.clamp(scrollerAmount - f * 16.0D, 0, scrollHeight());
|
||||
return true;
|
||||
}
|
||||
- return super.mouseScrolled(d, e, f, g);
|
||||
+ return super.mouseScrolled(d, e, f);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -378,15 +379,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
- private void renderConfigTooltip(GuiGraphics stack, Font font, int mouseX, int mouseY, int startX, int startY, int sizeX, int sizeY, String title, String... description) {
|
||||
+ private void renderConfigTooltip(PoseStack stack, Font font, int mouseX, int mouseY, int startX, int startY, int sizeX, int sizeY, String title, String... description) {
|
||||
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(new TranslatableComponent(ChatFormatting.BOLD + "" + ChatFormatting.YELLOW + title));
|
||||
for (String desc : description) {
|
||||
- list.add(Component.translatable(desc));
|
||||
+ list.add(new TranslatableComponent(desc));
|
||||
}
|
||||
- stack.renderComponentTooltip(font, list, mouseX, mouseY);
|
||||
+ renderComponentTooltip(stack, list, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,27 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.AbstractWidget;
|
||||
import net.minecraft.client.gui.components.EditBox;
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
public W widget;
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
+ public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
|
||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||
int i = (widget instanceof EditBox ? 1 : 0);
|
||||
- widget.setX(x + width - 200 - resetButtonOffset + i);
|
||||
- widget.setY(y + i + 1);
|
||||
+ widget.x = (x + width - 200 - resetButtonOffset + i);
|
||||
+ widget.y = (y + i + 1);
|
||||
widget.render(matrices, mouseX, mouseY, delta);
|
||||
}
|
||||
}
|
@@ -0,0 +1,51 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+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.GuiGraphics;
|
||||
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;
|
||||
+import net.minecraft.network.chat.TextComponent;
|
||||
|
||||
/**
|
||||
* Copied from Cloth Config Lite
|
||||
@@ -16,7 +16,7 @@
|
||||
public class BaseWidget<T> extends Option<T> {
|
||||
|
||||
public static final int resetButtonOffset = 48;
|
||||
- private final Button resetButton = addChild(Button.builder(Component.literal("Reset"), this::onResetPressed).size(46, 20).build());
|
||||
+ private final Button resetButton = addChild(new Button(0, 0, 46, 20, new TextComponent("Reset"), this::onResetPressed));
|
||||
private boolean hideReset = false;
|
||||
|
||||
private boolean isSubConfig = false;
|
||||
@@ -39,8 +39,8 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
- MutableComponent text = Component.literal(this.text.getString());
|
||||
+ 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 = new TextComponent(this.text.getString());
|
||||
boolean edited = isEdited() || hasErrors;
|
||||
if (edited) {
|
||||
text.withStyle(ChatFormatting.ITALIC);
|
||||
@@ -50,9 +50,9 @@
|
||||
} else {
|
||||
text.withStyle(ChatFormatting.GRAY);
|
||||
}
|
||||
- matrices.drawString(font, text, x, y + font.lineHeight - 2, 0xFFFFFF);
|
||||
- resetButton.setX(x + width - 46);
|
||||
- resetButton.setY(y + 1);
|
||||
+ font.draw(matrices, text, x, y, 0xFFFFFF);
|
||||
+ resetButton.x = (x + width - 46);
|
||||
+ resetButton.y = (y + 1);
|
||||
resetButton.active = isNotDefault();
|
||||
if (!hideReset) {
|
||||
resetButton.render(matrices, mouseX, mouseY, delta);
|
@@ -0,0 +1,42 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
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 net.minecraft.network.chat.TranslatableComponent;
|
||||
+import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* @author HypherionSA
|
||||
@@ -22,19 +24,19 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected void renderWidget(GuiGraphics arg, int i, int j, float f) {
|
||||
+ 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(new TranslatableComponent(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(new TranslatableComponent(hasErrors ? "t.clc.error" : "t.clc.save"));
|
||||
}
|
||||
- super.renderWidget(arg, i, j, f);
|
||||
+ super.render(poseStack, i, j, f);
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
|
||||
+ public void updateNarration(NarrationElementOutput narrationElementOutput) {
|
||||
narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
|
||||
}
|
||||
|
@@ -0,0 +1,23 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
|
||||
import net.minecraft.client.gui.components.events.GuiEventListener;
|
||||
import net.minecraft.network.chat.Component;
|
||||
@@ -34,7 +34,7 @@
|
||||
@Getter
|
||||
private List<String> langKeys = new ArrayList<>();
|
||||
|
||||
- public abstract void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta);
|
||||
+ public abstract void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta);
|
||||
|
||||
public int height() {
|
||||
return 22;
|
@@ -0,0 +1,33 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
||||
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.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
-import net.minecraft.network.chat.Component;
|
||||
+import net.minecraft.network.chat.TranslatableComponent;
|
||||
|
||||
/**
|
||||
* @author HypherionSA
|
||||
@@ -23,12 +23,12 @@
|
||||
this.subConfig = subConfig;
|
||||
this.screen = screen;
|
||||
|
||||
- this.widget = addChild(Button.builder(Component.translatable("t.clc.opensubconfig"), this::openSubConfig).size(200, buttonHeight).build());
|
||||
+ this.widget = addChild(new Button(0, 0, 200, buttonHeight, new TranslatableComponent("t.clc.opensubconfig"), this::openSubConfig));
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
- this.text = Component.literal(subConfig.getClass().getSimpleName().toLowerCase());
|
||||
+ 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 = new TranslatableComponent(subConfig.getClass().getSimpleName().toLowerCase());
|
||||
this.hideReset();
|
||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||
}
|
@@ -0,0 +1,21 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
+ public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
|
||||
widget.setTextColor(hasErrors ? 16733525 : 14737632);
|
||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||
}
|
@@ -0,0 +1,19 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ToggleButton.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ToggleButton.java
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.network.chat.Component;
|
||||
+import net.minecraft.network.chat.TextComponent;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.function.Function;
|
||||
@@ -18,7 +19,7 @@
|
||||
public ToggleButton(List<T> options, Function<T, Component> toComponent) {
|
||||
this.options = options;
|
||||
this.toComponent = toComponent;
|
||||
- this.widget = addChild(Button.builder(Component.empty(), this::switchNext).size(buttonWidth, buttonHeight).build());
|
||||
+ this.widget = addChild(new Button(0, 0, buttonWidth, buttonHeight, new TextComponent(""), this::switchNext));
|
||||
}
|
||||
|
||||
@Override
|
@@ -0,0 +1,76 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
|
||||
@@ -3,35 +3,55 @@
|
||||
import com.google.common.base.Throwables;
|
||||
import com.hypherionmc.craterlib.api.events.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.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;",
|
||||
- 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, CallbackInfo ci) {
|
||||
- CraterCommandEvent commandEvent = CraterCommandEvent.of(stackParseResults, command);
|
||||
- CraterEventBus.INSTANCE.postEvent(commandEvent);
|
||||
- if (commandEvent.wasCancelled()) {
|
||||
- ci.cancel();
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (commandEvent.getException() != null) {
|
||||
- Throwables.throwIfUnchecked(commandEvent.getException());
|
||||
- ci.cancel();
|
||||
- }
|
||||
+ private void injectCommandEvent(CommandSourceStack stack, String command, CallbackInfoReturnable<Integer> cir) {
|
||||
+ StringReader stringreader = new StringReader(command);
|
||||
+ if (stringreader.canRead() && stringreader.peek() == '/') {
|
||||
+ stringreader.skip();
|
||||
+ }
|
||||
+
|
||||
+ try {
|
||||
+ ParseResults<CommandSourceStack> parse = dispatcher.parse(stringreader, stack);
|
||||
+
|
||||
+ CraterCommandEvent commandEvent = CraterCommandEvent.of(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) {}
|
||||
}
|
||||
|
||||
}
|
@@ -0,0 +1,26 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerAdvancementsMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerAdvancementsMixin.java
|
||||
@@ -5,7 +5,6 @@
|
||||
import com.hypherionmc.craterlib.nojang.advancements.BridgedAdvancement;
|
||||
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
import net.minecraft.advancements.Advancement;
|
||||
-import net.minecraft.advancements.AdvancementHolder;
|
||||
import net.minecraft.server.PlayerAdvancements;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
@@ -21,11 +20,10 @@
|
||||
private ServerPlayer player;
|
||||
|
||||
@Inject(method = "award", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancements/AdvancementRewards;grant(Lnet/minecraft/server/level/ServerPlayer;)V", shift = At.Shift.AFTER))
|
||||
- private void injectAdvancementEvent(AdvancementHolder advancementHolder, String string, CallbackInfoReturnable<Boolean> cir) {
|
||||
- Advancement advancement = advancementHolder.value();
|
||||
+ private void injectAdvancementEvent(Advancement advancement, String string, CallbackInfoReturnable<Boolean> cir) {
|
||||
+ if (advancement.getDisplay() == null || !advancement.getDisplay().shouldAnnounceChat())
|
||||
+ return;
|
||||
|
||||
- if (advancement.display().isPresent() && advancement.display().get().shouldAnnounceChat()) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterAdvancementEvent(BridgedPlayer.of(this.player), BridgedAdvancement.of(advancementHolder.value())));
|
||||
- }
|
||||
+ CraterEventBus.INSTANCE.postEvent(new CraterAdvancementEvent(BridgedPlayer.of(this.player), BridgedAdvancement.of(advancement)));
|
||||
}
|
||||
}
|
@@ -0,0 +1,39 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerListMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerListMixin.java
|
||||
@@ -9,9 +9,9 @@
|
||||
import com.hypherionmc.craterlib.utils.ChatUtils;
|
||||
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.network.CommonListenerCookie;
|
||||
import net.minecraft.server.players.PlayerList;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
@@ -20,20 +20,21 @@
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import java.net.SocketAddress;
|
||||
+import java.util.UUID;
|
||||
import java.util.function.Function;
|
||||
|
||||
@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) {
|
||||
+ @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) {
|
||||
String thread = Thread.currentThread().getStackTrace()[3].getClassName();
|
||||
- MessageBroadcastEvent event = new MessageBroadcastEvent(ChatUtils.mojangToAdventure(component), (f) -> ChatUtils.mojangToAdventure(component), bl, thread);
|
||||
+ MessageBroadcastEvent event = new MessageBroadcastEvent(ChatUtils.mojangToAdventure(component), (s) -> null, false, thread);
|
||||
CraterEventBus.INSTANCE.postEvent(event);
|
||||
}
|
||||
|
||||
@Inject(method = "placeNewPlayer", at = @At("TAIL"))
|
||||
- private void injectPlayerLoginEvent(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) {
|
||||
+ private void injectPlayerLoginEvent(Connection arg, ServerPlayer serverPlayer, CallbackInfo ci) {
|
||||
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(serverPlayer)));
|
||||
}
|
||||
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/ClientLevelMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/ClientLevelMixin.java
|
||||
@@ -15,7 +15,7 @@
|
||||
public class ClientLevelMixin {
|
||||
|
||||
@Inject(method = "addEntity", at = @At("HEAD"))
|
||||
- private void injectSinglePlayerJoinEvent(Entity entity, CallbackInfo ci) {
|
||||
+ private void injectSinglePlayerJoinEvent(int i, Entity entity, CallbackInfo ci) {
|
||||
if (entity instanceof Player player) {
|
||||
CraterSinglePlayerEvent.PlayerLogin playerLogin = new CraterSinglePlayerEvent.PlayerLogin(BridgedPlayer.of(player));
|
||||
CraterEventBus.INSTANCE.postEvent(playerLogin);
|
@@ -0,0 +1,13 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java
|
||||
@@ -14,8 +14,8 @@
|
||||
@Mixin(RealmsMainScreen.class)
|
||||
public class RealmsMainScreenMixin {
|
||||
|
||||
- @Inject(at = @At("HEAD"), method = "play(Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/client/gui/screens/Screen;Z)V")
|
||||
- private static void play(RealmsServer serverData, Screen arg2, boolean bl, CallbackInfo ci) {
|
||||
+ @Inject(at = @At("HEAD"), method = "play")
|
||||
+ private void play(RealmsServer serverData, Screen arg2, CallbackInfo ci) {
|
||||
PlayerJoinRealmEvent playerJoinRealm = new PlayerJoinRealmEvent(BridgedRealmsServer.of(serverData));
|
||||
CraterEventBus.INSTANCE.postEvent(playerJoinRealm);
|
||||
}
|
@@ -0,0 +1,13 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancement.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancement.java
|
||||
@@ -11,8 +11,8 @@
|
||||
private final Advancement internal;
|
||||
|
||||
public Optional<BridgedDisplayInfo> displayInfo() {
|
||||
- if (internal.display().isPresent()) {
|
||||
- return Optional.of(BridgedDisplayInfo.of(internal.display().get()));
|
||||
+ if (internal.getDisplay() != null) {
|
||||
+ return Optional.of(BridgedDisplayInfo.of(internal.getDisplay()));
|
||||
}
|
||||
|
||||
return Optional.empty();
|
@@ -0,0 +1,20 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java
|
||||
@@ -35,7 +35,7 @@
|
||||
}
|
||||
|
||||
public boolean isRealmServer() {
|
||||
- return internal.getCurrentServer() != null && internal.getCurrentServer().isRealm();
|
||||
+ return internal.getCurrentServer() != null && internal.isConnectedToRealms();
|
||||
}
|
||||
|
||||
public boolean isSinglePlayer() {
|
||||
@@ -59,7 +59,7 @@
|
||||
}
|
||||
|
||||
public UUID getPlayerId() {
|
||||
- return internal.getUser().getProfileId();
|
||||
+ return internal.getUser().getGameProfile().getId();
|
||||
}
|
||||
|
||||
@Nullable
|
@@ -0,0 +1,31 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java
|
||||
@@ -3,6 +3,7 @@
|
||||
import com.hypherionmc.craterlib.utils.ChatUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import net.kyori.adventure.text.Component;
|
||||
+import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.multiplayer.ServerData;
|
||||
import net.minecraft.client.multiplayer.ServerStatusPinger;
|
||||
|
||||
@@ -24,13 +25,17 @@
|
||||
}
|
||||
|
||||
public int getMaxPlayers() {
|
||||
- if (internal.players == null) {
|
||||
+ if (!internal.pinged || internal.status.getString() == null) {
|
||||
try {
|
||||
- new ServerStatusPinger().pingServer(internal, () -> {}, () -> {});
|
||||
+ new ServerStatusPinger().pingServer(internal, () -> {});
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
|
||||
- return internal.players == null ? 0 : internal.players.max();
|
||||
+ try {
|
||||
+ return Integer.parseInt(ChatFormatting.stripFormatting(internal.status.getString()).split("/")[1]);
|
||||
+ } catch (Exception ignored) {}
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
public ServerData toMojang() {
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java
|
||||
@@ -13,7 +13,7 @@
|
||||
private final CommandSourceStack internal;
|
||||
|
||||
public void sendSuccess(Supplier<Component> supplier, boolean bl) {
|
||||
- internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
|
||||
+ internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
|
||||
}
|
||||
|
||||
public CommandSourceStack toMojang() {
|
@@ -0,0 +1,28 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedFakePlayer.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedFakePlayer.java
|
||||
@@ -5,6 +5,7 @@
|
||||
import net.minecraft.commands.CommandSource;
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
import net.minecraft.network.chat.Component;
|
||||
+import net.minecraft.network.chat.TextComponent;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.phys.Vec2;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
@@ -37,14 +38,14 @@
|
||||
public final Consumer<net.kyori.adventure.text.Component> errorCallback;
|
||||
|
||||
MojangBridge(MinecraftServer server, int perm, String name, BiConsumer<Supplier<net.kyori.adventure.text.Component>, Boolean> successCallback, Consumer<net.kyori.adventure.text.Component> errorCallback) {
|
||||
- super(CommandSource.NULL, Vec3.ZERO, Vec2.ZERO, server.overworld(), perm, name, Component.literal(name), server, null);
|
||||
+ super(CommandSource.NULL, Vec3.ZERO, Vec2.ZERO, server.overworld(), perm, name, new TextComponent(name), server, null);
|
||||
this.successCallback = successCallback;
|
||||
this.errorCallback = errorCallback;
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void sendSuccess(Supplier<Component> supplier, boolean bl) {
|
||||
- successCallback.accept(() -> ChatUtils.mojangToAdventure(supplier.get()), bl);
|
||||
+ public void sendSuccess(Component supplier, boolean bl) {
|
||||
+ successCallback.accept(() -> ChatUtils.mojangToAdventure(supplier), bl);
|
||||
}
|
||||
|
||||
@Override
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/CommandsRegistry.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/CommandsRegistry.java
|
||||
@@ -70,7 +70,7 @@
|
||||
profiles.forEach(p -> bridgedGameProfiles.add(BridgedGameProfile.of(p)));
|
||||
|
||||
((TriConsumer<BridgedPlayer, List<BridgedGameProfile>, BridgedCommandSourceStack>) pair.getRight())
|
||||
- .accept(BridgedPlayer.of(context.getSource().getPlayer()), bridgedGameProfiles, BridgedCommandSourceStack.of(context.getSource()));
|
||||
+ .accept(BridgedPlayer.of(context.getSource().getPlayerOrException()), bridgedGameProfiles, BridgedCommandSourceStack.of(context.getSource()));
|
||||
return 1;
|
||||
}
|
||||
|
@@ -0,0 +1,29 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
|
||||
@@ -7,6 +7,8 @@
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.minecraft.SharedConstants;
|
||||
+import net.minecraft.Util;
|
||||
+import net.minecraft.network.chat.ChatType;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.players.UserBanListEntry;
|
||||
import net.minecraft.server.players.UserWhiteListEntry;
|
||||
@@ -44,7 +46,7 @@
|
||||
}
|
||||
|
||||
public void broadcastSystemMessage(Component text, boolean bl) {
|
||||
- internal.getPlayerList().broadcastSystemMessage(ChatUtils.adventureToMojang(text), bl);
|
||||
+ internal.getPlayerList().broadcastMessage(ChatUtils.adventureToMojang(text), ChatType.SYSTEM, Util.NIL_UUID);
|
||||
}
|
||||
|
||||
public boolean isPlayerBanned(BridgedGameProfile profile) {
|
||||
@@ -81,7 +83,7 @@
|
||||
}
|
||||
|
||||
public void executeCommand(BridgedMinecraftServer server, BridgedFakePlayer player, String command) {
|
||||
- internal.getCommands().performPrefixedCommand(player.toMojang(), command);
|
||||
+ internal.getCommands().performCommand(player.toMojang(), command);
|
||||
}
|
||||
|
||||
public MinecraftServer toMojang() {
|
@@ -0,0 +1,65 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
|
||||
@@ -5,22 +5,31 @@
|
||||
import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
||||
+import net.kyori.adventure.text.serializer.json.JSONOptions;
|
||||
+import net.kyori.option.OptionState;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.Util;
|
||||
-import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.Style;
|
||||
+import net.minecraft.network.chat.TextComponent;
|
||||
+import net.minecraft.network.chat.TranslatableComponent;
|
||||
|
||||
public class ChatUtils {
|
||||
|
||||
+ private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options(
|
||||
+ OptionState.optionState()
|
||||
+ .value(JSONOptions.EMIT_HOVER_SHOW_ENTITY_ID_AS_INT_ARRAY, false)
|
||||
+ .value(JSONOptions.EMIT_HOVER_EVENT_TYPE, JSONOptions.HoverEventValueMode.MODERN_ONLY).build()
|
||||
+ ).build();
|
||||
+
|
||||
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
|
||||
- final String serialised = GsonComponentSerializer.gson().serialize(inComponent);
|
||||
- return Component.Serializer.fromJson(serialised, RegistryAccess.EMPTY);
|
||||
+ final String serialised = adventureSerializer.serialize(inComponent);
|
||||
+ return Component.Serializer.fromJson(serialised);
|
||||
}
|
||||
|
||||
public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
|
||||
- final String serialised = Component.Serializer.toJson(inComponent, RegistryAccess.EMPTY);
|
||||
- return GsonComponentSerializer.gson().deserialize(serialised);
|
||||
+ final String serialised = Component.Serializer.toJson(inComponent);
|
||||
+ return adventureSerializer.deserialize(serialised);
|
||||
}
|
||||
|
||||
// Some text components contain duplicate text, resulting in duplicate messages
|
||||
@@ -28,7 +37,7 @@
|
||||
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 String strip(String inString, String... toStrip) {
|
||||
@@ -57,7 +66,7 @@
|
||||
}
|
||||
|
||||
public static net.kyori.adventure.text.Component resolve(String component, boolean formatted) {
|
||||
- Component returnVal = Component.literal(component);
|
||||
+ Component returnVal = new TextComponent(component);
|
||||
if (formatted) {
|
||||
returnVal = MinecraftSerializer.INSTANCE.serialize(component);
|
||||
}
|
||||
@@ -85,6 +94,6 @@
|
||||
if (identifier == null)
|
||||
return net.kyori.adventure.text.Component.text("Unknown");
|
||||
|
||||
- return mojangToAdventure(Component.translatable(Util.makeDescriptionId("biome", identifier.toMojang())));
|
||||
+ return mojangToAdventure(new TranslatableComponent(Util.makeDescriptionId("biome", identifier.toMojang())));
|
||||
}
|
||||
}
|
13
patches/1.18.2/Fabric/build.gradle.patch
Normal file
13
patches/1.18.2/Fabric/build.gradle.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
--- a/Fabric/build.gradle
|
||||
+++ b/Fabric/build.gradle
|
||||
@@ -110,8 +110,8 @@
|
||||
setVersionType("release")
|
||||
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
|
||||
setProjectVersion("${minecraft_version}-${project.version}")
|
||||
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}")
|
||||
- setGameVersions("1.20.6")
|
||||
+ setDisplayName("[FABRIC/QUILT 1.18.2] CraterLib - ${project.version}")
|
||||
+ setGameVersions("1.18.2")
|
||||
setLoaders("fabric", "quilt")
|
||||
setArtifact(remapJar)
|
||||
setCurseEnvironment("both")
|
@@ -0,0 +1,20 @@
|
||||
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
|
||||
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
|
||||
@@ -12,7 +12,7 @@
|
||||
import com.hypherionmc.craterlib.nojang.commands.CommandsRegistry;
|
||||
import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
||||
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
||||
|
||||
public class CraterLibInitializer implements ModInitializer {
|
||||
@@ -20,7 +20,7 @@
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
new CraterPacketNetwork(new CraterFabricNetworkHandler(PacketSide.SERVER));
|
||||
- CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
|
||||
+ CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
|
||||
CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent());
|
||||
CommandsRegistry.INSTANCE.registerCommands(dispatcher);
|
||||
});
|
@@ -0,0 +1,36 @@
|
||||
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
@@ -5,10 +5,10 @@
|
||||
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
import com.hypherionmc.craterlib.utils.ChatUtils;
|
||||
import net.minecraft.network.chat.Component;
|
||||
-import net.minecraft.network.chat.PlayerChatMessage;
|
||||
+import net.minecraft.network.chat.TextComponent;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
-import net.minecraft.server.network.FilteredText;
|
||||
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;
|
||||
@@ -22,12 +22,16 @@
|
||||
public ServerPlayer player;
|
||||
|
||||
@Inject(
|
||||
- method = "lambda$handleChat$5",
|
||||
- at = @At("HEAD"),
|
||||
+ method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V",
|
||||
+ at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/TextFilter$FilteredText;getFiltered()Ljava/lang/String;"),
|
||||
cancellable = true
|
||||
)
|
||||
- private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
|
||||
- CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
|
||||
+ private void injectChatEvent(TextFilter.FilteredText arg, CallbackInfo ci) {
|
||||
+ Component message = new TextComponent(arg.getRaw());
|
||||
+ if (message.getString().startsWith("/"))
|
||||
+ return;
|
||||
+
|
||||
+ CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.getFiltered(), ChatUtils.mojangToAdventure(message));
|
||||
CraterEventBus.INSTANCE.postEvent(event);
|
||||
if (event.wasCancelled())
|
||||
ci.cancel();
|
@@ -0,0 +1,12 @@
|
||||
--- a/Fabric/src/main/resources/fabric.mod.json
|
||||
+++ b/Fabric/src/main/resources/fabric.mod.json
|
||||
@@ -33,7 +33,7 @@
|
||||
"depends": {
|
||||
"fabricloader": ">=0.15.0",
|
||||
"fabric-api": "*",
|
||||
- "minecraft": ">=1.20.6",
|
||||
- "java": ">=21"
|
||||
+ "minecraft": "1.18.2",
|
||||
+ "java": ">=17"
|
||||
}
|
||||
}
|
22
patches/1.18.2/Forge/build.gradle.patch
Normal file
22
patches/1.18.2/Forge/build.gradle.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
--- a/Forge/build.gradle
|
||||
+++ b/Forge/build.gradle
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
dependencies {
|
||||
// Compat
|
||||
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
|
||||
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
|
||||
|
||||
// Do not edit or remove
|
||||
implementation project(":Common")
|
||||
@@ -104,8 +104,8 @@
|
||||
setVersionType("release")
|
||||
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
|
||||
setProjectVersion("${minecraft_version}-${project.version}")
|
||||
- setDisplayName("[Forge 1.20.6] CraterLib - ${project.version}")
|
||||
- setGameVersions("1.20.6")
|
||||
+ setDisplayName("[Forge 1.18.2] CraterLib - ${project.version}")
|
||||
+ setGameVersions("1.18.2")
|
||||
setLoaders("forge")
|
||||
setArtifact(remapJar)
|
||||
setCurseEnvironment("both")
|
@@ -0,0 +1,11 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/client/ForgeClientEvents.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/client/ForgeClientEvents.java
|
||||
@@ -14,7 +14,7 @@
|
||||
public class ForgeClientEvents {
|
||||
|
||||
@SubscribeEvent
|
||||
- public static void clientTick(TickEvent.LevelTickEvent event) {
|
||||
+ public static void clientTick(TickEvent.WorldTickEvent event) {
|
||||
if (Minecraft.getInstance().level == null)
|
||||
return;
|
||||
|
@@ -0,0 +1,30 @@
|
||||
--- /dev/null
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java
|
||||
@@ -1,0 +1,27 @@
|
||||
+package com.hypherionmc.craterlib.compat;
|
||||
+
|
||||
+import com.hypherionmc.craterlib.api.events.server.CraterPlayerEvent;
|
||||
+import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
+import net.minecraft.world.entity.player.Player;
|
||||
+import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
+import redstonedubstep.mods.vanishmod.api.PlayerVanishEvent;
|
||||
+
|
||||
+public class Vanish {
|
||||
+
|
||||
+ public Vanish() {
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ @SubscribeEvent
|
||||
+ public void vanishevent(PlayerVanishEvent event) {
|
||||
+ if (event.getEntity() instanceof Player p) {
|
||||
+ if (event.isVanished()) {
|
||||
+ CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(p)));
|
||||
+ } else {
|
||||
+ CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(p)));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+}
|
@@ -0,0 +1,28 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
|
||||
@@ -6,7 +6,7 @@
|
||||
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
-import net.minecraftforge.client.ConfigScreenHandler;
|
||||
+import net.minecraftforge.client.ConfigGuiHandler;
|
||||
import net.minecraftforge.forgespi.language.IModInfo;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
@@ -19,14 +19,14 @@
|
||||
/**
|
||||
* @author HypherionSA
|
||||
*/
|
||||
-@Mixin(ConfigScreenHandler.class)
|
||||
+@Mixin(ConfigGuiHandler.class)
|
||||
public class ConfigScreenHandlerMixin {
|
||||
|
||||
/**
|
||||
* Inject Auto Generated config Screens into forge
|
||||
*
|
||||
*/
|
||||
- @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
|
||||
+ @Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false)
|
||||
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
|
||||
ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
|
||||
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
|
@@ -0,0 +1,36 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
@@ -5,10 +5,10 @@
|
||||
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
import com.hypherionmc.craterlib.utils.ChatUtils;
|
||||
import net.minecraft.network.chat.Component;
|
||||
-import net.minecraft.network.chat.PlayerChatMessage;
|
||||
+import net.minecraft.network.chat.TextComponent;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
-import net.minecraft.server.network.FilteredText;
|
||||
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;
|
||||
@@ -22,12 +22,16 @@
|
||||
public ServerPlayer player;
|
||||
|
||||
@Inject(
|
||||
- method = "lambda$handleChat$5",
|
||||
- at = @At("HEAD"),
|
||||
+ method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V",
|
||||
+ at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/TextFilter$FilteredText;getFiltered()Ljava/lang/String;"),
|
||||
cancellable = true
|
||||
)
|
||||
- private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
|
||||
- CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
|
||||
+ private void injectChatEvent(TextFilter.FilteredText arg, CallbackInfo ci) {
|
||||
+ Component message = new TextComponent(arg.getRaw());
|
||||
+ if (message.getString().startsWith("/"))
|
||||
+ return;
|
||||
+
|
||||
+ CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.getFiltered(), ChatUtils.mojangToAdventure(message));
|
||||
CraterEventBus.INSTANCE.postEvent(event);
|
||||
if (event.wasCancelled())
|
||||
ci.cancel();
|
@@ -0,0 +1,94 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java
|
||||
@@ -12,16 +12,17 @@
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.server.network.ServerGamePacketListenerImpl;
|
||||
-import net.minecraftforge.event.network.CustomPayloadEvent;
|
||||
-import net.minecraftforge.network.ChannelBuilder;
|
||||
-import net.minecraftforge.network.PacketDistributor;
|
||||
-import net.minecraftforge.network.SimpleChannel;
|
||||
+import net.minecraftforge.network.NetworkDirection;
|
||||
+import net.minecraftforge.network.NetworkEvent;
|
||||
+import net.minecraftforge.network.NetworkRegistry;
|
||||
+import net.minecraftforge.network.simple.SimpleChannel;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
+import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
||||
@@ -35,18 +36,19 @@
|
||||
|
||||
protected <T> void registerPacket(PacketHolder<T> holder) {
|
||||
if (CHANNELS.get(holder.messageType()) == null) {
|
||||
- SimpleChannel channel = ChannelBuilder
|
||||
- .named(holder.type().id())
|
||||
- .clientAcceptedVersions((a, b) -> true)
|
||||
- .serverAcceptedVersions((a, b) -> true)
|
||||
- .networkProtocolVersion(1)
|
||||
+ SimpleChannel channel = NetworkRegistry.ChannelBuilder
|
||||
+ .named(holder.type().toMojang())
|
||||
+ .clientAcceptedVersions((a) -> true)
|
||||
+ .serverAcceptedVersions((a) -> true)
|
||||
+ .networkProtocolVersion(() -> "1")
|
||||
.simpleChannel();
|
||||
|
||||
- channel.messageBuilder(holder.messageType())
|
||||
- .decoder(mojangDecoder(holder.decoder()))
|
||||
- .encoder(mojangEncoder(holder.encoder()))
|
||||
- .consumerNetworkThread(buildHandler(holder.handler()))
|
||||
- .add();
|
||||
+ channel.registerMessage(
|
||||
+ 0,
|
||||
+ holder.messageType(),
|
||||
+ mojangEncoder(holder.encoder()),
|
||||
+ mojangDecoder(holder.decoder()),
|
||||
+ buildHandler(holder.handler()));
|
||||
|
||||
CHANNELS.put(holder.messageType(), channel);
|
||||
} else {
|
||||
@@ -62,7 +64,7 @@
|
||||
SimpleChannel channel = CHANNELS.get(packet.getClass());
|
||||
Connection connection = Minecraft.getInstance().getConnection().getConnection();
|
||||
if (channel.isRemotePresent(connection) || ignoreCheck) {
|
||||
- channel.send(packet, PacketDistributor.SERVER.noArg());
|
||||
+ channel.sendToServer(packet);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,8 +74,8 @@
|
||||
if (connection == null)
|
||||
return;
|
||||
|
||||
- if (channel.isRemotePresent(connection.getConnection())) {
|
||||
- channel.send(packet, PacketDistributor.PLAYER.with(player.toMojangServerPlayer()));
|
||||
+ if (channel.isRemotePresent(connection.connection)) {
|
||||
+ channel.sendTo(packet, player.getConnection().connection, NetworkDirection.PLAY_TO_CLIENT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,14 +87,14 @@
|
||||
return ((t, byteBuf) -> handler.accept(t, BridgedFriendlyByteBuf.of(byteBuf)));
|
||||
}
|
||||
|
||||
- private <T> BiConsumer<T, CustomPayloadEvent.Context> buildHandler(Consumer<PacketContext<T>> handler) {
|
||||
+ private <T> BiConsumer<T, Supplier<NetworkEvent.Context>> buildHandler(Consumer<PacketContext<T>> handler) {
|
||||
return (message, ctx) -> {
|
||||
- ctx.enqueueWork(() -> {
|
||||
- PacketSide side = ctx.getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
|
||||
- ServerPlayer player = ctx.getSender();
|
||||
+ ctx.get().enqueueWork(() -> {
|
||||
+ PacketSide side = ctx.get().getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
|
||||
+ ServerPlayer player = ctx.get().getSender();
|
||||
handler.accept(new PacketContext<>(BridgedPlayer.of(player), message, side));
|
||||
});
|
||||
- ctx.setPacketHandled(true);
|
||||
+ ctx.get().setPacketHandled(true);
|
||||
};
|
||||
}
|
||||
}
|
@@ -0,0 +1,25 @@
|
||||
--- a/Forge/src/main/resources/META-INF/mods.toml
|
||||
+++ b/Forge/src/main/resources/META-INF/mods.toml
|
||||
@@ -1,5 +1,5 @@
|
||||
modLoader = "javafml"
|
||||
-loaderVersion = "[50,)"
|
||||
+loaderVersion = "[40,)"
|
||||
license = "MIT"
|
||||
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
[[dependencies.${ mod_id }]]
|
||||
modId = "forge"
|
||||
mandatory = true
|
||||
- versionRange = "[50,)"
|
||||
+ versionRange = "[40,)"
|
||||
ordering = "NONE"
|
||||
side = "BOTH"
|
||||
|
||||
[[dependencies.${ mod_id }]]
|
||||
modId = "minecraft"
|
||||
mandatory = true
|
||||
- versionRange = "[1.20.6,1.21)"
|
||||
+ versionRange = "[1.18.2,1.19)"
|
||||
ordering = "NONE"
|
||||
side = "BOTH"
|
114
patches/1.18.2/NeoForge/build.gradle.patch
Normal file
114
patches/1.18.2/NeoForge/build.gradle.patch
Normal file
@@ -0,0 +1,114 @@
|
||||
--- a/NeoForge/build.gradle
|
||||
+++ /dev/null
|
||||
@@ -1,111 +1,0 @@
|
||||
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
|
||||
-
|
||||
-dependencies {
|
||||
- // Compat
|
||||
- modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
|
||||
-
|
||||
- // Do not edit or remove
|
||||
- implementation project(":Common")
|
||||
-}
|
||||
-
|
||||
-shadowJar {
|
||||
- from sourceSets.main.output
|
||||
- configurations = [project.configurations.shade]
|
||||
-
|
||||
- dependencies {
|
||||
- exclude(dependency('com.google.code.gson:.*'))
|
||||
-
|
||||
- relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
|
||||
- relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
|
||||
- relocate 'net.kyori', 'shadow.kyori'
|
||||
- }
|
||||
-
|
||||
- setArchiveClassifier('dev-shadow')
|
||||
-}
|
||||
-
|
||||
-/**
|
||||
- * ===============================================================================
|
||||
- * = DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING =
|
||||
- * ===============================================================================
|
||||
- */
|
||||
-
|
||||
-unimined.minecraft {
|
||||
- neoForged {
|
||||
- loader neoforge_version
|
||||
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-remapJar {
|
||||
- inputFile.set shadowJar.archiveFile
|
||||
- dependsOn shadowJar
|
||||
- archiveClassifier.set null
|
||||
-}
|
||||
-
|
||||
-jar {
|
||||
- archiveClassifier.set "dev"
|
||||
-}
|
||||
-
|
||||
-processResources {
|
||||
- from project(":Common").sourceSets.main.resources
|
||||
- def buildProps = project.properties.clone()
|
||||
-
|
||||
- filesMatching("META-INF/neoforge.mods.toml") {
|
||||
- expand buildProps
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-compileTestJava.enabled = false
|
||||
-
|
||||
-tasks.withType(JavaCompile).configureEach {
|
||||
- source(project(":Common").sourceSets.main.allSource)
|
||||
-}
|
||||
-
|
||||
-/**
|
||||
- * Publishing Config
|
||||
- */
|
||||
-publishing {
|
||||
- publications {
|
||||
- mavenJava(MavenPublication) {
|
||||
- artifactId project.archivesBaseName
|
||||
- from components.java
|
||||
-
|
||||
- artifact(remapJar) {
|
||||
- builtBy remapJar
|
||||
- }
|
||||
-
|
||||
- pom.withXml {
|
||||
- Node pomNode = asNode()
|
||||
- pomNode.dependencies.'*'.findAll() {
|
||||
- it.artifactId.text() == 'regutils-joined-fabric' ||
|
||||
- it.artifactId.text() == 'core' ||
|
||||
- it.artifactId.text() == 'toml'
|
||||
- }.each() {
|
||||
- it.parent().remove(it)
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- repositories {
|
||||
- maven rootProject.orion.getPublishingMaven()
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-publisher {
|
||||
- apiKeys {
|
||||
- modrinth(System.getenv("MODRINTH_TOKEN"))
|
||||
- curseforge(System.getenv("CURSE_TOKEN"))
|
||||
- }
|
||||
-
|
||||
- setCurseID(curse_id)
|
||||
- setModrinthID(modrinth_id)
|
||||
- setVersionType("release")
|
||||
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
|
||||
- setProjectVersion("${minecraft_version}-${project.version}")
|
||||
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}")
|
||||
- setGameVersions("1.20.6")
|
||||
- setLoaders("neoforge")
|
||||
- setArtifact(remapJar)
|
||||
- setCurseEnvironment("both")
|
||||
-}
|
@@ -0,0 +1,62 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
|
||||
+++ /dev/null
|
||||
@@ -1,59 +1,0 @@
|
||||
-package com.hypherionmc.craterlib;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
|
||||
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
||||
-import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
|
||||
-import com.hypherionmc.craterlib.compat.Vanish;
|
||||
-import com.hypherionmc.craterlib.core.config.ConfigController;
|
||||
-import com.hypherionmc.craterlib.core.config.ModuleConfig;
|
||||
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
|
||||
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
-import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
|
||||
-import com.hypherionmc.craterlib.core.networking.PacketRegistry;
|
||||
-import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
||||
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
|
||||
-import com.hypherionmc.craterlib.network.CraterNeoForgeNetworkHandler;
|
||||
-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
|
||||
-import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
|
||||
-import net.minecraft.client.Minecraft;
|
||||
-import net.neoforged.bus.api.IEventBus;
|
||||
-import net.neoforged.fml.ModList;
|
||||
-import net.neoforged.fml.common.Mod;
|
||||
-import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
-import net.neoforged.fml.loading.FMLEnvironment;
|
||||
-import net.neoforged.fml.loading.FMLLoader;
|
||||
-import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
|
||||
-import net.neoforged.neoforge.common.NeoForge;
|
||||
-
|
||||
-import java.util.Optional;
|
||||
-
|
||||
-@Mod(CraterConstants.MOD_ID)
|
||||
-public class CraterLib {
|
||||
-
|
||||
- private final PacketRegistry handler;
|
||||
-
|
||||
- public CraterLib(IEventBus eventBus) {
|
||||
- NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
|
||||
- eventBus.addListener(this::commonSetup);
|
||||
- handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER);
|
||||
-
|
||||
- if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
|
||||
- eventBus.register(new Vanish());
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- public void commonSetup(FMLCommonSetupEvent evt) {
|
||||
- new CraterPacketNetwork(handler);
|
||||
- if (FMLEnvironment.dist.isClient()) {
|
||||
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
|
||||
- CraterEventBus.INSTANCE.postEvent(event);
|
||||
-
|
||||
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
|
||||
- if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
|
||||
- ModuleConfig config = (ModuleConfig) conf;
|
||||
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
|
||||
- }
|
||||
- });
|
||||
- }
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,28 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java
|
||||
+++ /dev/null
|
||||
@@ -1,25 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.client;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.CraterConstants;
|
||||
-import com.hypherionmc.craterlib.api.events.client.CraterClientTickEvent;
|
||||
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
|
||||
-import net.minecraft.client.Minecraft;
|
||||
-import net.neoforged.api.distmarker.Dist;
|
||||
-import net.neoforged.bus.api.SubscribeEvent;
|
||||
-import net.neoforged.fml.common.EventBusSubscriber;
|
||||
-import net.neoforged.neoforge.event.tick.LevelTickEvent;
|
||||
-
|
||||
-@EventBusSubscriber(modid = CraterConstants.MOD_ID, value = Dist.CLIENT)
|
||||
-public class NeoForgeClientEvents {
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public static void clientTick(LevelTickEvent.Pre event) {
|
||||
- if (Minecraft.getInstance().level == null)
|
||||
- return;
|
||||
-
|
||||
- CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(BridgedClientLevel.of(Minecraft.getInstance().level));
|
||||
- CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -0,0 +1,43 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,40 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.client;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
|
||||
-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
|
||||
-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import net.minecraft.client.Minecraft;
|
||||
-import net.minecraft.network.Connection;
|
||||
-
|
||||
-import java.util.Objects;
|
||||
-
|
||||
-/**
|
||||
- * @author HypherionSA
|
||||
- */
|
||||
-public class NeoForgeClientHelper implements ClientPlatform {
|
||||
-
|
||||
- public NeoForgeClientHelper() {
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedMinecraft getClientInstance() {
|
||||
- return new BridgedMinecraft();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedPlayer getClientPlayer() {
|
||||
- return BridgedPlayer.of(Minecraft.getInstance().player);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedClientLevel getClientLevel() {
|
||||
- return BridgedClientLevel.of(Minecraft.getInstance().level);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Connection getClientConnection() {
|
||||
- Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
|
||||
- return Minecraft.getInstance().getConnection().getConnection();
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,22 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,19 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
|
||||
-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
|
||||
-import net.neoforged.neoforge.server.ServerLifecycleHooks;
|
||||
-
|
||||
-/**
|
||||
- * @author HypherionSA
|
||||
- */
|
||||
-public class NeoForgeCommonHelper implements CommonPlatform {
|
||||
-
|
||||
- public NeoForgeCommonHelper() {
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedMinecraftServer getMCServer() {
|
||||
- return BridgedMinecraftServer.of(ServerLifecycleHooks.getCurrentServer());
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,25 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,22 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
|
||||
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import redstonedubstep.mods.vanishmod.VanishUtil;
|
||||
-
|
||||
-public class NeoForgeCompatHelper implements CompatUtils {
|
||||
-
|
||||
- @Override
|
||||
- public boolean isPlayerActive(BridgedPlayer player) {
|
||||
- if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
|
||||
- return true;
|
||||
-
|
||||
- return VanishUtil.isVanished(player.toMojangServerPlayer());
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public String getSkinUUID(BridgedPlayer player) {
|
||||
- return player.getStringUUID();
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,76 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeLoaderHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,73 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.Environment;
|
||||
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
|
||||
-import net.minecraft.SharedConstants;
|
||||
-import net.minecraft.client.Minecraft;
|
||||
-import net.neoforged.fml.ModList;
|
||||
-import net.neoforged.fml.loading.FMLLoader;
|
||||
-import net.neoforged.fml.loading.FMLPaths;
|
||||
-
|
||||
-import java.io.File;
|
||||
-
|
||||
-/**
|
||||
- * @author HypherionSA
|
||||
- */
|
||||
-public class NeoForgeLoaderHelper implements ModloaderEnvironment {
|
||||
-
|
||||
- public NeoForgeLoaderHelper() {
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isFabric() {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public String getGameVersion() {
|
||||
- return SharedConstants.VERSION_STRING;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public File getGameFolder() {
|
||||
- return Minecraft.getInstance().gameDirectory;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public File getConfigFolder() {
|
||||
- return FMLPaths.CONFIGDIR.get().toFile();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public File getModsFolder() {
|
||||
- return FMLPaths.MODSDIR.get().toFile();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Environment getEnvironment() {
|
||||
- switch (FMLLoader.getDist()) {
|
||||
- case CLIENT -> {
|
||||
- return Environment.CLIENT;
|
||||
- }
|
||||
- case DEDICATED_SERVER -> {
|
||||
- return Environment.SERVER;
|
||||
- }
|
||||
- }
|
||||
- return Environment.UNKNOWN;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isModLoaded(String modid) {
|
||||
- return ModList.get().isLoaded(modid);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isDevEnv() {
|
||||
- return !FMLLoader.isProduction();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public int getModCount() {
|
||||
- return ModList.get().size();
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,46 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java
|
||||
+++ /dev/null
|
||||
@@ -1,43 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.api.events.server.CraterRegisterCommandEvent;
|
||||
-import com.hypherionmc.craterlib.api.events.server.CraterServerLifecycleEvent;
|
||||
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
-import com.hypherionmc.craterlib.nojang.commands.CommandsRegistry;
|
||||
-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
|
||||
-import net.neoforged.bus.api.SubscribeEvent;
|
||||
-import net.neoforged.neoforge.event.RegisterCommandsEvent;
|
||||
-import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
-import net.neoforged.neoforge.event.server.ServerStartingEvent;
|
||||
-import net.neoforged.neoforge.event.server.ServerStoppedEvent;
|
||||
-import net.neoforged.neoforge.event.server.ServerStoppingEvent;
|
||||
-
|
||||
-public class NeoForgeServerEvents {
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public void serverStarting(ServerStartingEvent event) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Starting(BridgedMinecraftServer.of(event.getServer())));
|
||||
- }
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public void serverStarted(ServerStartedEvent event) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started(BridgedMinecraftServer.of(event.getServer())));
|
||||
- }
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public void serverStopping(ServerStoppingEvent event) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping(BridgedMinecraftServer.of(event.getServer())));
|
||||
- }
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public void serverStopped(ServerStoppedEvent event) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped(BridgedMinecraftServer.of(event.getServer())));
|
||||
- }
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public void onCommandRegister(RegisterCommandsEvent event) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent());
|
||||
- CommandsRegistry.INSTANCE.registerCommands(event.getDispatcher());
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -0,0 +1,27 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java
|
||||
+++ /dev/null
|
||||
@@ -1,24 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.compat;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.api.events.server.CraterPlayerEvent;
|
||||
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import net.neoforged.bus.api.SubscribeEvent;
|
||||
-import redstonedubstep.mods.vanishmod.api.PlayerVanishEvent;
|
||||
-
|
||||
-public class Vanish {
|
||||
-
|
||||
- public Vanish() {
|
||||
-
|
||||
- }
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public void vanishevent(PlayerVanishEvent event) {
|
||||
- if (event.isVanished()) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(event.getEntity())));
|
||||
- } else {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(event.getEntity())));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -0,0 +1,39 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
+++ /dev/null
|
||||
@@ -1,36 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.mixin;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
|
||||
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import com.hypherionmc.craterlib.utils.ChatUtils;
|
||||
-import net.minecraft.network.chat.Component;
|
||||
-import net.minecraft.network.chat.PlayerChatMessage;
|
||||
-import net.minecraft.server.level.ServerPlayer;
|
||||
-import net.minecraft.server.network.FilteredText;
|
||||
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
|
||||
-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.CallbackInfo;
|
||||
-
|
||||
-@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
|
||||
-public class ServerGamePacketListenerImplMixin {
|
||||
-
|
||||
- @Shadow
|
||||
- public ServerPlayer player;
|
||||
-
|
||||
- @Inject(
|
||||
- method = "lambda$handleChat$5",
|
||||
- at = @At("HEAD"),
|
||||
- cancellable = true
|
||||
- )
|
||||
- private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
|
||||
- CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
|
||||
- CraterEventBus.INSTANCE.postEvent(event);
|
||||
- if (event.wasCancelled())
|
||||
- ci.cancel();
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -0,0 +1,80 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java
|
||||
+++ /dev/null
|
||||
@@ -1,77 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.network;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.CraterConstants;
|
||||
-import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
|
||||
-import com.hypherionmc.craterlib.core.networking.PacketRegistry;
|
||||
-import com.hypherionmc.craterlib.core.networking.data.PacketContext;
|
||||
-import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
|
||||
-import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import net.neoforged.bus.api.SubscribeEvent;
|
||||
-import net.neoforged.fml.LogicalSide;
|
||||
-import net.neoforged.neoforge.network.PacketDistributor;
|
||||
-import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
|
||||
-import net.neoforged.neoforge.network.handling.IPayloadHandler;
|
||||
-
|
||||
-import java.util.function.Consumer;
|
||||
-
|
||||
-/**
|
||||
- * Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
||||
- */
|
||||
-public class CraterNeoForgeNetworkHandler extends PacketRegistry {
|
||||
-
|
||||
- public CraterNeoForgeNetworkHandler(PacketSide side) {
|
||||
- super(side);
|
||||
- }
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public void register(final RegisterPayloadHandlersEvent event) {
|
||||
- if (!PACKET_MAP.isEmpty()) {
|
||||
- PACKET_MAP.forEach((type, container) -> event.registrar(container.getType().id().getNamespace())
|
||||
- .optional().commonBidirectional(container.getType(), container.getCodec(), buildHandler(container.handler())));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- protected <T> void registerPacket(PacketHolder<T> container) {
|
||||
-
|
||||
- }
|
||||
-
|
||||
- public <T> void sendToServer(T packet) {
|
||||
- this.sendToServer(packet, false);
|
||||
- }
|
||||
-
|
||||
- public <T> void sendToServer(T packet, boolean ignoreCheck) {
|
||||
- PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
|
||||
- if (container != null) {
|
||||
- PacketDistributor.sendToServer(new CommonPacketWrapper<>(container, packet));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- public <T> void sendToClient(T packet, BridgedPlayer player) {
|
||||
- PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
|
||||
- if (container != null) {
|
||||
- if (player.getConnection().hasChannel(container.type())) {
|
||||
- PacketDistributor.sendToPlayer(player.toMojangServerPlayer(), new CommonPacketWrapper<>(container, packet));
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- private <T, K extends CommonPacketWrapper<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T>> handler) {
|
||||
- return (payload, ctx) -> {
|
||||
- try
|
||||
- {
|
||||
- PacketSide side = ctx.flow().getReceptionSide().equals(LogicalSide.SERVER) ? PacketSide.SERVER : PacketSide.CLIENT;
|
||||
- if (PacketSide.SERVER.equals(side)) {
|
||||
- handler.accept(new PacketContext<>(BridgedPlayer.of(ctx.player()), payload.packet(), side));
|
||||
- } else {
|
||||
- handler.accept(new PacketContext<>(payload.packet(), side));
|
||||
- }
|
||||
-
|
||||
- }
|
||||
- catch (Throwable t) {
|
||||
- CraterConstants.LOG.error("Error handling packet: {} -> ", payload.packet().getClass(), t);
|
||||
- }
|
||||
- };
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,4 @@
|
||||
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform
|
||||
+++ /dev/null
|
||||
@@ -1,1 +1,0 @@
|
||||
-com.hypherionmc.craterlib.client.NeoForgeClientHelper
|
@@ -0,0 +1,4 @@
|
||||
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform
|
||||
+++ /dev/null
|
||||
@@ -1,1 +1,0 @@
|
||||
-com.hypherionmc.craterlib.common.NeoForgeCommonHelper
|
@@ -0,0 +1,4 @@
|
||||
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CompatUtils
|
||||
+++ /dev/null
|
||||
@@ -1,1 +1,0 @@
|
||||
-com.hypherionmc.craterlib.common.NeoForgeCompatHelper
|
@@ -0,0 +1,4 @@
|
||||
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment
|
||||
+++ /dev/null
|
||||
@@ -1,1 +1,0 @@
|
||||
-com.hypherionmc.craterlib.common.NeoForgeLoaderHelper
|
@@ -0,0 +1,18 @@
|
||||
--- a/NeoForge/src/main/resources/craterlib.neoforge.mixins.json
|
||||
+++ /dev/null
|
||||
@@ -1,15 +1,0 @@
|
||||
-{
|
||||
- "required": true,
|
||||
- "minVersion": "0.8",
|
||||
- "package": "com.hypherionmc.craterlib.mixin",
|
||||
- "compatibilityLevel": "JAVA_17",
|
||||
- "mixins": [
|
||||
- ],
|
||||
- "client": [],
|
||||
- "server": [
|
||||
- "ServerGamePacketListenerImplMixin"
|
||||
- ],
|
||||
- "injectors": {
|
||||
- "defaultRequire": 1
|
||||
- }
|
||||
-}
|
40
patches/1.18.2/gradle.properties.patch
Normal file
40
patches/1.18.2/gradle.properties.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
--- a/gradle.properties
|
||||
+++ b/gradle.properties
|
||||
@@ -9,18 +9,15 @@
|
||||
mod_name=CraterLib
|
||||
|
||||
# Shared
|
||||
-minecraft_version=1.20.6
|
||||
+minecraft_version=1.18.2
|
||||
project_group=com.hypherionmc.craterlib
|
||||
|
||||
# Fabric
|
||||
fabric_loader=0.15.0
|
||||
-fabric_api=0.97.8+1.20.6
|
||||
+fabric_api=0.76.0+1.18.2
|
||||
|
||||
# Forge
|
||||
-forge_version=50.0.6
|
||||
-
|
||||
-# NeoForged
|
||||
-neoforge_version=41-beta
|
||||
+forge_version=40.2.0
|
||||
|
||||
# Dependencies
|
||||
moon_config=1.0.9
|
||||
@@ -30,11 +27,10 @@
|
||||
discord_formatter=2.0.0
|
||||
|
||||
# Mod Dependencies
|
||||
-fabrictailor=2.3.1
|
||||
-vanish=1.5.4+1.20.5
|
||||
-mod_menu_version=10.0.0-beta.1
|
||||
-vanishmod=1.1.12.1
|
||||
-vanishmod_neo=puxrKAMr
|
||||
+fabrictailor=1.9.0+1.18.2
|
||||
+vanish=1.1.0
|
||||
+mod_menu_version=3.2.5
|
||||
+vanishmod=1.1.14
|
||||
|
||||
# Publishing
|
||||
curse_id=867099
|
8
patches/1.18.2/settings.gradle.patch
Normal file
8
patches/1.18.2/settings.gradle.patch
Normal file
@@ -0,0 +1,8 @@
|
||||
--- a/settings.gradle
|
||||
+++ b/settings.gradle
|
||||
@@ -11,4 +11,4 @@
|
||||
}
|
||||
|
||||
rootProject.name = 'CraterLib'
|
||||
-include("Common", "Fabric", "NeoForge", "Forge")
|
||||
+include("Common", "Fabric", "Forge")
|
29
patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch
Normal file
29
patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
--- a/.jenkins/Jenkinsfile.deploy
|
||||
+++ b/.jenkins/Jenkinsfile.deploy
|
||||
@@ -1,7 +1,7 @@
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
- image "registry.firstdark.dev/java21:latest"
|
||||
+ image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
- title: "Deploy Started: CraterLib Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "Deploy Started: CraterLib 1.19.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
@@ -39,7 +39,7 @@
|
||||
deleteDir()
|
||||
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
- title: "CraterLib Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "CraterLib 1.19.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: currentBuild.currentResult,
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"
|
52
patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
Normal file
52
patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
Normal file
@@ -0,0 +1,52 @@
|
||||
--- a/.jenkins/Jenkinsfile.snapshot
|
||||
+++ b/.jenkins/Jenkinsfile.snapshot
|
||||
@@ -1,10 +1,11 @@
|
||||
def projectName = "CraterLib";
|
||||
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
|
||||
+def relType = "snapshot"
|
||||
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
- image "registry.firstdark.dev/java21:latest"
|
||||
+ image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
}
|
||||
}
|
||||
@@ -13,7 +14,7 @@
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.SSS_WEBHOOK,
|
||||
- title: "Deploy Started: ${projectName} Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "Deploy Started: ${projectName} 1.19.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
@@ -29,14 +30,14 @@
|
||||
|
||||
stage("Build") {
|
||||
steps {
|
||||
- sh "./gradlew build -PreleaseType=port"
|
||||
+ sh "./gradlew build -PreleaseType=${relType}"
|
||||
}
|
||||
}
|
||||
|
||||
stage("Publish to Maven") {
|
||||
steps {
|
||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||
- sh "./gradlew publish -PreleaseType=port"
|
||||
+ sh "./gradlew publish -PreleaseType=${relType}"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -51,8 +52,8 @@
|
||||
projectSlug: "craterlib",
|
||||
projectName: "${projectName}",
|
||||
projectIcon: "${projectIcon}",
|
||||
- modLoaders: "forge|neoforge|fabric|quilt",
|
||||
- minecraftVersions: "1.20.6",
|
||||
+ modLoaders: "forge|fabric|quilt",
|
||||
+ minecraftVersions: "1.19.2",
|
||||
failWebhook: env.SSS_WEBHOOK,
|
||||
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
|
||||
|
@@ -0,0 +1,22 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/api/networking/CommonPacketWrapper.java
|
||||
+++ /dev/null
|
||||
@@ -1,19 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.api.networking;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
|
||||
-import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
|
||||
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
-
|
||||
-public record CommonPacketWrapper<T>(PacketHolder<T> container, T packet) implements CustomPacketPayload
|
||||
-{
|
||||
- public void encode(BridgedFriendlyByteBuf buf)
|
||||
- {
|
||||
- container().encoder().accept(packet(), buf);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Type<? extends CustomPacketPayload> type()
|
||||
- {
|
||||
- return container.type();
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,97 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
|
||||
@@ -8,10 +8,10 @@
|
||||
import com.hypherionmc.craterlib.core.config.annotations.Tooltip;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.*;
|
||||
+import com.mojang.math.Matrix4f;
|
||||
import me.hypherionmc.moonconfig.core.conversion.SpecComment;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.screens.ConfirmScreen;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.renderer.GameRenderer;
|
||||
@@ -20,7 +20,6 @@
|
||||
import net.minecraft.util.Mth;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
-import org.joml.Matrix4f;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
@@ -177,19 +176,19 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
- overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
|
||||
+ public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
|
||||
+ overlayBackground(matrices, TOP, height - BOTTOM, 32);
|
||||
+
|
||||
renderScrollBar();
|
||||
|
||||
- matrices.pose().pushPose();
|
||||
- matrices.pose().translate(0, 0, 500.0);
|
||||
- overlayBackground(matrices.pose(), 0, TOP, 64);
|
||||
- overlayBackground(matrices.pose(), height - BOTTOM, height, 64);
|
||||
- renderShadow(matrices.pose());
|
||||
- matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF);
|
||||
- matrices.pose().popPose();
|
||||
-
|
||||
+ matrices.pushPose();
|
||||
+ matrices.translate(0, 0, 500.0);
|
||||
+ overlayBackground(matrices, 0, TOP, 64);
|
||||
+ overlayBackground(matrices, height - BOTTOM, height, 64);
|
||||
+ renderShadow(matrices);
|
||||
+ drawCenteredString(matrices, font, getTitle(), width / 2, 9, 0xFFFFFF);
|
||||
super.render(matrices, mouseX, mouseY, delta);
|
||||
+ matrices.popPose();
|
||||
|
||||
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
|
||||
for (Option<?> option : options) {
|
||||
@@ -268,9 +267,9 @@
|
||||
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
|
||||
Tesselator tesselator = Tesselator.getInstance();
|
||||
BufferBuilder buffer = tesselator.getBuilder();
|
||||
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
|
||||
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
|
||||
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
|
||||
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
|
||||
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
|
||||
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
|
||||
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
|
||||
@@ -334,12 +333,12 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public boolean mouseScrolled(double d, double e, double f, double g) {
|
||||
+ public boolean mouseScrolled(double d, double e, double f) {
|
||||
if (e >= TOP && e <= height - BOTTOM) {
|
||||
scrollerAmount = Mth.clamp(scrollerAmount - f * 16.0D, 0, scrollHeight());
|
||||
return true;
|
||||
}
|
||||
- return super.mouseScrolled(d, e, f, g);
|
||||
+ return super.mouseScrolled(d, e, f);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -378,7 +377,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- private void renderConfigTooltip(GuiGraphics stack, Font font, int mouseX, int mouseY, int startX, int startY, int sizeX, int sizeY, String title, String... description) {
|
||||
+ private void renderConfigTooltip(PoseStack stack, Font font, int mouseX, int mouseY, int startX, int startY, int sizeX, int sizeY, String title, String... description) {
|
||||
if (mouseX > startX && mouseX < startX + sizeX) {
|
||||
if (mouseY > startY && mouseY < startY + sizeY) {
|
||||
List<Component> list = new ArrayList<>();
|
||||
@@ -386,7 +385,7 @@
|
||||
for (String desc : description) {
|
||||
list.add(Component.translatable(desc));
|
||||
}
|
||||
- stack.renderComponentTooltip(font, list, mouseX, mouseY);
|
||||
+ renderComponentTooltip(stack, list, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,27 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.AbstractWidget;
|
||||
import net.minecraft.client.gui.components.EditBox;
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
public W widget;
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
+ public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
|
||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||
int i = (widget instanceof EditBox ? 1 : 0);
|
||||
- widget.setX(x + width - 200 - resetButtonOffset + i);
|
||||
- widget.setY(y + i + 1);
|
||||
+ widget.x = (x + width - 200 - resetButtonOffset + i);
|
||||
+ widget.y = (y + i + 1);
|
||||
widget.render(matrices, mouseX, mouseY, delta);
|
||||
}
|
||||
}
|
@@ -0,0 +1,44 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+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.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.MutableComponent;
|
||||
@@ -16,7 +16,7 @@
|
||||
public class BaseWidget<T> extends Option<T> {
|
||||
|
||||
public static final int resetButtonOffset = 48;
|
||||
- private final Button resetButton = addChild(Button.builder(Component.literal("Reset"), this::onResetPressed).size(46, 20).build());
|
||||
+ private final Button resetButton = addChild(new Button(0, 0, 46, 20, Component.literal("Reset"), this::onResetPressed));
|
||||
private boolean hideReset = false;
|
||||
|
||||
private boolean isSubConfig = false;
|
||||
@@ -39,7 +39,7 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
+ 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());
|
||||
boolean edited = isEdited() || hasErrors;
|
||||
if (edited) {
|
||||
@@ -50,9 +50,9 @@
|
||||
} else {
|
||||
text.withStyle(ChatFormatting.GRAY);
|
||||
}
|
||||
- matrices.drawString(font, text, x, y + font.lineHeight - 2, 0xFFFFFF);
|
||||
- resetButton.setX(x + width - 46);
|
||||
- resetButton.setY(y + 1);
|
||||
+ font.draw(matrices, text, x, y, 0xFFFFFF);
|
||||
+ resetButton.x = (x + width - 46);
|
||||
+ resetButton.y = (y + 1);
|
||||
resetButton.active = isNotDefault();
|
||||
if (!hideReset) {
|
||||
resetButton.render(matrices, mouseX, mouseY, delta);
|
@@ -0,0 +1,39 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java
|
||||
@@ -1,11 +1,12 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
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 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected void renderWidget(GuiGraphics arg, int i, int j, float f) {
|
||||
+ 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"));
|
||||
} else {
|
||||
@@ -30,11 +31,11 @@
|
||||
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
|
||||
- protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
|
||||
+ public void updateNarration(NarrationElementOutput narrationElementOutput) {
|
||||
narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
|
||||
}
|
||||
|
@@ -0,0 +1,23 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
|
||||
import net.minecraft.client.gui.components.events.GuiEventListener;
|
||||
import net.minecraft.network.chat.Component;
|
||||
@@ -34,7 +34,7 @@
|
||||
@Getter
|
||||
private List<String> langKeys = new ArrayList<>();
|
||||
|
||||
- public abstract void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta);
|
||||
+ public abstract void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta);
|
||||
|
||||
public int height() {
|
||||
return 22;
|
@@ -0,0 +1,27 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
||||
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.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.network.chat.Component;
|
||||
@@ -23,11 +23,11 @@
|
||||
this.subConfig = subConfig;
|
||||
this.screen = screen;
|
||||
|
||||
- this.widget = addChild(Button.builder(Component.translatable("t.clc.opensubconfig"), this::openSubConfig).size(200, buttonHeight).build());
|
||||
+ this.widget = addChild(new Button(0, 0, 200, buttonHeight, Component.translatable("t.clc.opensubconfig"), this::openSubConfig));
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
+ 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.hideReset();
|
||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
@@ -0,0 +1,21 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||
|
||||
+import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Font;
|
||||
-import net.minecraft.client.gui.GuiGraphics;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
||||
+ public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
|
||||
widget.setTextColor(hasErrors ? 16733525 : 14737632);
|
||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||
}
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ToggleButton.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ToggleButton.java
|
||||
@@ -18,7 +18,7 @@
|
||||
public ToggleButton(List<T> options, Function<T, Component> toComponent) {
|
||||
this.options = options;
|
||||
this.toComponent = toComponent;
|
||||
- this.widget = addChild(Button.builder(Component.empty(), this::switchNext).size(buttonWidth, buttonHeight).build());
|
||||
+ this.widget = addChild(new Button(0, 0, buttonWidth, buttonHeight, Component.empty(), this::switchNext));
|
||||
}
|
||||
|
||||
@Override
|
@@ -0,0 +1,43 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.hypherionmc.craterlib.core.networking.data;
|
||||
|
||||
-import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
|
||||
import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
|
||||
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
|
||||
-import net.minecraft.network.FriendlyByteBuf;
|
||||
-import net.minecraft.network.codec.StreamCodec;
|
||||
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.Consumer;
|
||||
@@ -14,27 +10,9 @@
|
||||
/**
|
||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
||||
*/
|
||||
-public record PacketHolder<T>(CustomPacketPayload.Type<? extends CustomPacketPayload> type,
|
||||
+public record PacketHolder<T>(ResourceIdentifier type,
|
||||
Class<T> messageType,
|
||||
BiConsumer<T, BridgedFriendlyByteBuf> encoder,
|
||||
Function<BridgedFriendlyByteBuf, T> decoder,
|
||||
Consumer<PacketContext<T>> handler) {
|
||||
-
|
||||
- public PacketHolder(ResourceIdentifier packetId, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
|
||||
- this(new CustomPacketPayload.Type<>(packetId.toMojang()), messageType, encoder, decoder, handler);
|
||||
- }
|
||||
-
|
||||
- @SuppressWarnings("unchecked")
|
||||
- public <K extends CustomPacketPayload> CustomPacketPayload.Type<K> getType()
|
||||
- {
|
||||
- return (CustomPacketPayload.Type<K>) type();
|
||||
- }
|
||||
-
|
||||
- public StreamCodec<FriendlyByteBuf, CommonPacketWrapper> getCodec()
|
||||
- {
|
||||
- return CustomPacketPayload.codec(
|
||||
- (packet, buf) -> this.encoder().accept((T)packet.packet(), BridgedFriendlyByteBuf.of(buf)),
|
||||
- (buf) -> new CommonPacketWrapper<>(this, this.decoder().apply(BridgedFriendlyByteBuf.of(buf))));
|
||||
- }
|
||||
-
|
||||
}
|
@@ -0,0 +1,36 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
|
||||
@@ -9,28 +9,28 @@
|
||||
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 = CraterCommandEvent.of(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);
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,26 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerAdvancementsMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerAdvancementsMixin.java
|
||||
@@ -5,7 +5,6 @@
|
||||
import com.hypherionmc.craterlib.nojang.advancements.BridgedAdvancement;
|
||||
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
import net.minecraft.advancements.Advancement;
|
||||
-import net.minecraft.advancements.AdvancementHolder;
|
||||
import net.minecraft.server.PlayerAdvancements;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
@@ -21,11 +20,10 @@
|
||||
private ServerPlayer player;
|
||||
|
||||
@Inject(method = "award", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancements/AdvancementRewards;grant(Lnet/minecraft/server/level/ServerPlayer;)V", shift = At.Shift.AFTER))
|
||||
- private void injectAdvancementEvent(AdvancementHolder advancementHolder, String string, CallbackInfoReturnable<Boolean> cir) {
|
||||
- Advancement advancement = advancementHolder.value();
|
||||
+ private void injectAdvancementEvent(Advancement advancement, String string, CallbackInfoReturnable<Boolean> cir) {
|
||||
+ if (advancement.getDisplay() == null || !advancement.getDisplay().shouldAnnounceChat())
|
||||
+ return;
|
||||
|
||||
- if (advancement.display().isPresent() && advancement.display().get().shouldAnnounceChat()) {
|
||||
- CraterEventBus.INSTANCE.postEvent(new CraterAdvancementEvent(BridgedPlayer.of(this.player), BridgedAdvancement.of(advancementHolder.value())));
|
||||
- }
|
||||
+ CraterEventBus.INSTANCE.postEvent(new CraterAdvancementEvent(BridgedPlayer.of(this.player), BridgedAdvancement.of(advancement)));
|
||||
}
|
||||
}
|
@@ -0,0 +1,19 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerListMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerListMixin.java
|
||||
@@ -11,7 +11,6 @@
|
||||
import net.minecraft.network.Connection;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
-import net.minecraft.server.network.CommonListenerCookie;
|
||||
import net.minecraft.server.players.PlayerList;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
@@ -33,7 +32,7 @@
|
||||
}
|
||||
|
||||
@Inject(method = "placeNewPlayer", at = @At("TAIL"))
|
||||
- private void injectPlayerLoginEvent(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) {
|
||||
+ private void injectPlayerLoginEvent(Connection arg, ServerPlayer serverPlayer, CallbackInfo ci) {
|
||||
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(serverPlayer)));
|
||||
}
|
||||
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/ClientLevelMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/ClientLevelMixin.java
|
||||
@@ -15,7 +15,7 @@
|
||||
public class ClientLevelMixin {
|
||||
|
||||
@Inject(method = "addEntity", at = @At("HEAD"))
|
||||
- private void injectSinglePlayerJoinEvent(Entity entity, CallbackInfo ci) {
|
||||
+ private void injectSinglePlayerJoinEvent(int i, Entity entity, CallbackInfo ci) {
|
||||
if (entity instanceof Player player) {
|
||||
CraterSinglePlayerEvent.PlayerLogin playerLogin = new CraterSinglePlayerEvent.PlayerLogin(BridgedPlayer.of(player));
|
||||
CraterEventBus.INSTANCE.postEvent(playerLogin);
|
@@ -0,0 +1,13 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java
|
||||
@@ -14,8 +14,8 @@
|
||||
@Mixin(RealmsMainScreen.class)
|
||||
public class RealmsMainScreenMixin {
|
||||
|
||||
- @Inject(at = @At("HEAD"), method = "play(Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/client/gui/screens/Screen;Z)V")
|
||||
- private static void play(RealmsServer serverData, Screen arg2, boolean bl, CallbackInfo ci) {
|
||||
+ @Inject(at = @At("HEAD"), method = "play")
|
||||
+ private void play(RealmsServer serverData, Screen arg2, CallbackInfo ci) {
|
||||
PlayerJoinRealmEvent playerJoinRealm = new PlayerJoinRealmEvent(BridgedRealmsServer.of(serverData));
|
||||
CraterEventBus.INSTANCE.postEvent(playerJoinRealm);
|
||||
}
|
@@ -0,0 +1,13 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancement.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/advancements/BridgedAdvancement.java
|
||||
@@ -11,8 +11,8 @@
|
||||
private final Advancement internal;
|
||||
|
||||
public Optional<BridgedDisplayInfo> displayInfo() {
|
||||
- if (internal.display().isPresent()) {
|
||||
- return Optional.of(BridgedDisplayInfo.of(internal.display().get()));
|
||||
+ if (internal.getDisplay() != null) {
|
||||
+ return Optional.of(BridgedDisplayInfo.of(internal.getDisplay()));
|
||||
}
|
||||
|
||||
return Optional.empty();
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java
|
||||
@@ -35,7 +35,7 @@
|
||||
}
|
||||
|
||||
public boolean isRealmServer() {
|
||||
- return internal.getCurrentServer() != null && internal.getCurrentServer().isRealm();
|
||||
+ return internal.getCurrentServer() != null && internal.isConnectedToRealms();
|
||||
}
|
||||
|
||||
public boolean isSinglePlayer() {
|
@@ -0,0 +1,31 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java
|
||||
@@ -3,6 +3,7 @@
|
||||
import com.hypherionmc.craterlib.utils.ChatUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import net.kyori.adventure.text.Component;
|
||||
+import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.multiplayer.ServerData;
|
||||
import net.minecraft.client.multiplayer.ServerStatusPinger;
|
||||
|
||||
@@ -24,13 +25,17 @@
|
||||
}
|
||||
|
||||
public int getMaxPlayers() {
|
||||
- if (internal.players == null) {
|
||||
+ if (!internal.pinged || internal.status.getString() == null) {
|
||||
try {
|
||||
- new ServerStatusPinger().pingServer(internal, () -> {}, () -> {});
|
||||
+ new ServerStatusPinger().pingServer(internal, () -> {});
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
|
||||
- return internal.players == null ? 0 : internal.players.max();
|
||||
+ try {
|
||||
+ return Integer.parseInt(ChatFormatting.stripFormatting(internal.status.getString()).split("/")[1]);
|
||||
+ } catch (Exception ignored) {}
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
public ServerData toMojang() {
|
@@ -0,0 +1,11 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java
|
||||
@@ -13,7 +13,7 @@
|
||||
private final CommandSourceStack internal;
|
||||
|
||||
public void sendSuccess(Supplier<Component> supplier, boolean bl) {
|
||||
- internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
|
||||
+ internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
|
||||
}
|
||||
|
||||
public CommandSourceStack toMojang() {
|
@@ -0,0 +1,13 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedFakePlayer.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedFakePlayer.java
|
||||
@@ -43,8 +43,8 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void sendSuccess(Supplier<Component> supplier, boolean bl) {
|
||||
- successCallback.accept(() -> ChatUtils.mojangToAdventure(supplier.get()), bl);
|
||||
+ public void sendSuccess(Component supplier, boolean bl) {
|
||||
+ successCallback.accept(() -> ChatUtils.mojangToAdventure(supplier), bl);
|
||||
}
|
||||
|
||||
@Override
|
@@ -0,0 +1,37 @@
|
||||
--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
|
||||
+++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
|
||||
@@ -5,22 +5,29 @@
|
||||
import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
||||
+import net.kyori.adventure.text.serializer.json.JSONOptions;
|
||||
+import net.kyori.option.OptionState;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.Util;
|
||||
-import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.Style;
|
||||
|
||||
public class ChatUtils {
|
||||
|
||||
+ private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options(
|
||||
+ OptionState.optionState()
|
||||
+ .value(JSONOptions.EMIT_HOVER_SHOW_ENTITY_ID_AS_INT_ARRAY, false)
|
||||
+ .value(JSONOptions.EMIT_HOVER_EVENT_TYPE, JSONOptions.HoverEventValueMode.MODERN_ONLY).build()
|
||||
+ ).build();
|
||||
+
|
||||
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
|
||||
- final String serialised = GsonComponentSerializer.gson().serialize(inComponent);
|
||||
- return Component.Serializer.fromJson(serialised, RegistryAccess.EMPTY);
|
||||
+ final String serialised = adventureSerializer.serialize(inComponent);
|
||||
+ return Component.Serializer.fromJson(serialised);
|
||||
}
|
||||
|
||||
public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
|
||||
- final String serialised = Component.Serializer.toJson(inComponent, RegistryAccess.EMPTY);
|
||||
- return GsonComponentSerializer.gson().deserialize(serialised);
|
||||
+ final String serialised = Component.Serializer.toJson(inComponent);
|
||||
+ return adventureSerializer.deserialize(serialised);
|
||||
}
|
||||
|
||||
// Some text components contain duplicate text, resulting in duplicate messages
|
13
patches/1.19.2/Fabric/build.gradle.patch
Normal file
13
patches/1.19.2/Fabric/build.gradle.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
--- a/Fabric/build.gradle
|
||||
+++ b/Fabric/build.gradle
|
||||
@@ -110,8 +110,8 @@
|
||||
setVersionType("release")
|
||||
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
|
||||
setProjectVersion("${minecraft_version}-${project.version}")
|
||||
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}")
|
||||
- setGameVersions("1.20.6")
|
||||
+ setDisplayName("[FABRIC/QUILT 1.19.2] CraterLib - ${project.version}")
|
||||
+ setGameVersions("1.19.2")
|
||||
setLoaders("fabric", "quilt")
|
||||
setArtifact(remapJar)
|
||||
setCurseEnvironment("both")
|
@@ -0,0 +1,28 @@
|
||||
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
@@ -14,6 +14,9 @@
|
||||
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;
|
||||
+
|
||||
+import java.util.concurrent.CompletableFuture;
|
||||
|
||||
@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
|
||||
public class ServerGamePacketListenerImplMixin {
|
||||
@@ -22,12 +25,12 @@
|
||||
public ServerPlayer player;
|
||||
|
||||
@Inject(
|
||||
- method = "lambda$handleChat$5",
|
||||
+ method = "lambda$handleChat$9",
|
||||
at = @At("HEAD"),
|
||||
cancellable = true
|
||||
)
|
||||
- private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
|
||||
- CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
|
||||
+ private void injectChatEvent(PlayerChatMessage arg, CallbackInfoReturnable<CompletableFuture> ci) {
|
||||
+ CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.serverContent().getString(), ChatUtils.mojangToAdventure(arg.serverContent()));
|
||||
CraterEventBus.INSTANCE.postEvent(event);
|
||||
if (event.wasCancelled())
|
||||
ci.cancel();
|
@@ -0,0 +1,119 @@
|
||||
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java
|
||||
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java
|
||||
@@ -1,46 +1,57 @@
|
||||
package com.hypherionmc.craterlib.network;
|
||||
|
||||
-import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
|
||||
+import com.hypherionmc.craterlib.CraterConstants;
|
||||
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
|
||||
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
|
||||
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
|
||||
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
||||
+import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
|
||||
+import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
|
||||
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
||||
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
+import net.minecraft.network.FriendlyByteBuf;
|
||||
+import net.minecraft.resources.ResourceLocation;
|
||||
+import net.minecraft.server.level.ServerPlayer;
|
||||
+
|
||||
+import java.util.HashMap;
|
||||
+import java.util.Map;
|
||||
+import java.util.function.BiConsumer;
|
||||
|
||||
/**
|
||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
||||
*/
|
||||
public class CraterFabricNetworkHandler extends PacketRegistry {
|
||||
|
||||
+ private final Map<Class<?>, Message<?>> CHANNELS = new HashMap();
|
||||
+
|
||||
public CraterFabricNetworkHandler(PacketSide side) {
|
||||
super(side);
|
||||
}
|
||||
|
||||
protected <T> void registerPacket(PacketHolder<T> holder) {
|
||||
- try
|
||||
- {
|
||||
- PayloadTypeRegistry.playC2S().register(holder.getType(), holder.getCodec());
|
||||
- PayloadTypeRegistry.playS2C().register(holder.getType(), holder.getCodec());
|
||||
- }
|
||||
- catch (IllegalArgumentException e)
|
||||
- {
|
||||
- // do nothing
|
||||
- }
|
||||
-
|
||||
- if (PacketSide.CLIENT.equals(this.side)) {
|
||||
- ClientPlayNetworking.registerGlobalReceiver(holder.getType(),
|
||||
- (ClientPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.client().execute(() ->
|
||||
- holder.handler().accept(
|
||||
- new PacketContext<>(payload.packet(), side))));
|
||||
- }
|
||||
-
|
||||
- ServerPlayNetworking.registerGlobalReceiver(holder.getType(),
|
||||
- (ServerPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.player().server.execute(() ->
|
||||
- holder.handler().accept(
|
||||
- new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side))));
|
||||
+ if (CHANNELS.get(holder.messageType()) == null) {
|
||||
+ CHANNELS.put(holder.messageType(), new Message<>(holder.type(), holder.encoder()));
|
||||
+
|
||||
+ if (PacketSide.CLIENT.equals(this.side)) {
|
||||
+ ClientPlayNetworking.registerGlobalReceiver(holder.type().toMojang(), ((client, listener, buf, responseSender) -> {
|
||||
+ buf.readByte();
|
||||
+ T message = holder.decoder().apply(BridgedFriendlyByteBuf.of(buf));
|
||||
+ client.execute(() -> holder.handler().accept(new PacketContext<>(message, PacketSide.CLIENT)));
|
||||
+ }));
|
||||
+ } else {
|
||||
+
|
||||
+ ServerPlayNetworking.registerGlobalReceiver(holder.type().toMojang(), ((server, player, listener, buf, responseSender) -> {
|
||||
+ buf.readByte();
|
||||
+ T message = holder.decoder().apply(BridgedFriendlyByteBuf.of(buf));
|
||||
+ server.execute(() -> holder.handler().accept(new PacketContext<>(BridgedPlayer.of(player), message, PacketSide.SERVER)));
|
||||
+ }));
|
||||
+ }
|
||||
+
|
||||
+ } else {
|
||||
+ CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
|
||||
+ }
|
||||
}
|
||||
|
||||
public <T> void sendToServer(T packet) {
|
||||
@@ -48,21 +59,25 @@
|
||||
}
|
||||
|
||||
public <T> void sendToServer(T packet, boolean ignoreCheck) {
|
||||
- PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
|
||||
+ Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
|
||||
|
||||
- if (container != null) {
|
||||
- if (ignoreCheck || ClientPlayNetworking.canSend(container.type().id())) {
|
||||
- ClientPlayNetworking.send(new CommonPacketWrapper<>(container, packet));
|
||||
- }
|
||||
+ if (ClientPlayNetworking.canSend(message.id().toMojang()) || ignoreCheck) {
|
||||
+ FriendlyByteBuf buf = PacketByteBufs.create();
|
||||
+ buf.writeByte(0);
|
||||
+ message.encoder().accept(packet, BridgedFriendlyByteBuf.of(buf));
|
||||
+ ClientPlayNetworking.send(message.id().toMojang(), buf);
|
||||
}
|
||||
}
|
||||
|
||||
public <T> void sendToClient(T packet, BridgedPlayer player) {
|
||||
- PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
|
||||
- if (container != null) {
|
||||
- if (ServerPlayNetworking.canSend(player.toMojangServerPlayer(), container.type().id())) {
|
||||
- ServerPlayNetworking.send(player.toMojangServerPlayer(), new CommonPacketWrapper<>(container, packet));
|
||||
- }
|
||||
+ Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
|
||||
+ if (ServerPlayNetworking.canSend(player.toMojangServerPlayer(), message.id().toMojang())) {
|
||||
+ FriendlyByteBuf buf = PacketByteBufs.create();
|
||||
+ buf.writeByte(0);
|
||||
+ message.encoder().accept(packet, BridgedFriendlyByteBuf.of(buf));
|
||||
+ ServerPlayNetworking.send(player.toMojangServerPlayer(), message.id().toMojang(), buf);
|
||||
}
|
||||
}
|
||||
+
|
||||
+ public record Message<T>(ResourceIdentifier id, BiConsumer<T, BridgedFriendlyByteBuf> encoder) { }
|
||||
}
|
@@ -0,0 +1,12 @@
|
||||
--- a/Fabric/src/main/resources/fabric.mod.json
|
||||
+++ b/Fabric/src/main/resources/fabric.mod.json
|
||||
@@ -33,7 +33,7 @@
|
||||
"depends": {
|
||||
"fabricloader": ">=0.15.0",
|
||||
"fabric-api": "*",
|
||||
- "minecraft": ">=1.20.6",
|
||||
- "java": ">=21"
|
||||
+ "minecraft": "1.19.2",
|
||||
+ "java": ">=17"
|
||||
}
|
||||
}
|
22
patches/1.19.2/Forge/build.gradle.patch
Normal file
22
patches/1.19.2/Forge/build.gradle.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
--- a/Forge/build.gradle
|
||||
+++ b/Forge/build.gradle
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
dependencies {
|
||||
// Compat
|
||||
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
|
||||
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
|
||||
|
||||
// Do not edit or remove
|
||||
implementation project(":Common")
|
||||
@@ -104,8 +104,8 @@
|
||||
setVersionType("release")
|
||||
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
|
||||
setProjectVersion("${minecraft_version}-${project.version}")
|
||||
- setDisplayName("[Forge 1.20.6] CraterLib - ${project.version}")
|
||||
- setGameVersions("1.20.6")
|
||||
+ setDisplayName("[Forge 1.19.2] CraterLib - ${project.version}")
|
||||
+ setGameVersions("1.19.2")
|
||||
setLoaders("forge")
|
||||
setArtifact(remapJar)
|
||||
setCurseEnvironment("both")
|
@@ -0,0 +1,20 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
|
||||
@@ -3,6 +3,7 @@
|
||||
import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
|
||||
import com.hypherionmc.craterlib.common.ForgeServerEvents;
|
||||
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
+import com.hypherionmc.craterlib.compat.Vanish;
|
||||
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
|
||||
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
||||
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
|
||||
@@ -32,5 +33,9 @@
|
||||
LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
|
||||
CraterEventBus.INSTANCE.postEvent(event);
|
||||
});
|
||||
+
|
||||
+ if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
|
||||
+ MinecraftForge.EVENT_BUS.register(new Vanish());
|
||||
+ }
|
||||
}
|
||||
}
|
@@ -0,0 +1,28 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
|
||||
@@ -14,6 +14,9 @@
|
||||
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;
|
||||
+
|
||||
+import java.util.concurrent.CompletableFuture;
|
||||
|
||||
@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
|
||||
public class ServerGamePacketListenerImplMixin {
|
||||
@@ -22,12 +25,12 @@
|
||||
public ServerPlayer player;
|
||||
|
||||
@Inject(
|
||||
- method = "lambda$handleChat$5",
|
||||
+ method = "lambda$handleChat$10",
|
||||
at = @At("HEAD"),
|
||||
cancellable = true
|
||||
)
|
||||
- private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
|
||||
- CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
|
||||
+ private void injectChatEvent(PlayerChatMessage arg, CallbackInfoReturnable<CompletableFuture> ci) {
|
||||
+ CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.serverContent().getString(), ChatUtils.mojangToAdventure(arg.serverContent()));
|
||||
CraterEventBus.INSTANCE.postEvent(event);
|
||||
if (event.wasCancelled())
|
||||
ci.cancel();
|
@@ -0,0 +1,94 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java
|
||||
@@ -12,16 +12,17 @@
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.server.network.ServerGamePacketListenerImpl;
|
||||
-import net.minecraftforge.event.network.CustomPayloadEvent;
|
||||
-import net.minecraftforge.network.ChannelBuilder;
|
||||
-import net.minecraftforge.network.PacketDistributor;
|
||||
-import net.minecraftforge.network.SimpleChannel;
|
||||
+import net.minecraftforge.network.NetworkDirection;
|
||||
+import net.minecraftforge.network.NetworkEvent;
|
||||
+import net.minecraftforge.network.NetworkRegistry;
|
||||
+import net.minecraftforge.network.simple.SimpleChannel;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
+import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
||||
@@ -35,18 +36,19 @@
|
||||
|
||||
protected <T> void registerPacket(PacketHolder<T> holder) {
|
||||
if (CHANNELS.get(holder.messageType()) == null) {
|
||||
- SimpleChannel channel = ChannelBuilder
|
||||
- .named(holder.type().id())
|
||||
- .clientAcceptedVersions((a, b) -> true)
|
||||
- .serverAcceptedVersions((a, b) -> true)
|
||||
- .networkProtocolVersion(1)
|
||||
+ SimpleChannel channel = NetworkRegistry.ChannelBuilder
|
||||
+ .named(holder.type().toMojang())
|
||||
+ .clientAcceptedVersions((a) -> true)
|
||||
+ .serverAcceptedVersions((a) -> true)
|
||||
+ .networkProtocolVersion(() -> "1")
|
||||
.simpleChannel();
|
||||
|
||||
- channel.messageBuilder(holder.messageType())
|
||||
- .decoder(mojangDecoder(holder.decoder()))
|
||||
- .encoder(mojangEncoder(holder.encoder()))
|
||||
- .consumerNetworkThread(buildHandler(holder.handler()))
|
||||
- .add();
|
||||
+ channel.registerMessage(
|
||||
+ 0,
|
||||
+ holder.messageType(),
|
||||
+ mojangEncoder(holder.encoder()),
|
||||
+ mojangDecoder(holder.decoder()),
|
||||
+ buildHandler(holder.handler()));
|
||||
|
||||
CHANNELS.put(holder.messageType(), channel);
|
||||
} else {
|
||||
@@ -62,7 +64,7 @@
|
||||
SimpleChannel channel = CHANNELS.get(packet.getClass());
|
||||
Connection connection = Minecraft.getInstance().getConnection().getConnection();
|
||||
if (channel.isRemotePresent(connection) || ignoreCheck) {
|
||||
- channel.send(packet, PacketDistributor.SERVER.noArg());
|
||||
+ channel.sendToServer(packet);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,8 +74,8 @@
|
||||
if (connection == null)
|
||||
return;
|
||||
|
||||
- if (channel.isRemotePresent(connection.getConnection())) {
|
||||
- channel.send(packet, PacketDistributor.PLAYER.with(player.toMojangServerPlayer()));
|
||||
+ if (channel.isRemotePresent(connection.connection)) {
|
||||
+ channel.sendTo(packet, player.getConnection().connection, NetworkDirection.PLAY_TO_CLIENT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,14 +87,14 @@
|
||||
return ((t, byteBuf) -> handler.accept(t, BridgedFriendlyByteBuf.of(byteBuf)));
|
||||
}
|
||||
|
||||
- private <T> BiConsumer<T, CustomPayloadEvent.Context> buildHandler(Consumer<PacketContext<T>> handler) {
|
||||
+ private <T> BiConsumer<T, Supplier<NetworkEvent.Context>> buildHandler(Consumer<PacketContext<T>> handler) {
|
||||
return (message, ctx) -> {
|
||||
- ctx.enqueueWork(() -> {
|
||||
- PacketSide side = ctx.getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
|
||||
- ServerPlayer player = ctx.getSender();
|
||||
+ ctx.get().enqueueWork(() -> {
|
||||
+ PacketSide side = ctx.get().getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
|
||||
+ ServerPlayer player = ctx.get().getSender();
|
||||
handler.accept(new PacketContext<>(BridgedPlayer.of(player), message, side));
|
||||
});
|
||||
- ctx.setPacketHandled(true);
|
||||
+ ctx.get().setPacketHandled(true);
|
||||
};
|
||||
}
|
||||
}
|
@@ -0,0 +1,25 @@
|
||||
--- a/Forge/src/main/resources/META-INF/mods.toml
|
||||
+++ b/Forge/src/main/resources/META-INF/mods.toml
|
||||
@@ -1,5 +1,5 @@
|
||||
modLoader = "javafml"
|
||||
-loaderVersion = "[50,)"
|
||||
+loaderVersion = "[43,)"
|
||||
license = "MIT"
|
||||
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
[[dependencies.${ mod_id }]]
|
||||
modId = "forge"
|
||||
mandatory = true
|
||||
- versionRange = "[50,)"
|
||||
+ versionRange = "[43,)"
|
||||
ordering = "NONE"
|
||||
side = "BOTH"
|
||||
|
||||
[[dependencies.${ mod_id }]]
|
||||
modId = "minecraft"
|
||||
mandatory = true
|
||||
- versionRange = "[1.20.6,1.21)"
|
||||
+ versionRange = "[1.19.2,1.19.3)"
|
||||
ordering = "NONE"
|
||||
side = "BOTH"
|
114
patches/1.19.2/NeoForge/build.gradle.patch
Normal file
114
patches/1.19.2/NeoForge/build.gradle.patch
Normal file
@@ -0,0 +1,114 @@
|
||||
--- a/NeoForge/build.gradle
|
||||
+++ /dev/null
|
||||
@@ -1,111 +1,0 @@
|
||||
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
|
||||
-
|
||||
-dependencies {
|
||||
- // Compat
|
||||
- modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
|
||||
-
|
||||
- // Do not edit or remove
|
||||
- implementation project(":Common")
|
||||
-}
|
||||
-
|
||||
-shadowJar {
|
||||
- from sourceSets.main.output
|
||||
- configurations = [project.configurations.shade]
|
||||
-
|
||||
- dependencies {
|
||||
- exclude(dependency('com.google.code.gson:.*'))
|
||||
-
|
||||
- relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
|
||||
- relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
|
||||
- relocate 'net.kyori', 'shadow.kyori'
|
||||
- }
|
||||
-
|
||||
- setArchiveClassifier('dev-shadow')
|
||||
-}
|
||||
-
|
||||
-/**
|
||||
- * ===============================================================================
|
||||
- * = DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING =
|
||||
- * ===============================================================================
|
||||
- */
|
||||
-
|
||||
-unimined.minecraft {
|
||||
- neoForged {
|
||||
- loader neoforge_version
|
||||
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-remapJar {
|
||||
- inputFile.set shadowJar.archiveFile
|
||||
- dependsOn shadowJar
|
||||
- archiveClassifier.set null
|
||||
-}
|
||||
-
|
||||
-jar {
|
||||
- archiveClassifier.set "dev"
|
||||
-}
|
||||
-
|
||||
-processResources {
|
||||
- from project(":Common").sourceSets.main.resources
|
||||
- def buildProps = project.properties.clone()
|
||||
-
|
||||
- filesMatching("META-INF/neoforge.mods.toml") {
|
||||
- expand buildProps
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-compileTestJava.enabled = false
|
||||
-
|
||||
-tasks.withType(JavaCompile).configureEach {
|
||||
- source(project(":Common").sourceSets.main.allSource)
|
||||
-}
|
||||
-
|
||||
-/**
|
||||
- * Publishing Config
|
||||
- */
|
||||
-publishing {
|
||||
- publications {
|
||||
- mavenJava(MavenPublication) {
|
||||
- artifactId project.archivesBaseName
|
||||
- from components.java
|
||||
-
|
||||
- artifact(remapJar) {
|
||||
- builtBy remapJar
|
||||
- }
|
||||
-
|
||||
- pom.withXml {
|
||||
- Node pomNode = asNode()
|
||||
- pomNode.dependencies.'*'.findAll() {
|
||||
- it.artifactId.text() == 'regutils-joined-fabric' ||
|
||||
- it.artifactId.text() == 'core' ||
|
||||
- it.artifactId.text() == 'toml'
|
||||
- }.each() {
|
||||
- it.parent().remove(it)
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- repositories {
|
||||
- maven rootProject.orion.getPublishingMaven()
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-publisher {
|
||||
- apiKeys {
|
||||
- modrinth(System.getenv("MODRINTH_TOKEN"))
|
||||
- curseforge(System.getenv("CURSE_TOKEN"))
|
||||
- }
|
||||
-
|
||||
- setCurseID(curse_id)
|
||||
- setModrinthID(modrinth_id)
|
||||
- setVersionType("release")
|
||||
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
|
||||
- setProjectVersion("${minecraft_version}-${project.version}")
|
||||
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}")
|
||||
- setGameVersions("1.20.6")
|
||||
- setLoaders("neoforge")
|
||||
- setArtifact(remapJar)
|
||||
- setCurseEnvironment("both")
|
||||
-}
|
@@ -0,0 +1,62 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
|
||||
+++ /dev/null
|
||||
@@ -1,59 +1,0 @@
|
||||
-package com.hypherionmc.craterlib;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
|
||||
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
||||
-import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
|
||||
-import com.hypherionmc.craterlib.compat.Vanish;
|
||||
-import com.hypherionmc.craterlib.core.config.ConfigController;
|
||||
-import com.hypherionmc.craterlib.core.config.ModuleConfig;
|
||||
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
|
||||
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
-import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
|
||||
-import com.hypherionmc.craterlib.core.networking.PacketRegistry;
|
||||
-import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
||||
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
|
||||
-import com.hypherionmc.craterlib.network.CraterNeoForgeNetworkHandler;
|
||||
-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
|
||||
-import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
|
||||
-import net.minecraft.client.Minecraft;
|
||||
-import net.neoforged.bus.api.IEventBus;
|
||||
-import net.neoforged.fml.ModList;
|
||||
-import net.neoforged.fml.common.Mod;
|
||||
-import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
-import net.neoforged.fml.loading.FMLEnvironment;
|
||||
-import net.neoforged.fml.loading.FMLLoader;
|
||||
-import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
|
||||
-import net.neoforged.neoforge.common.NeoForge;
|
||||
-
|
||||
-import java.util.Optional;
|
||||
-
|
||||
-@Mod(CraterConstants.MOD_ID)
|
||||
-public class CraterLib {
|
||||
-
|
||||
- private final PacketRegistry handler;
|
||||
-
|
||||
- public CraterLib(IEventBus eventBus) {
|
||||
- NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
|
||||
- eventBus.addListener(this::commonSetup);
|
||||
- handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER);
|
||||
-
|
||||
- if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
|
||||
- eventBus.register(new Vanish());
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- public void commonSetup(FMLCommonSetupEvent evt) {
|
||||
- new CraterPacketNetwork(handler);
|
||||
- if (FMLEnvironment.dist.isClient()) {
|
||||
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
|
||||
- CraterEventBus.INSTANCE.postEvent(event);
|
||||
-
|
||||
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
|
||||
- if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
|
||||
- ModuleConfig config = (ModuleConfig) conf;
|
||||
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
|
||||
- }
|
||||
- });
|
||||
- }
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,28 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java
|
||||
+++ /dev/null
|
||||
@@ -1,25 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.client;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.CraterConstants;
|
||||
-import com.hypherionmc.craterlib.api.events.client.CraterClientTickEvent;
|
||||
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||
-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
|
||||
-import net.minecraft.client.Minecraft;
|
||||
-import net.neoforged.api.distmarker.Dist;
|
||||
-import net.neoforged.bus.api.SubscribeEvent;
|
||||
-import net.neoforged.fml.common.EventBusSubscriber;
|
||||
-import net.neoforged.neoforge.event.tick.LevelTickEvent;
|
||||
-
|
||||
-@EventBusSubscriber(modid = CraterConstants.MOD_ID, value = Dist.CLIENT)
|
||||
-public class NeoForgeClientEvents {
|
||||
-
|
||||
- @SubscribeEvent
|
||||
- public static void clientTick(LevelTickEvent.Pre event) {
|
||||
- if (Minecraft.getInstance().level == null)
|
||||
- return;
|
||||
-
|
||||
- CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(BridgedClientLevel.of(Minecraft.getInstance().level));
|
||||
- CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -0,0 +1,43 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,40 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.client;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
|
||||
-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
|
||||
-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import net.minecraft.client.Minecraft;
|
||||
-import net.minecraft.network.Connection;
|
||||
-
|
||||
-import java.util.Objects;
|
||||
-
|
||||
-/**
|
||||
- * @author HypherionSA
|
||||
- */
|
||||
-public class NeoForgeClientHelper implements ClientPlatform {
|
||||
-
|
||||
- public NeoForgeClientHelper() {
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedMinecraft getClientInstance() {
|
||||
- return new BridgedMinecraft();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedPlayer getClientPlayer() {
|
||||
- return BridgedPlayer.of(Minecraft.getInstance().player);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedClientLevel getClientLevel() {
|
||||
- return BridgedClientLevel.of(Minecraft.getInstance().level);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Connection getClientConnection() {
|
||||
- Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
|
||||
- return Minecraft.getInstance().getConnection().getConnection();
|
||||
- }
|
||||
-}
|
@@ -0,0 +1,22 @@
|
||||
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,19 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
|
||||
-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
|
||||
-import net.neoforged.neoforge.server.ServerLifecycleHooks;
|
||||
-
|
||||
-/**
|
||||
- * @author HypherionSA
|
||||
- */
|
||||
-public class NeoForgeCommonHelper implements CommonPlatform {
|
||||
-
|
||||
- public NeoForgeCommonHelper() {
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public BridgedMinecraftServer getMCServer() {
|
||||
- return BridgedMinecraftServer.of(ServerLifecycleHooks.getCurrentServer());
|
||||
- }
|
||||
-}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user