Compare commits
7 Commits
old/1.20
...
old/1.19.2
Author | SHA1 | Date | |
---|---|---|---|
b4aab1e760 | |||
76d4b1c37e | |||
5ee555e190 | |||
cde690c069 | |||
add2faeaf5 | |||
d97e6df36e | |||
ee80626bf7 |
@@ -9,7 +9,7 @@ pipeline {
|
|||||||
stage("Notify Discord") {
|
stage("Notify Discord") {
|
||||||
steps {
|
steps {
|
||||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||||
title: "Deploy Started: CraterLib 1.20 Deploy #${BUILD_NUMBER}",
|
title: "Deploy Started: CraterLib 1.19.2 Deploy #${BUILD_NUMBER}",
|
||||||
link: env.BUILD_URL,
|
link: env.BUILD_URL,
|
||||||
result: 'SUCCESS',
|
result: 'SUCCESS',
|
||||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||||
@@ -38,7 +38,7 @@ pipeline {
|
|||||||
deleteDir()
|
deleteDir()
|
||||||
|
|
||||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||||
title: "CraterLib 1.20 Deploy #${BUILD_NUMBER}",
|
title: "CraterLib 1.19.2 Deploy #${BUILD_NUMBER}",
|
||||||
link: env.BUILD_URL,
|
link: env.BUILD_URL,
|
||||||
result: currentBuild.currentResult,
|
result: currentBuild.currentResult,
|
||||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"
|
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"
|
||||||
|
@@ -13,7 +13,7 @@ pipeline {
|
|||||||
stage("Notify Discord") {
|
stage("Notify Discord") {
|
||||||
steps {
|
steps {
|
||||||
discordSend webhookURL: env.SSS_WEBHOOK,
|
discordSend webhookURL: env.SSS_WEBHOOK,
|
||||||
title: "Deploy Started: ${projectName} 1.20.1/2 Deploy #${BUILD_NUMBER}",
|
title: "Deploy Started: ${projectName} 1.19.2 Deploy #${BUILD_NUMBER}",
|
||||||
link: env.BUILD_URL,
|
link: env.BUILD_URL,
|
||||||
result: 'SUCCESS',
|
result: 'SUCCESS',
|
||||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||||
@@ -54,7 +54,7 @@ pipeline {
|
|||||||
versionName: "Snapshot 1.1.${BUILD_NUMBER}",
|
versionName: "Snapshot 1.1.${BUILD_NUMBER}",
|
||||||
version: "1.1.${BUILD_NUMBER}",
|
version: "1.1.${BUILD_NUMBER}",
|
||||||
modLoaders: "forge|fabric|quilt",
|
modLoaders: "forge|fabric|quilt",
|
||||||
minecraftVersions: "1.20|1.20.1",
|
minecraftVersions: "1.19.2",
|
||||||
failWebhook: env.SSS_WEBHOOK,
|
failWebhook: env.SSS_WEBHOOK,
|
||||||
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
|
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
|
||||||
|
|
||||||
|
@@ -1,28 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.api.networking;
|
|
||||||
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public interface CraterNetworkHandler {
|
|
||||||
|
|
||||||
<T> void sendToServer(T packet);
|
|
||||||
|
|
||||||
<T> void sendToServer(T packet, boolean ignoreCheck);
|
|
||||||
|
|
||||||
<T> void sendToClient(T packet, ServerPlayer player);
|
|
||||||
|
|
||||||
default <T> void sendToClients(T packet, List<ServerPlayer> players) {
|
|
||||||
for (ServerPlayer player : players) {
|
|
||||||
sendToClient(packet, player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
default <T> void sendToAllClients(T packet, MinecraftServer server) {
|
|
||||||
sendToClients(packet, server.getPlayerList().getPlayers());
|
|
||||||
}
|
|
||||||
}
|
|
@@ -8,10 +8,10 @@ import com.hypherionmc.craterlib.core.config.annotations.SubConfig;
|
|||||||
import com.hypherionmc.craterlib.core.config.annotations.Tooltip;
|
import com.hypherionmc.craterlib.core.config.annotations.Tooltip;
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import com.mojang.blaze3d.vertex.*;
|
import com.mojang.blaze3d.vertex.*;
|
||||||
|
import com.mojang.math.Matrix4f;
|
||||||
import me.hypherionmc.moonconfig.core.conversion.SpecComment;
|
import me.hypherionmc.moonconfig.core.conversion.SpecComment;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.client.gui.Font;
|
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.ConfirmScreen;
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
import net.minecraft.client.renderer.GameRenderer;
|
import net.minecraft.client.renderer.GameRenderer;
|
||||||
@@ -20,7 +20,6 @@ import net.minecraft.resources.ResourceLocation;
|
|||||||
import net.minecraft.util.Mth;
|
import net.minecraft.util.Mth;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.joml.Matrix4f;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
@@ -177,19 +176,19 @@ public class CraterConfigScreen extends Screen {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
|
public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
|
||||||
overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
|
overlayBackground(matrices, TOP, height - BOTTOM, 32);
|
||||||
|
|
||||||
renderScrollBar();
|
renderScrollBar();
|
||||||
|
|
||||||
matrices.pose().pushPose();
|
matrices.pushPose();
|
||||||
matrices.pose().translate(0, 0, 500.0);
|
matrices.translate(0, 0, 500.0);
|
||||||
overlayBackground(matrices.pose(), 0, TOP, 64);
|
overlayBackground(matrices, 0, TOP, 64);
|
||||||
overlayBackground(matrices.pose(), height - BOTTOM, height, 64);
|
overlayBackground(matrices, height - BOTTOM, height, 64);
|
||||||
renderShadow(matrices.pose());
|
renderShadow(matrices);
|
||||||
matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF);
|
drawCenteredString(matrices, font, getTitle(), width / 2, 9, 0xFFFFFF);
|
||||||
super.render(matrices, mouseX, mouseY, delta);
|
super.render(matrices, mouseX, mouseY, delta);
|
||||||
matrices.pose().popPose();
|
matrices.popPose();
|
||||||
|
|
||||||
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
|
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
|
||||||
for (Option<?> option : options) {
|
for (Option<?> option : options) {
|
||||||
@@ -379,7 +378,7 @@ public class CraterConfigScreen extends Screen {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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 (mouseX > startX && mouseX < startX + sizeX) {
|
||||||
if (mouseY > startY && mouseY < startY + sizeY) {
|
if (mouseY > startY && mouseY < startY + sizeY) {
|
||||||
List<Component> list = new ArrayList<>();
|
List<Component> list = new ArrayList<>();
|
||||||
@@ -387,7 +386,7 @@ public class CraterConfigScreen extends Screen {
|
|||||||
for (String desc : description) {
|
for (String desc : description) {
|
||||||
list.add(Component.translatable(desc));
|
list.add(Component.translatable(desc));
|
||||||
}
|
}
|
||||||
stack.renderComponentTooltip(font, list, mouseX, mouseY);
|
renderComponentTooltip(stack, list, mouseX, mouseY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.Font;
|
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.AbstractWidget;
|
||||||
import net.minecraft.client.gui.components.EditBox;
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
|
|
||||||
@@ -17,11 +17,11 @@ public class AbstractConfigWidget<T, W extends AbstractWidget> extends BaseWidge
|
|||||||
public W widget;
|
public W widget;
|
||||||
|
|
||||||
@Override
|
@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);
|
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||||
int i = (widget instanceof EditBox ? 1 : 0);
|
int i = (widget instanceof EditBox ? 1 : 0);
|
||||||
widget.setX(x + width - 200 - resetButtonOffset + i);
|
widget.x = (x + width - 200 - resetButtonOffset + i);
|
||||||
widget.setY(y + i + 1);
|
widget.y = (y + i + 1);
|
||||||
widget.render(matrices, mouseX, mouseY, delta);
|
widget.render(matrices, mouseX, mouseY, delta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,9 +1,9 @@
|
|||||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.Font;
|
import net.minecraft.client.gui.Font;
|
||||||
import net.minecraft.client.gui.GuiGraphics;
|
|
||||||
import net.minecraft.client.gui.components.Button;
|
import net.minecraft.client.gui.components.Button;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.network.chat.MutableComponent;
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
@@ -16,7 +16,7 @@ import net.minecraft.network.chat.TextColor;
|
|||||||
public class BaseWidget<T> extends Option<T> {
|
public class BaseWidget<T> extends Option<T> {
|
||||||
|
|
||||||
public static final int resetButtonOffset = 48;
|
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 hideReset = false;
|
||||||
|
|
||||||
private boolean isSubConfig = false;
|
private boolean isSubConfig = false;
|
||||||
@@ -39,7 +39,7 @@ public class BaseWidget<T> extends Option<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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());
|
MutableComponent text = Component.literal(this.text.getString());
|
||||||
boolean edited = isEdited() || hasErrors;
|
boolean edited = isEdited() || hasErrors;
|
||||||
if (edited) {
|
if (edited) {
|
||||||
@@ -50,9 +50,9 @@ public class BaseWidget<T> extends Option<T> {
|
|||||||
} else {
|
} else {
|
||||||
text.withStyle(ChatFormatting.GRAY);
|
text.withStyle(ChatFormatting.GRAY);
|
||||||
}
|
}
|
||||||
matrices.drawString(font, text, x, y, 0xFFFFFF);
|
font.draw(matrices, text, x, y, 0xFFFFFF);
|
||||||
resetButton.setX(x + width - 46);
|
resetButton.x = (x + width - 46);
|
||||||
resetButton.setY(y + 1);
|
resetButton.y = (y + 1);
|
||||||
resetButton.active = isNotDefault();
|
resetButton.active = isNotDefault();
|
||||||
if (!hideReset) {
|
if (!hideReset) {
|
||||||
resetButton.render(matrices, mouseX, mouseY, delta);
|
resetButton.render(matrices, mouseX, mouseY, delta);
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||||
|
|
||||||
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
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.components.AbstractButton;
|
||||||
import net.minecraft.client.gui.narration.NarratedElementType;
|
import net.minecraft.client.gui.narration.NarratedElementType;
|
||||||
import net.minecraft.client.gui.narration.NarrationElementOutput;
|
import net.minecraft.client.gui.narration.NarrationElementOutput;
|
||||||
@@ -23,7 +23,7 @@ public class InternalConfigButton extends AbstractButton {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(@NotNull GuiGraphics poseStack, int i, int j, float f) {
|
public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
|
||||||
if (cancel) {
|
if (cancel) {
|
||||||
setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
|
setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
|
||||||
} else {
|
} else {
|
||||||
@@ -34,11 +34,6 @@ public class InternalConfigButton extends AbstractButton {
|
|||||||
super.render(poseStack, i, j, f);
|
super.render(poseStack, i, j, f);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
|
|
||||||
narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPress() {
|
public void onPress() {
|
||||||
if (cancel) {
|
if (cancel) {
|
||||||
@@ -49,4 +44,8 @@ public class InternalConfigButton extends AbstractButton {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateNarration(NarrationElementOutput narrationElementOutput) {
|
||||||
|
narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.Font;
|
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.AbstractContainerEventHandler;
|
||||||
import net.minecraft.client.gui.components.events.GuiEventListener;
|
import net.minecraft.client.gui.components.events.GuiEventListener;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -38,7 +38,7 @@ public abstract class Option<T> extends AbstractContainerEventHandler {
|
|||||||
this.langKeys = langKeys;
|
this.langKeys = langKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
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() {
|
public int height() {
|
||||||
return 22;
|
return 22;
|
||||||
|
@@ -2,9 +2,9 @@ package com.hypherionmc.craterlib.client.gui.config.widgets;
|
|||||||
|
|
||||||
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
|
||||||
import com.hypherionmc.craterlib.core.config.ModuleConfig;
|
import com.hypherionmc.craterlib.core.config.ModuleConfig;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.Font;
|
import net.minecraft.client.gui.Font;
|
||||||
import net.minecraft.client.gui.GuiGraphics;
|
|
||||||
import net.minecraft.client.gui.components.Button;
|
import net.minecraft.client.gui.components.Button;
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
@@ -23,11 +23,11 @@ public class SubConfigWidget<T> extends AbstractConfigWidget<T, Button> {
|
|||||||
this.subConfig = subConfig;
|
this.subConfig = subConfig;
|
||||||
this.screen = screen;
|
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
|
@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.text = Component.literal(subConfig.getClass().getSimpleName().toLowerCase());
|
||||||
this.hideReset();
|
this.hideReset();
|
||||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
package com.hypherionmc.craterlib.client.gui.config.widgets;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.Font;
|
import net.minecraft.client.gui.Font;
|
||||||
import net.minecraft.client.gui.GuiGraphics;
|
|
||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ public class TextConfigOption<T> extends AbstractConfigWidget<T, WrappedEditBox>
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
widget.setTextColor(hasErrors ? 16733525 : 14737632);
|
||||||
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
|
||||||
}
|
}
|
||||||
|
@@ -18,7 +18,7 @@ public class ToggleButton<T> extends AbstractConfigWidget<T, Button> {
|
|||||||
public ToggleButton(List<T> options, Function<T, Component> toComponent) {
|
public ToggleButton(List<T> options, Function<T, Component> toComponent) {
|
||||||
this.options = options;
|
this.options = options;
|
||||||
this.toComponent = toComponent;
|
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
|
@Override
|
||||||
|
@@ -21,7 +21,7 @@ public class WrappedEditBox extends EditBox {
|
|||||||
for (GuiEventListener child : Minecraft.getInstance().screen.children()) {
|
for (GuiEventListener child : Minecraft.getInstance().screen.children()) {
|
||||||
if (child instanceof TextConfigOption<?> option) {
|
if (child instanceof TextConfigOption<?> option) {
|
||||||
WrappedEditBox box = option.widget;
|
WrappedEditBox box = option.widget;
|
||||||
super.setFocused(box == this);
|
box.setFocused(box == this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
super.setFocused(bl);
|
super.setFocused(bl);
|
||||||
|
@@ -7,7 +7,7 @@ import net.minecraft.network.chat.MutableComponent;
|
|||||||
public class AbstractCommand {
|
public class AbstractCommand {
|
||||||
|
|
||||||
public static void replySuccess(CommandContext<CommandSourceStack> stack, MutableComponent message) {
|
public static void replySuccess(CommandContext<CommandSourceStack> stack, MutableComponent message) {
|
||||||
stack.getSource().sendSuccess(() -> message, false);
|
stack.getSource().sendSuccess(message, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void replyFailure(CommandContext<CommandSourceStack> stack, MutableComponent message) {
|
public static void replyFailure(CommandContext<CommandSourceStack> stack, MutableComponent message) {
|
||||||
|
@@ -9,7 +9,6 @@ import net.minecraft.world.phys.Vec2;
|
|||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
public class AbstractFakePlayer extends CommandSourceStack {
|
public class AbstractFakePlayer extends CommandSourceStack {
|
||||||
|
|
||||||
@@ -25,13 +24,13 @@ public class AbstractFakePlayer extends CommandSourceStack {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendSuccess(Supplier<Component> component, boolean bl) {
|
public void sendSuccess(Component component, boolean bl) {
|
||||||
this.onSuccess(component.get(), bl);
|
this.onSuccess(component, bl);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendFailure(Component component) {
|
public void sendFailure(Component component) {
|
||||||
sendSuccess(() -> component, false);
|
sendSuccess(component, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public UUID getUuid() {
|
public UUID getUuid() {
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
package com.hypherionmc.craterlib.core.abstraction.server;
|
package com.hypherionmc.craterlib.core.abstraction.server;
|
||||||
|
|
||||||
import net.minecraft.commands.CommandSourceStack;
|
|
||||||
import net.minecraft.network.chat.MutableComponent;
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
|
||||||
@@ -10,7 +9,4 @@ public class AbstractServer {
|
|||||||
server.getPlayerList().broadcastSystemMessage(message, false);
|
server.getPlayerList().broadcastSystemMessage(message, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void executeCommand(MinecraftServer server, CommandSourceStack stack, String command) {
|
|
||||||
server.getCommands().performPrefixedCommand(stack, command);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -10,7 +10,6 @@ import java.util.function.Supplier;
|
|||||||
/**
|
/**
|
||||||
* @author HypherionSA
|
* @author HypherionSA
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public interface CraterNetworkHandler {
|
public interface CraterNetworkHandler {
|
||||||
|
|
||||||
<T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection);
|
<T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection);
|
||||||
|
@@ -6,7 +6,6 @@ import net.minecraft.world.entity.player.Player;
|
|||||||
/**
|
/**
|
||||||
* @author HypherionSA
|
* @author HypherionSA
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public interface CraterPacket<T extends CraterPacket<T>> {
|
public interface CraterPacket<T extends CraterPacket<T>> {
|
||||||
|
|
||||||
void write(final FriendlyByteBuf buf);
|
void write(final FriendlyByteBuf buf);
|
||||||
|
@@ -3,7 +3,6 @@ package com.hypherionmc.craterlib.core.network;
|
|||||||
/**
|
/**
|
||||||
* @author HypherionSA
|
* @author HypherionSA
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public enum PacketDirection {
|
public enum PacketDirection {
|
||||||
TO_SERVER,
|
TO_SERVER,
|
||||||
TO_CLIENT
|
TO_CLIENT
|
||||||
|
@@ -1,44 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.core.networking;
|
|
||||||
|
|
||||||
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
|
|
||||||
import net.minecraft.network.FriendlyByteBuf;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
|
||||||
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public class CraterPacketNetwork {
|
|
||||||
|
|
||||||
private final PacketRegistry packetRegistry;
|
|
||||||
public static CraterPacketNetwork INSTANCE;
|
|
||||||
private static DeferredPacketRegistrar delayedHandler;
|
|
||||||
|
|
||||||
public CraterPacketNetwork(PacketRegistry registry) {
|
|
||||||
INSTANCE = this;
|
|
||||||
this.packetRegistry = registry;
|
|
||||||
getDelayedHandler().registerQueuedPackets(registry);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static DeferredPacketRegistrar getDelayedHandler() {
|
|
||||||
if (delayedHandler == null) {
|
|
||||||
delayedHandler = new DeferredPacketRegistrar();
|
|
||||||
}
|
|
||||||
return delayedHandler;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
|
|
||||||
if (INSTANCE != null) {
|
|
||||||
return INSTANCE.packetRegistry.registerPacket(id, messageType, encoder, decoder, handler);
|
|
||||||
} else {
|
|
||||||
return getDelayedHandler().registerPacket(id, messageType, encoder, decoder, handler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public PacketRegistry getPacketRegistry() {
|
|
||||||
return packetRegistry;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,41 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.core.networking;
|
|
||||||
|
|
||||||
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 net.minecraft.network.FriendlyByteBuf;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public class DeferredPacketRegistrar implements PacketRegistrar {
|
|
||||||
|
|
||||||
private static final Map<Class<?>, PacketHolder<?>> QUEUED_PACKET_MAP = new HashMap<>();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public PacketSide side() {
|
|
||||||
return PacketSide.CLIENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <T> PacketRegistrar registerPacket(ResourceLocation packetIdentifier, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
|
|
||||||
PacketHolder<T> container = new PacketHolder<>(packetIdentifier, messageType, encoder, decoder, handler);
|
|
||||||
QUEUED_PACKET_MAP.put(messageType, container);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void registerQueuedPackets(PacketRegistry packetRegistration) {
|
|
||||||
if (!QUEUED_PACKET_MAP.isEmpty()) {
|
|
||||||
packetRegistration.PACKET_MAP.putAll(QUEUED_PACKET_MAP);
|
|
||||||
QUEUED_PACKET_MAP.forEach((aClass, container) -> packetRegistration.registerPacket(container));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,21 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.core.networking;
|
|
||||||
|
|
||||||
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
|
|
||||||
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
|
||||||
import net.minecraft.network.FriendlyByteBuf;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
|
||||||
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public interface PacketRegistrar {
|
|
||||||
|
|
||||||
PacketSide side();
|
|
||||||
|
|
||||||
<T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler);
|
|
||||||
|
|
||||||
}
|
|
@@ -1,41 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.core.networking;
|
|
||||||
|
|
||||||
import com.hypherionmc.craterlib.api.networking.CraterNetworkHandler;
|
|
||||||
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 net.minecraft.network.FriendlyByteBuf;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public abstract class PacketRegistry implements CraterNetworkHandler, PacketRegistrar {
|
|
||||||
|
|
||||||
final Map<Class<?>, PacketHolder<?>> PACKET_MAP = new HashMap<>();
|
|
||||||
|
|
||||||
protected final PacketSide side;
|
|
||||||
|
|
||||||
public PacketRegistry(PacketSide side) {
|
|
||||||
this.side = side;
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
|
|
||||||
PacketHolder<T> holder = new PacketHolder<>(id, messageType, encoder, decoder, handler);
|
|
||||||
PACKET_MAP.put(messageType, holder);
|
|
||||||
registerPacket(holder);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PacketSide side() {
|
|
||||||
return side;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract <T> void registerPacket(PacketHolder<T> packetHolder);
|
|
||||||
}
|
|
@@ -1,15 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.core.networking.data;
|
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public record PacketContext<T>(@Nullable Player sender, T message, PacketSide side) {
|
|
||||||
|
|
||||||
public PacketContext(T message, PacketSide side) {
|
|
||||||
this(null, message, side);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@@ -1,18 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.core.networking.data;
|
|
||||||
|
|
||||||
import net.minecraft.network.FriendlyByteBuf;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
|
||||||
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public record PacketHolder<T>(ResourceLocation packetId,
|
|
||||||
Class<T> messageType,
|
|
||||||
BiConsumer<T, FriendlyByteBuf> encoder,
|
|
||||||
Function<FriendlyByteBuf, T> decoder,
|
|
||||||
Consumer<PacketContext<T>> handler) {
|
|
||||||
}
|
|
@@ -1,13 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.core.networking.data;
|
|
||||||
|
|
||||||
public enum PacketSide {
|
|
||||||
CLIENT,
|
|
||||||
SERVER;
|
|
||||||
|
|
||||||
public PacketSide flipped() {
|
|
||||||
if (CLIENT.equals(this))
|
|
||||||
return SERVER;
|
|
||||||
|
|
||||||
return CLIENT;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.Shadow;
|
|||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@@ -22,12 +23,12 @@ public class ServerGamePacketListenerImplMixin {
|
|||||||
public ServerPlayer player;
|
public ServerPlayer player;
|
||||||
|
|
||||||
@Inject(
|
@Inject(
|
||||||
method = "lambda$handleChat$8",
|
method = "lambda$handleChat$9",
|
||||||
at = @At("HEAD"),
|
at = @At("HEAD"),
|
||||||
cancellable = true
|
cancellable = true
|
||||||
)
|
)
|
||||||
private void injectChatEvent(PlayerChatMessage arg, CompletableFuture completableFuture, CompletableFuture completableFuture2, Void void_, CallbackInfo ci) {
|
private void injectChatEvent(PlayerChatMessage arg, CallbackInfoReturnable<CompletableFuture> ci) {
|
||||||
CraterServerChatEvent event = new CraterServerChatEvent(this.player, arg.decoratedContent().getString(), arg.decoratedContent());
|
CraterServerChatEvent event = new CraterServerChatEvent(this.player, arg.serverContent().getString(), arg.serverContent());
|
||||||
CraterEventBus.INSTANCE.postEvent(event);
|
CraterEventBus.INSTANCE.postEvent(event);
|
||||||
if (event.wasCancelled())
|
if (event.wasCancelled())
|
||||||
ci.cancel();
|
ci.cancel();
|
||||||
|
@@ -4,19 +4,18 @@ import com.hypherionmc.craterlib.api.event.client.ScreenEvent;
|
|||||||
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@Mixin(Minecraft.class)
|
@Mixin(Minecraft.class)
|
||||||
public class MinecraftMixin {
|
public class MinecraftMixin {
|
||||||
|
|
||||||
@Shadow
|
@Shadow @Nullable public Screen screen;
|
||||||
@Nullable
|
|
||||||
public Screen screen;
|
|
||||||
|
|
||||||
@Inject(method = "setScreen", at = @At(value = "TAIL"))
|
@Inject(method = "setScreen", at = @At(value = "TAIL"))
|
||||||
private void injectScreenOpeningEvent(Screen screen, CallbackInfo ci) {
|
private void injectScreenOpeningEvent(Screen screen, CallbackInfo ci) {
|
||||||
|
@@ -1,9 +1,9 @@
|
|||||||
package com.hypherionmc.craterlib.util;
|
package com.hypherionmc.craterlib.util;
|
||||||
|
|
||||||
|
import com.mojang.math.Vector4f;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.world.item.DyeColor;
|
import net.minecraft.world.item.DyeColor;
|
||||||
import org.joml.Vector4f;
|
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ public class RenderUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int renderColorFromDye(DyeColor color) {
|
public static int renderColorFromDye(DyeColor color) {
|
||||||
return color.getMapColor().col | 0xFF000000;
|
return color.getMaterialColor().col | 0xFF000000;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int alphaColorFromDye(DyeColor color, float alpha) {
|
public static int alphaColorFromDye(DyeColor color, float alpha) {
|
||||||
|
@@ -116,8 +116,8 @@ publisher {
|
|||||||
versionType = "release"
|
versionType = "release"
|
||||||
changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md"
|
changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md"
|
||||||
version = "${minecraft_version}-${project.version}"
|
version = "${minecraft_version}-${project.version}"
|
||||||
displayName = "[FABRIC/QUILT 1.20.1/2] CraterLib - ${project.version}"
|
displayName = "[FABRIC/QUILT 1.19.2] CraterLib - ${project.version}"
|
||||||
gameVersions = ["1.20", "1.20.1"]
|
gameVersions = ["1.19.2"]
|
||||||
loaders = ["fabric", "quilt"]
|
loaders = ["fabric", "quilt"]
|
||||||
artifact = remapJar
|
artifact = remapJar
|
||||||
|
|
||||||
|
@@ -4,9 +4,6 @@ import com.hypherionmc.craterlib.api.event.server.CraterRegisterCommandEvent;
|
|||||||
import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent;
|
import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent;
|
||||||
import com.hypherionmc.craterlib.common.FabricCommonPlatform;
|
import com.hypherionmc.craterlib.common.FabricCommonPlatform;
|
||||||
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||||
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
|
|
||||||
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
|
||||||
import com.hypherionmc.craterlib.network.CraterFabricNetworkHandler;
|
|
||||||
import net.fabricmc.api.ModInitializer;
|
import net.fabricmc.api.ModInitializer;
|
||||||
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
||||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
||||||
@@ -15,7 +12,6 @@ public class CraterLibInitializer implements ModInitializer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitialize() {
|
public void onInitialize() {
|
||||||
new CraterPacketNetwork(new CraterFabricNetworkHandler(PacketSide.SERVER));
|
|
||||||
CommandRegistrationCallback.EVENT.register(
|
CommandRegistrationCallback.EVENT.register(
|
||||||
(dispatcher, registryAccess, environment) -> CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(dispatcher)));
|
(dispatcher, registryAccess, environment) -> CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(dispatcher)));
|
||||||
|
|
||||||
|
@@ -2,9 +2,6 @@ package com.hypherionmc.craterlib.client;
|
|||||||
|
|
||||||
import com.hypherionmc.craterlib.api.event.client.CraterClientTickEvent;
|
import com.hypherionmc.craterlib.api.event.client.CraterClientTickEvent;
|
||||||
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||||
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
|
|
||||||
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
|
||||||
import com.hypherionmc.craterlib.network.CraterFabricNetworkHandler;
|
|
||||||
import net.fabricmc.api.ClientModInitializer;
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||||
|
|
||||||
@@ -12,7 +9,6 @@ public class CraterLibClientInitializer implements ClientModInitializer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
new CraterPacketNetwork(new CraterFabricNetworkHandler(PacketSide.CLIENT));
|
|
||||||
ClientTickEvents.START_CLIENT_TICK.register((listener) -> {
|
ClientTickEvents.START_CLIENT_TICK.register((listener) -> {
|
||||||
CraterClientTickEvent event = new CraterClientTickEvent(listener.level);
|
CraterClientTickEvent event = new CraterClientTickEvent(listener.level);
|
||||||
CraterEventBus.INSTANCE.postEvent(event);
|
CraterEventBus.INSTANCE.postEvent(event);
|
||||||
|
@@ -1,81 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.network;
|
|
||||||
|
|
||||||
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 net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
|
||||||
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) {
|
|
||||||
if (CHANNELS.get(holder.messageType()) == null) {
|
|
||||||
CHANNELS.put(holder.messageType(), new Message<>(holder.packetId(), holder.encoder()));
|
|
||||||
|
|
||||||
if (PacketSide.CLIENT.equals(this.side)) {
|
|
||||||
ClientPlayNetworking.registerGlobalReceiver(holder.packetId(), ((client, listener, buf, responseSender) -> {
|
|
||||||
buf.readByte();
|
|
||||||
T message = holder.decoder().apply(buf);
|
|
||||||
client.execute(() -> holder.handler().accept(new PacketContext<>(message, PacketSide.CLIENT)));
|
|
||||||
}));
|
|
||||||
} else {
|
|
||||||
|
|
||||||
ServerPlayNetworking.registerGlobalReceiver(holder.packetId(), ((server, player, listener, buf, responseSender) -> {
|
|
||||||
buf.readByte();
|
|
||||||
T message = holder.decoder().apply(buf);
|
|
||||||
server.execute(() -> holder.handler().accept(new PacketContext<>(player, message, PacketSide.SERVER)));
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> void sendToServer(T packet) {
|
|
||||||
this.sendToServer(packet, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> void sendToServer(T packet, boolean ignoreCheck) {
|
|
||||||
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
|
|
||||||
|
|
||||||
if (ClientPlayNetworking.canSend(message.id()) || ignoreCheck) {
|
|
||||||
FriendlyByteBuf buf = PacketByteBufs.create();
|
|
||||||
buf.writeByte(0);
|
|
||||||
message.encoder().accept(packet, buf);
|
|
||||||
ClientPlayNetworking.send(message.id(), buf);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> void sendToClient(T packet, ServerPlayer player) {
|
|
||||||
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
|
|
||||||
if (ServerPlayNetworking.canSend(player, message.id()))
|
|
||||||
{
|
|
||||||
FriendlyByteBuf buf = PacketByteBufs.create();
|
|
||||||
buf.writeByte(0);
|
|
||||||
message.encoder().accept(packet, buf);
|
|
||||||
ServerPlayNetworking.send(player, message.id(), buf);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public record Message<T>(ResourceLocation id, BiConsumer<T, FriendlyByteBuf> encoder) { }
|
|
||||||
}
|
|
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
|
|||||||
* @author HypherionSA
|
* @author HypherionSA
|
||||||
* @date 24/09/2022
|
* @date 24/09/2022
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public class FabricNetworkHandler implements CraterNetworkHandler {
|
public class FabricNetworkHandler implements CraterNetworkHandler {
|
||||||
|
|
||||||
private static final Map<String, FabricNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
|
private static final Map<String, FabricNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
|
||||||
|
@@ -10,7 +10,6 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public interface FabricNetworkHelper {
|
public interface FabricNetworkHelper {
|
||||||
|
|
||||||
/* FABRIC ONLY */
|
/* FABRIC ONLY */
|
||||||
|
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public class FabricClientNetworkHelper extends FabricServerNetworkHelper {
|
public class FabricClientNetworkHelper extends FabricServerNetworkHelper {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -13,7 +13,6 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public class FabricServerNetworkHelper implements FabricNetworkHelper {
|
public class FabricServerNetworkHelper implements FabricNetworkHelper {
|
||||||
@Override
|
@Override
|
||||||
public void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull Function<FriendlyByteBuf, @NotNull CraterPacket<?>> factory) {
|
public void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull Function<FriendlyByteBuf, @NotNull CraterPacket<?>> factory) {
|
||||||
|
@@ -33,7 +33,7 @@
|
|||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.14.21",
|
"fabricloader": ">=0.14.21",
|
||||||
"fabric-api": "*",
|
"fabric-api": "*",
|
||||||
"minecraft": ">=1.20",
|
"minecraft": "1.19.2",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -111,8 +111,8 @@ publisher {
|
|||||||
versionType = "release"
|
versionType = "release"
|
||||||
changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md"
|
changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md"
|
||||||
version = "${minecraft_version}-${project.version}"
|
version = "${minecraft_version}-${project.version}"
|
||||||
displayName = "[FORGE 1.20.1/2] CraterLib - ${project.version}"
|
displayName = "[FORGE 1.19.2] CraterLib - ${project.version}"
|
||||||
gameVersions = ["1.20", "1.20.1"]
|
gameVersions = ["1.19.2"]
|
||||||
loaders = ["forge"]
|
loaders = ["forge"]
|
||||||
artifact = remapJar
|
artifact = remapJar
|
||||||
}
|
}
|
@@ -3,9 +3,6 @@ package com.hypherionmc.craterlib;
|
|||||||
import com.hypherionmc.craterlib.api.event.client.LateInitEvent;
|
import com.hypherionmc.craterlib.api.event.client.LateInitEvent;
|
||||||
import com.hypherionmc.craterlib.common.ForgeServerEvents;
|
import com.hypherionmc.craterlib.common.ForgeServerEvents;
|
||||||
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
import com.hypherionmc.craterlib.core.event.CraterEventBus;
|
||||||
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
|
|
||||||
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
|
|
||||||
import com.hypherionmc.craterlib.network.CraterForgeNetworkHandler;
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
@@ -13,7 +10,6 @@ import net.minecraftforge.fml.DistExecutor;
|
|||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
|
||||||
|
|
||||||
@Mod(CraterConstants.MOD_ID)
|
@Mod(CraterConstants.MOD_ID)
|
||||||
public class CraterLib {
|
public class CraterLib {
|
||||||
@@ -24,7 +20,6 @@ public class CraterLib {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void commonSetup(FMLCommonSetupEvent evt) {
|
public void commonSetup(FMLCommonSetupEvent evt) {
|
||||||
new CraterPacketNetwork(new CraterForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER));
|
|
||||||
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
|
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
|
||||||
LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options);
|
LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options);
|
||||||
CraterEventBus.INSTANCE.postEvent(event);
|
CraterEventBus.INSTANCE.postEvent(event);
|
||||||
|
@@ -1,87 +0,0 @@
|
|||||||
package com.hypherionmc.craterlib.network;
|
|
||||||
|
|
||||||
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 net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.network.Connection;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
|
||||||
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.Supplier;
|
|
||||||
|
|
||||||
import static net.minecraftforge.network.NetworkDirection.PLAY_TO_CLIENT;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
|
|
||||||
*/
|
|
||||||
public class CraterForgeNetworkHandler extends PacketRegistry {
|
|
||||||
private final Map<Class<?>, SimpleChannel> CHANNELS = new HashMap<>();
|
|
||||||
|
|
||||||
public CraterForgeNetworkHandler(PacketSide side) {
|
|
||||||
super(side);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected <T> void registerPacket(PacketHolder<T> holder) {
|
|
||||||
if (CHANNELS.get(holder.messageType()) == null) {
|
|
||||||
SimpleChannel channel = NetworkRegistry.ChannelBuilder
|
|
||||||
.named(holder.packetId())
|
|
||||||
.clientAcceptedVersions((a) -> true)
|
|
||||||
.serverAcceptedVersions((a) -> true)
|
|
||||||
.networkProtocolVersion(() -> "1")
|
|
||||||
.simpleChannel();
|
|
||||||
|
|
||||||
channel.registerMessage(
|
|
||||||
0,
|
|
||||||
holder.messageType(),
|
|
||||||
holder.encoder(),
|
|
||||||
holder.decoder(),
|
|
||||||
buildHandler(holder.handler())
|
|
||||||
);
|
|
||||||
|
|
||||||
CHANNELS.put(holder.messageType(), channel);
|
|
||||||
} else {
|
|
||||||
CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> void sendToServer(T packet) {
|
|
||||||
this.sendToServer(packet, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> void sendToServer(T packet, boolean ignoreCheck) {
|
|
||||||
SimpleChannel channel = CHANNELS.get(packet.getClass());
|
|
||||||
Connection connection = Minecraft.getInstance().getConnection().getConnection();
|
|
||||||
if (channel.isRemotePresent(connection) || ignoreCheck) {
|
|
||||||
channel.sendToServer(packet);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> void sendToClient(T packet, ServerPlayer player) {
|
|
||||||
SimpleChannel channel = CHANNELS.get(packet.getClass());
|
|
||||||
Connection connection = player.connection.connection;
|
|
||||||
if (channel.isRemotePresent(connection)) {
|
|
||||||
channel.sendTo(packet, player.connection.connection, PLAY_TO_CLIENT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private <T> BiConsumer<T, Supplier<NetworkEvent.Context>> buildHandler(Consumer<PacketContext<T>> handler) {
|
|
||||||
return (message, ctx) -> {
|
|
||||||
ctx.get().enqueueWork(() -> {
|
|
||||||
PacketSide side = ctx.get().getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
|
|
||||||
ServerPlayer player = ctx.get().getSender();
|
|
||||||
handler.accept(new PacketContext<>(player, message, side));
|
|
||||||
});
|
|
||||||
ctx.get().setPacketHandled(true);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
@@ -26,7 +26,6 @@ import java.util.function.Supplier;
|
|||||||
* @author HypherionSA
|
* @author HypherionSA
|
||||||
* Partly inspired by and based on <a href="https://github.com/Fuzss/puzzleslib/blob/1.19/Forge/src/main/java/fuzs/puzzleslib/network/ForgeNetworkHandler.java">...</a>
|
* Partly inspired by and based on <a href="https://github.com/Fuzss/puzzleslib/blob/1.19/Forge/src/main/java/fuzs/puzzleslib/network/ForgeNetworkHandler.java">...</a>
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public class ForgeNetworkHandler implements CraterNetworkHandler {
|
public class ForgeNetworkHandler implements CraterNetworkHandler {
|
||||||
|
|
||||||
private static final Map<String, ForgeNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
|
private static final Map<String, ForgeNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
modLoader = "javafml"
|
modLoader = "javafml"
|
||||||
loaderVersion = "[46,)"
|
loaderVersion = "[43,)"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
|
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
|
||||||
|
|
||||||
@@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION"
|
|||||||
[[dependencies.${mod_id}]]
|
[[dependencies.${mod_id}]]
|
||||||
modId = "forge"
|
modId = "forge"
|
||||||
mandatory = true
|
mandatory = true
|
||||||
versionRange = "[46,)"
|
versionRange = "[43,)"
|
||||||
ordering = "NONE"
|
ordering = "NONE"
|
||||||
side = "BOTH"
|
side = "BOTH"
|
||||||
|
|
||||||
[[dependencies.${mod_id}]]
|
[[dependencies.${mod_id}]]
|
||||||
modId = "minecraft"
|
modId = "minecraft"
|
||||||
mandatory = true
|
mandatory = true
|
||||||
versionRange = "[1.20,1.20.2)"
|
versionRange = "[1.19.2,1.19.3)"
|
||||||
ordering = "NONE"
|
ordering = "NONE"
|
||||||
side = "BOTH"
|
side = "BOTH"
|
||||||
|
@@ -7,7 +7,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
release = project.properties['release'] ?: false
|
release=project.properties['release'] ?: false
|
||||||
}
|
}
|
||||||
|
|
||||||
var base_version = "${version_major}.${version_minor}"
|
var base_version = "${version_major}.${version_minor}"
|
||||||
@@ -68,7 +68,7 @@ subprojects {
|
|||||||
'Implementation-Version' : project.jar.archiveVersion,
|
'Implementation-Version' : project.jar.archiveVersion,
|
||||||
'Implementation-Vendor' : mod_author,
|
'Implementation-Vendor' : mod_author,
|
||||||
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
|
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
|
||||||
'Timestamp' : System.currentTimeMillis(),
|
'Timestamp' : System.currentTimeMillis(),
|
||||||
'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
|
'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
|
||||||
'Build-On-Minecraft' : minecraft_version
|
'Build-On-Minecraft' : minecraft_version
|
||||||
])
|
])
|
||||||
|
@@ -10,17 +10,17 @@ mod_id=craterlib
|
|||||||
mod_name=CraterLib
|
mod_name=CraterLib
|
||||||
|
|
||||||
# Shared
|
# Shared
|
||||||
minecraft_version=1.20
|
minecraft_version=1.19.2
|
||||||
|
|
||||||
# Fabric
|
# Fabric
|
||||||
|
fabric_api=0.76.0+1.19.2
|
||||||
fabric_loader=0.14.21
|
fabric_loader=0.14.21
|
||||||
fabric_api=0.83.0+1.20
|
|
||||||
|
|
||||||
# Forge
|
# Forge
|
||||||
forge_version=46.0.1
|
forge_version=43.2.0
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
mod_menu_version=7.0.0-beta.2
|
mod_menu_version=4.2.0-beta.2
|
||||||
moon_config=1.0.9
|
moon_config=1.0.9
|
||||||
|
|
||||||
# Publishing
|
# Publishing
|
||||||
|
Reference in New Issue
Block a user