9 Commits

50 changed files with 178 additions and 793 deletions

View File

@@ -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.3 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.3 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}"

View File

@@ -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.3 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})"
@@ -51,10 +51,10 @@ pipeline {
projectSlug: "craterlib", projectSlug: "craterlib",
projectName: "${projectName}", projectName: "${projectName}",
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
versionName: "Snapshot 1.0.${BUILD_NUMBER}", versionName: "Snapshot 1.1.${BUILD_NUMBER}",
version: "1.0.${BUILD_NUMBER}", version: "1.1.${BUILD_NUMBER}",
modLoaders: "forge|neoforge|fabric|quilt", modLoaders: "forge|fabric|quilt",
minecraftVersions: "1.20.3", 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}"

View File

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

View File

@@ -19,15 +19,8 @@ public class CraterAdvancementEvent extends CraterEvent {
this.player = player; this.player = player;
this.advancement = advancement; this.advancement = advancement;
Optional<DisplayInfo> displayInfo = advancement.display(); this.title = advancement.getDisplay().getTitle();
this.description = advancement.getDisplay().getDescription();
if (displayInfo.isPresent()) {
this.title = displayInfo.get().getTitle();
this.description = displayInfo.get().getDescription();
} else {
this.title = Component.literal("Unknown");
this.description = Component.literal("Unknown");
}
} }
public Advancement getAdvancement() { public Advancement getAdvancement() {

View File

@@ -11,11 +11,13 @@ public class MessageBroadcastEvent extends CraterEvent {
private final Component component; private final Component component;
private final Function<ServerPlayer, Component> function; private final Function<ServerPlayer, Component> function;
private final boolean bl; private final boolean bl;
private final String threadName;
public MessageBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl) { public MessageBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl, String threadName) {
this.component = component; this.component = component;
this.function = function; this.function = function;
this.bl = bl; this.bl = bl;
this.threadName = threadName;
} }
public Component getComponent() { public Component getComponent() {
@@ -30,6 +32,10 @@ public class MessageBroadcastEvent extends CraterEvent {
return function; return function;
} }
public String getThreadName() {
return threadName;
}
@Override @Override
public boolean canCancel() { public boolean canCancel() {
return false; return false;

View File

@@ -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);
matrices.pose().popPose();
super.render(matrices, mouseX, mouseY, delta); super.render(matrices, mouseX, mouseY, delta);
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) {
@@ -266,11 +265,12 @@ public class CraterConfigScreen extends Screen {
} }
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) { 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(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.getBuilder();
RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); 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, 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(); buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
@@ -334,12 +334,12 @@ public class CraterConfigScreen extends Screen {
} }
@Override @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) { if (e >= TOP && e <= height - BOTTOM) {
scrollerAmount = Mth.clamp(scrollerAmount - f * 16.0D, 0, scrollHeight()); scrollerAmount = Mth.clamp(scrollerAmount - f * 16.0D, 0, scrollHeight());
return true; return true;
} }
return super.mouseScrolled(d, e, f, g); return super.mouseScrolled(d, e, f);
} }
@Override @Override
@@ -378,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<>();
@@ -386,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);
} }
} }
} }

View File

@@ -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);
} }
} }

View File

@@ -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 + font.lineHeight - 2, 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);

View File

@@ -1,11 +1,12 @@
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;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.NotNull;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -22,7 +23,7 @@ public class InternalConfigButton extends AbstractButton {
} }
@Override @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) { 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 {
@@ -30,12 +31,7 @@ public class InternalConfigButton extends AbstractButton {
active = screen.isEdited() && !hasErrors; active = screen.isEdited() && !hasErrors;
setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save")); 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) {
narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
} }
@Override @Override
@@ -48,4 +44,8 @@ public class InternalConfigButton extends AbstractButton {
} }
@Override
public void updateNarration(NarrationElementOutput narrationElementOutput) {
narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
}
} }

View File

@@ -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;

View File

@@ -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);

View File

@@ -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);
} }

View File

@@ -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

View File

@@ -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);

View File

@@ -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) {

View File

@@ -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() {

View File

@@ -12,7 +12,7 @@ import java.util.function.Supplier;
*/ */
public interface CraterNetworkHandler { public interface CraterNetworkHandler {
<T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection); <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection);
Packet<?> toServerBound(CraterPacket<?> packet); Packet<?> toServerBound(CraterPacket<?> packet);

View File

@@ -9,28 +9,28 @@ import net.minecraft.commands.Commands;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
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.CallbackInfoReturnable;
@Mixin(Commands.class) @Mixin(Commands.class)
public class CommandMixin { public class CommandMixin {
@Inject(method = "performCommand", @Inject(method = "performCommand",
at = @At(value = "INVOKE", 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 shift = At.Shift.BEFORE
), cancellable = true ), cancellable = true
) )
private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfo ci) { private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfoReturnable<Integer> cir) {
CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command); CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command);
CraterEventBus.INSTANCE.postEvent(commandEvent); CraterEventBus.INSTANCE.postEvent(commandEvent);
if (commandEvent.wasCancelled()) { if (commandEvent.wasCancelled()) {
ci.cancel(); cir.setReturnValue(1);
return; return;
} }
if (commandEvent.getException() != null) { if (commandEvent.getException() != null) {
Throwables.throwIfUnchecked(commandEvent.getException()); Throwables.throwIfUnchecked(commandEvent.getException());
ci.cancel(); cir.setReturnValue(1);
} }
} }

View File

@@ -3,7 +3,6 @@ package com.hypherionmc.craterlib.mixin.events;
import com.hypherionmc.craterlib.api.event.server.CraterAdvancementEvent; import com.hypherionmc.craterlib.api.event.server.CraterAdvancementEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus; import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.minecraft.advancements.Advancement; import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.server.PlayerAdvancements; import net.minecraft.server.PlayerAdvancements;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@@ -15,17 +14,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(PlayerAdvancements.class) @Mixin(PlayerAdvancements.class)
public class PlayerAdvancementsMixin { public class PlayerAdvancementsMixin {
@Shadow @Shadow private ServerPlayer player;
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)) @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) { private void injectAdvancementEvent(Advancement advancement, String $$1, CallbackInfoReturnable<Boolean> cir) {
CraterAdvancementEvent event = new CraterAdvancementEvent(this.player, advancementHolder.value()); if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat()) {
CraterEventBus.INSTANCE.postEvent(new CraterAdvancementEvent(this.player, advancement));
Advancement advancement = advancementHolder.value();
if (advancement.display().isPresent() && advancement.display().get().shouldAnnounceChat()) {
CraterEventBus.INSTANCE.postEvent(event);
} }
} }
} }

View File

@@ -8,7 +8,6 @@ import com.mojang.authlib.GameProfile;
import net.minecraft.network.Connection; import net.minecraft.network.Connection;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.players.PlayerList; import net.minecraft.server.players.PlayerList;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@@ -24,12 +23,13 @@ public class PlayerListMixin {
@Inject(method = "broadcastSystemMessage(Lnet/minecraft/network/chat/Component;Ljava/util/function/Function;Z)V", at = @At("HEAD")) @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) { private void injectBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl, CallbackInfo ci) {
MessageBroadcastEvent event = new MessageBroadcastEvent(component, function, bl); String thread = Thread.currentThread().getStackTrace()[3].getClassName();
MessageBroadcastEvent event = new MessageBroadcastEvent(component, function, bl, thread);
CraterEventBus.INSTANCE.postEvent(event); CraterEventBus.INSTANCE.postEvent(event);
} }
@Inject(method = "placeNewPlayer", at = @At("TAIL")) @Inject(method = "placeNewPlayer", at = @At("TAIL"))
private void injectPlayerLoginEvent(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) { private void injectPlayerLoginEvent(Connection connection, ServerPlayer serverPlayer, CallbackInfo ci) {
CraterPlayerEvent.PlayerLoggedIn loggedIn = new CraterPlayerEvent.PlayerLoggedIn(serverPlayer); CraterPlayerEvent.PlayerLoggedIn loggedIn = new CraterPlayerEvent.PlayerLoggedIn(serverPlayer);
CraterEventBus.INSTANCE.postEvent(loggedIn); CraterEventBus.INSTANCE.postEvent(loggedIn);
} }

View File

@@ -2,24 +2,33 @@ package com.hypherionmc.craterlib.mixin.events;
import com.hypherionmc.craterlib.api.event.server.CraterServerChatEvent; import com.hypherionmc.craterlib.api.event.server.CraterServerChatEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus; import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.PlayerChatMessage; import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.FilteredText;
import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.network.ServerGamePacketListenerImpl;
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.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(ServerGamePacketListenerImpl.class) import java.util.concurrent.CompletableFuture;
@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
public class ServerGamePacketListenerImplMixin { public class ServerGamePacketListenerImplMixin {
@Shadow @Shadow
public ServerPlayer player; public ServerPlayer player;
@Inject(method = "broadcastChatMessage", at = @At("HEAD"), cancellable = true) @Inject(
private void injectChatEvent(PlayerChatMessage chatMessage, CallbackInfo ci) { method = "lambda$handleChat$9",
CraterServerChatEvent event = new CraterServerChatEvent(this.player, chatMessage.decoratedContent().getString(), chatMessage.decoratedContent()); at = @At("HEAD"),
cancellable = true
)
private void injectChatEvent(PlayerChatMessage arg, CallbackInfoReturnable<CompletableFuture> ci) {
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();

View File

@@ -3,8 +3,7 @@ package com.hypherionmc.craterlib.mixin.events.client;
import com.hypherionmc.craterlib.api.event.client.CraterSinglePlayerEvent; import com.hypherionmc.craterlib.api.event.client.CraterSinglePlayerEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus; import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.world.entity.Entity; import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.world.entity.player.Player;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
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;
@@ -13,12 +12,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ClientLevel.class) @Mixin(ClientLevel.class)
public class ClientLevelMixin { public class ClientLevelMixin {
@Inject(method = "addEntity", at = @At("HEAD")) @Inject(method = "addPlayer", at = @At("HEAD"))
private void injectSinglePlayerJoinEvent(Entity entity, CallbackInfo ci) { private void injectSinglePlayerJoinEvent(int $$0, AbstractClientPlayer player, CallbackInfo ci) {
if (entity instanceof Player player) { CraterSinglePlayerEvent.PlayerLogin playerLogin = new CraterSinglePlayerEvent.PlayerLogin(player);
CraterSinglePlayerEvent.PlayerLogin playerLogin = new CraterSinglePlayerEvent.PlayerLogin(player); CraterEventBus.INSTANCE.postEvent(playerLogin);
CraterEventBus.INSTANCE.postEvent(playerLogin);
}
} }
} }

View File

@@ -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) {

View File

@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public class RealmsMainScreenMixin { public class RealmsMainScreenMixin {
@Inject(at = @At("HEAD"), method = "play") @Inject(at = @At("HEAD"), method = "play")
private static void play(RealmsServer serverData, Screen parent, CallbackInfo ci) { private void play(RealmsServer serverData, Screen parent, CallbackInfo ci) {
PlayerJoinRealmEvent playerJoinRealm = new PlayerJoinRealmEvent(serverData); PlayerJoinRealmEvent playerJoinRealm = new PlayerJoinRealmEvent(serverData);
CraterEventBus.INSTANCE.postEvent(playerJoinRealm); CraterEventBus.INSTANCE.postEvent(playerJoinRealm);
} }

View File

@@ -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) {

View File

@@ -7,7 +7,7 @@ dependencies {
shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:1.0" shade "com.hypherionmc:rpcsdk:1.0"
shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0") shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
modImplementation("com.terraformersmc:modmenu:${mod_menu_version}") { modImplementation("com.terraformersmc:modmenu:${mod_menu_version}") {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
@@ -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.2] CraterLib - ${project.version}" displayName = "[FABRIC/QUILT 1.19.2] CraterLib - ${project.version}"
gameVersions = ["1.20.2"] gameVersions = ["1.19.2"]
loaders = ["fabric", "quilt"] loaders = ["fabric", "quilt"]
artifact = remapJar artifact = remapJar

View File

@@ -35,22 +35,16 @@ public class FabricNetworkHandler implements CraterNetworkHandler {
this.modid = modid; this.modid = modid;
} }
public synchronized static CraterNetworkHandler of(String modId) {
return NETWORK_HANDLERS.computeIfAbsent(modId, FabricNetworkHandler::new);
}
@Override @Override
public <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection) { public <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
ResourceLocation channelName = this.nextId(); ResourceLocation channelName = this.nextId();
this.packets.put(clazz, new PacketData(clazz, channelName, packetDirection)); this.packets.put(clazz, new PacketData(clazz, channelName, packetDirection));
final Function<FriendlyByteBuf, CraterPacket<?>> decoder = buf -> Util.make(supplier.get(), message -> message.read(buf)); final Function<FriendlyByteBuf, CraterPacket<?>> decoder = buf -> Util.make(supplier.get(), message -> message.read(buf));
switch (packetDirection) { switch (packetDirection) {
case TO_CLIENT -> case TO_CLIENT -> FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerClientReceiver(channelName, decoder);
FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerClientReceiver(channelName, decoder); case TO_SERVER -> FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerServerReceiver(channelName, decoder);
case TO_SERVER ->
FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerServerReceiver(channelName, decoder);
} }
} }
@@ -60,15 +54,13 @@ public class FabricNetworkHandler implements CraterNetworkHandler {
@Override @Override
public Packet<?> toServerBound(CraterPacket<?> packet) { public Packet<?> toServerBound(CraterPacket<?> packet) {
if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_SERVER) if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_SERVER) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_SERVER, PacketDirection.TO_CLIENT));
throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_SERVER, PacketDirection.TO_CLIENT));
return this.toPacket(ClientPlayNetworking::createC2SPacket, packet); return this.toPacket(ClientPlayNetworking::createC2SPacket, packet);
} }
@Override @Override
public Packet<?> toClientBound(CraterPacket<?> packet) { public Packet<?> toClientBound(CraterPacket<?> packet) {
if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_CLIENT) if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_CLIENT) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_CLIENT, PacketDirection.TO_SERVER));
throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_CLIENT, PacketDirection.TO_SERVER));
return this.toPacket(ServerPlayNetworking::createS2CPacket, packet); return this.toPacket(ServerPlayNetworking::createS2CPacket, packet);
} }
@@ -79,8 +71,11 @@ public class FabricNetworkHandler implements CraterNetworkHandler {
return packetFactory.apply(identifier, byteBuf); return packetFactory.apply(identifier, byteBuf);
} }
private record PacketData(Class<? extends CraterPacket<?>> clazz, ResourceLocation identifier, public synchronized static CraterNetworkHandler of(String modId) {
PacketDirection direction) { return NETWORK_HANDLERS.computeIfAbsent(modId, FabricNetworkHandler::new);
}
private record PacketData(Class<? extends CraterPacket<?>> clazz, ResourceLocation identifier, PacketDirection direction) {
} }
} }

View File

@@ -12,6 +12,10 @@ import java.util.function.Function;
public interface FabricNetworkHelper { public interface FabricNetworkHelper {
/* FABRIC ONLY */
void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull Function<FriendlyByteBuf, @NotNull CraterPacket<?>> factory);
void registerServerReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory);
public static FabricNetworkHelper getForDist(EnvType dist) { public static FabricNetworkHelper getForDist(EnvType dist) {
switch (dist) { switch (dist) {
case CLIENT -> { case CLIENT -> {
@@ -24,9 +28,4 @@ public interface FabricNetworkHelper {
return null; return null;
} }
/* FABRIC ONLY */
void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull Function<FriendlyByteBuf, @NotNull CraterPacket<?>> factory);
void registerServerReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory);
} }

View File

@@ -33,7 +33,7 @@
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.14.21",
"fabric-api": "*", "fabric-api": "*",
"minecraft": ">=1.20.3", "minecraft": "1.19.2",
"java": ">=17" "java": ">=17"
} }
} }

View File

@@ -5,7 +5,7 @@ dependencies {
shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:1.0" shade "com.hypherionmc:rpcsdk:1.0"
shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0") shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
@@ -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.2] CraterLib - ${project.version}" displayName = "[FORGE 1.19.2] CraterLib - ${project.version}"
gameVersions = ["1.20.2"] gameVersions = ["1.19.2"]
loaders = ["forge"] loaders = ["forge"]
artifact = remapJar artifact = remapJar
} }

View File

@@ -5,20 +5,17 @@ import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.network.CraterPacket; import com.hypherionmc.craterlib.core.network.CraterPacket;
import com.hypherionmc.craterlib.core.network.PacketDirection; import com.hypherionmc.craterlib.core.network.PacketDirection;
import com.hypherionmc.craterlib.core.platform.ClientPlatform; import com.hypherionmc.craterlib.core.platform.ClientPlatform;
import io.netty.buffer.Unpooled;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraftforge.common.util.LogicalSidedProvider; import net.minecraftforge.common.util.LogicalSidedProvider;
import net.minecraftforge.event.network.CustomPayloadEvent;
import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.network.ChannelBuilder;
import net.minecraftforge.network.NetworkDirection; import net.minecraftforge.network.NetworkDirection;
import net.minecraftforge.network.SimpleChannel; import net.minecraftforge.network.NetworkEvent;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@@ -32,6 +29,7 @@ import java.util.function.Supplier;
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();
private static final String PROTOCOL = Integer.toString(1);
private final SimpleChannel channel; private final SimpleChannel channel;
@@ -41,87 +39,52 @@ public class ForgeNetworkHandler implements CraterNetworkHandler {
private final AtomicInteger packetID = new AtomicInteger(); private final AtomicInteger packetID = new AtomicInteger();
private HashMap<Class<?>, Integer> packetMap = new LinkedHashMap<>();
private ForgeNetworkHandler(SimpleChannel channel, boolean clientRequired, boolean serverRequired) { private ForgeNetworkHandler(SimpleChannel channel, boolean clientRequired, boolean serverRequired) {
this.channel = channel; this.channel = channel;
this.clientRequired = clientRequired; this.clientRequired = clientRequired;
this.serverRequired = serverRequired; this.serverRequired = serverRequired;
} }
public synchronized static CraterNetworkHandler of(String modId, boolean clientRequired, boolean serverRequired) {
ForgeNetworkHandler handler = NETWORK_HANDLERS.computeIfAbsent(modId, modId1 -> new ForgeNetworkHandler(buildSimpleChannel(modId1, clientRequired, serverRequired), clientRequired, serverRequired));
if (handler.clientRequired != clientRequired)
throw new IllegalArgumentException("client channel settings mismatch, expected %s, but was %s".formatted(handler.clientRequired, clientRequired));
if (handler.serverRequired != serverRequired)
throw new IllegalArgumentException("server channel settings mismatch, expected %s, but was %s".formatted(handler.serverRequired, serverRequired));
return handler;
}
private static SimpleChannel buildSimpleChannel(String modId, boolean clientAcceptsVanillaOrMissing, boolean serverAcceptsVanillaOrMissing) {
ChannelBuilder builder = ChannelBuilder.named(new ResourceLocation(modId, "crater_network"));
if (clientAcceptsVanillaOrMissing) {
builder = builder.optionalClient();
}
if (serverAcceptsVanillaOrMissing) {
builder = builder.optionalServer();
}
return builder.simpleChannel();
}
@Override @Override
public <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection) { public <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
BiConsumer<T, FriendlyByteBuf> encoder = CraterPacket::write; BiConsumer<T, FriendlyByteBuf> encoder = CraterPacket::write;
Function<FriendlyByteBuf, T> decoder = buf -> { Function<FriendlyByteBuf, T> decoder = buf -> {
T packet = supplier.get(); T packet = supplier.get();
packet.read(buf); packet.read(buf);
return packet; return packet;
}; };
BiConsumer<T, CustomPayloadEvent.Context> handler = (packet, sup) -> { BiConsumer<T, Supplier<NetworkEvent.Context>> handler = (packet, sup) -> {
NetworkEvent.Context context = sup.get();
LogicalSide expectedSide = getSideFromDirection(packetDirection); LogicalSide expectedSide = getSideFromDirection(packetDirection);
LogicalSide currentSide = sup.getDirection().getReceptionSide(); LogicalSide currentSide = context.getDirection().getReceptionSide();
if (expectedSide != currentSide) { if (expectedSide != currentSide) {
throw new IllegalStateException(String.format("Received message on wrong side, expected %s, was %s", expectedSide, currentSide)); throw new IllegalStateException(String.format("Received message on wrong side, expected %s, was %s", expectedSide, currentSide));
} }
sup.enqueueWork(() -> { context.enqueueWork(() -> {
Player player; Player player;
if (packetDirection == PacketDirection.TO_CLIENT) { if (packetDirection == PacketDirection.TO_CLIENT) {
player = ClientPlatform.INSTANCE.getClientPlayer(); player = ClientPlatform.INSTANCE.getClientPlayer();
} else { } else {
player = sup.getSender(); player = context.getSender();
} }
packet.handle(player, LogicalSidedProvider.WORKQUEUE.get(expectedSide)); packet.handle(player, LogicalSidedProvider.WORKQUEUE.get(expectedSide));
}); });
sup.setPacketHandled(true); context.setPacketHandled(true);
}; };
this.channel.registerMessage(this.packetID.getAndIncrement(), (Class<T>) clazz, encoder, decoder, handler);
int id = packetID.getAndIncrement();
packetMap.put(clazz, id);
this.channel
.messageBuilder((Class<T>) clazz, id)
.encoder(encoder)
.decoder(decoder)
.consumerNetworkThread(handler)
.add();
} }
@Override @Override
public Packet<?> toServerBound(CraterPacket<?> packet) { public Packet<?> toServerBound(CraterPacket<?> packet) {
return NetworkDirection.PLAY_TO_SERVER.buildPacket(toBuffer(packet), channel.getName()).getThis(); return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_SERVER);
//return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_SERVER);
} }
@Override @Override
public Packet<?> toClientBound(CraterPacket<?> packet) { public Packet<?> toClientBound(CraterPacket<?> packet) {
return NetworkDirection.PLAY_TO_CLIENT.buildPacket(toBuffer(packet), channel.getName()).getThis(); return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_CLIENT);
//return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_CLIENT);
} }
@Override @Override
@@ -129,16 +92,23 @@ public class ForgeNetworkHandler implements CraterNetworkHandler {
CraterNetworkHandler.super.sendToServer(packet); CraterNetworkHandler.super.sendToServer(packet);
} }
public synchronized static CraterNetworkHandler of(String modId, boolean clientRequired, boolean serverRequired) {
ForgeNetworkHandler handler = NETWORK_HANDLERS.computeIfAbsent(modId, modId1 -> new ForgeNetworkHandler(buildSimpleChannel(modId1, clientRequired, serverRequired), clientRequired, serverRequired));
if (handler.clientRequired != clientRequired) throw new IllegalArgumentException("client channel settings mismatch, expected %s, but was %s".formatted(handler.clientRequired, clientRequired));
if (handler.serverRequired != serverRequired) throw new IllegalArgumentException("server channel settings mismatch, expected %s, but was %s".formatted(handler.serverRequired, serverRequired));
return handler;
}
private static SimpleChannel buildSimpleChannel(String modId, boolean clientAcceptsVanillaOrMissing, boolean serverAcceptsVanillaOrMissing) {
return NetworkRegistry.ChannelBuilder
.named(new ResourceLocation(modId, "crater_network"))
.networkProtocolVersion(() -> PROTOCOL)
.clientAcceptedVersions(clientAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
.serverAcceptedVersions(serverAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
.simpleChannel();
}
private LogicalSide getSideFromDirection(PacketDirection direction) { private LogicalSide getSideFromDirection(PacketDirection direction) {
return direction == PacketDirection.TO_CLIENT ? LogicalSide.CLIENT : LogicalSide.SERVER; return direction == PacketDirection.TO_CLIENT ? LogicalSide.CLIENT : LogicalSide.SERVER;
} }
protected FriendlyByteBuf toBuffer(CraterPacket<?> message) {
var msg = packetMap.get(message.getClass());
var ret = new FriendlyByteBuf(Unpooled.buffer());
ret.writeVarInt(msg);
message.write(ret);
return ret;
}
} }

View File

@@ -1,5 +1,5 @@
modLoader = "javafml" modLoader = "javafml"
loaderVersion = "[49,)" loaderVersion = "[43,)"
license = "MIT" license = "MIT"
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues" issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
@@ -16,16 +16,16 @@ A library mod used by First Dark Development and HypherionSA Mods
''' '''
displayTest = "MATCH_VERSION" displayTest = "MATCH_VERSION"
[[dependencies.${ mod_id }]] [[dependencies.${mod_id}]]
modId = "forge" modId = "forge"
mandatory = true mandatory = true
versionRange = "[49,)" 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.3,1.21)" versionRange = "[1.19.2,1.19.3)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"

View File

@@ -1,121 +0,0 @@
// Adjust the output jar name here
archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
dependencies {
shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:1.0"
shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
// Do not edit or remove
implementation project(":Common")
}
shadowJar {
from sourceSets.main.output
configurations = [project.configurations.shade]
dependencies {
relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
}
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/mods.toml") {
expand buildProps
}
}
compileTestJava.enabled = false
tasks.withType(JavaCompile).configureEach {
source(project(":Common").sourceSets.main.allSource)
}
/**
* Publishing Config
*/
publishing {
publications {
mavenJava(MavenPublication) {
groupId project.group
artifactId project.archivesBaseName
version project.version
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 {
url "https://maven.firstdark.dev/" + (project.release ? "releases" : "snapshots")
credentials {
username System.getenv("MAVEN_USER")
password System.getenv("MAVEN_PASS")
}
}
}
}
/*publisher {
apiKeys {
modrinth = System.getenv("MODRINTH_TOKEN")
curseforge = System.getenv("CURSE_TOKEN")
}
curseID = curse_id
modrinthID = modrinth_id
versionType = "release"
changelog = rootProject.file("changelog-forge.md")
version = "${minecraft_version}-${project.version}"
displayName = "[NEOFORGE 1.20.2] CraterLib - ${project.version}"
gameVersions = ["1.20.2"]
loaders = ["neoforge"]
artifact = remapJar
}
publishCurseforge.dependsOn(remapJar)
publishModrinth.dependsOn(remapJar)*/

View File

@@ -1,28 +0,0 @@
package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.api.event.client.LateInitEvent;
import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.minecraft.client.Minecraft;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
import net.neoforged.fml.loading.FMLEnvironment;
import net.neoforged.neoforge.common.NeoForge;
@Mod(CraterConstants.MOD_ID)
public class CraterLib {
public CraterLib(IEventBus eventBus) {
NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
}
public void commonSetup(FMLCommonSetupEvent evt) {
if (FMLEnvironment.dist.isClient()) {
LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options);
CraterEventBus.INSTANCE.postEvent(event);
}
}
}

View File

@@ -1,21 +0,0 @@
package com.hypherionmc.craterlib.client;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.api.event.client.CraterClientTickEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.minecraft.client.Minecraft;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.event.TickEvent;
@Mod.EventBusSubscriber(modid = CraterConstants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class NeoForgeClientEvents {
@SubscribeEvent
public static void clientTick(TickEvent.LevelTickEvent event) {
CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(Minecraft.getInstance().level);
CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
}
}

View File

@@ -1,40 +0,0 @@
package com.hypherionmc.craterlib.client;
import com.hypherionmc.craterlib.core.platform.ClientPlatform;
import net.minecraft.client.Minecraft;
import net.minecraft.network.Connection;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import java.util.Objects;
/**
* @author HypherionSA
* @date 16/06/2022
*/
public class NeoForgeClientHelper implements ClientPlatform {
public NeoForgeClientHelper() {
}
@Override
public Minecraft getClientInstance() {
return Minecraft.getInstance();
}
@Override
public Player getClientPlayer() {
return Minecraft.getInstance().player;
}
@Override
public Level getClientLevel() {
return Minecraft.getInstance().level;
}
@Override
public Connection getClientConnection() {
Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
return Minecraft.getInstance().getConnection().getConnection();
}
}

View File

@@ -1,33 +0,0 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.platform.CommonPlatform;
import com.hypherionmc.craterlib.network.NeoForgeNetworkHandler;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.item.CreativeModeTab;
import net.neoforged.neoforge.server.ServerLifecycleHooks;
import java.util.HashMap;
import java.util.Map;
/**
* @author HypherionSA
*/
public class NeoForgeCommonHelper implements CommonPlatform {
public static Map<ResourceLocation, CreativeModeTab> TABS = new HashMap<>();
public NeoForgeCommonHelper() {
}
@Override
public CraterNetworkHandler createPacketHandler(String modid, boolean requiredClient, boolean requiredServer) {
return NeoForgeNetworkHandler.of(modid, requiredClient, requiredServer);
}
@Override
public MinecraftServer getMCServer() {
return ServerLifecycleHooks.getCurrentServer();
}
}

View File

@@ -1,73 +0,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();
}
}

View File

@@ -1,40 +0,0 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.api.event.server.CraterRegisterCommandEvent;
import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
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(event.getServer()));
}
@SubscribeEvent
public void serverStarted(ServerStartedEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started());
}
@SubscribeEvent
public void serverStopping(ServerStoppingEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping());
}
@SubscribeEvent
public void serverStopped(ServerStoppedEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped());
}
@SubscribeEvent
public void onCommandRegister(RegisterCommandsEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(event.getDispatcher()));
}
}

View File

@@ -1,45 +0,0 @@
package com.hypherionmc.craterlib.mixin;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.neoforged.neoforge.client.ConfigScreenHandler;
import net.neoforged.neoforgespi.language.IModInfo;
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.CallbackInfoReturnable;
import java.util.Optional;
import java.util.function.BiFunction;
/**
* @author HypherionSA
*/
@Mixin(ConfigScreenHandler.class)
public class ConfigScreenHandlerMixin {
/**
* Inject Auto Generated config Screens into forge
*
* @param selectedMod
* @param cir
*/
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", 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)) {
ModuleConfig config = (ModuleConfig) conf;
if (config.getModId().equals(selectedMod.getModId())) {
cir.setReturnValue(
Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))
);
}
}
});
}
}

View File

@@ -1,129 +0,0 @@
package com.hypherionmc.craterlib.network;
import com.google.common.collect.Maps;
import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.network.CraterPacket;
import com.hypherionmc.craterlib.core.network.PacketDirection;
import com.hypherionmc.craterlib.core.platform.ClientPlatform;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.Packet;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
import net.neoforged.fml.LogicalSide;
import net.neoforged.neoforge.common.util.LogicalSidedProvider;
import net.neoforged.neoforge.network.NetworkEvent;
import net.neoforged.neoforge.network.NetworkRegistry;
import net.neoforged.neoforge.network.PlayNetworkDirection;
import net.neoforged.neoforge.network.simple.MessageFunctions;
import net.neoforged.neoforge.network.simple.SimpleChannel;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.Supplier;
/**
* @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>
*/
public class NeoForgeNetworkHandler implements CraterNetworkHandler {
private static final Map<String, NeoForgeNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
private static final String PROTOCOL = Integer.toString(1);
private final SimpleChannel channel;
private final boolean clientRequired;
private final boolean serverRequired;
private final AtomicInteger packetID = new AtomicInteger();
private NeoForgeNetworkHandler(SimpleChannel channel, boolean clientRequired, boolean serverRequired) {
this.channel = channel;
this.clientRequired = clientRequired;
this.serverRequired = serverRequired;
}
public synchronized static CraterNetworkHandler of(String modId, boolean clientRequired, boolean serverRequired) {
NeoForgeNetworkHandler handler = NETWORK_HANDLERS.computeIfAbsent(modId, modId1 -> new NeoForgeNetworkHandler(buildSimpleChannel(modId1, clientRequired, serverRequired), clientRequired, serverRequired));
if (handler.clientRequired != clientRequired)
throw new IllegalArgumentException("client channel settings mismatch, expected %s, but was %s".formatted(handler.clientRequired, clientRequired));
if (handler.serverRequired != serverRequired)
throw new IllegalArgumentException("server channel settings mismatch, expected %s, but was %s".formatted(handler.serverRequired, serverRequired));
return handler;
}
private static SimpleChannel buildSimpleChannel(String modId, boolean clientAcceptsVanillaOrMissing, boolean serverAcceptsVanillaOrMissing) {
return NetworkRegistry.ChannelBuilder
.named(new ResourceLocation(modId, "crater_network"))
.networkProtocolVersion(() -> PROTOCOL)
.clientAcceptedVersions(clientAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
.serverAcceptedVersions(serverAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
.simpleChannel();
}
@Override
public <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
BiConsumer<T, FriendlyByteBuf> encoder = CraterPacket::write;
Function<FriendlyByteBuf, T> decoder = buf -> {
T packet = supplier.get();
packet.read(buf);
return packet;
};
BiConsumer<T, NetworkEvent.Context> handler = (packet, ctx) -> {
LogicalSide expectedSide = getSideFromDirection(packetDirection);
LogicalSide currentSide = ctx.getDirection().getReceptionSide();
if (expectedSide != currentSide) {
throw new IllegalStateException(String.format("Received message on wrong side, expected %s, was %s", expectedSide, currentSide));
}
ctx.enqueueWork(() -> {
Player player;
if (packetDirection == PacketDirection.TO_CLIENT) {
player = ClientPlatform.INSTANCE.getClientPlayer();
} else {
player = ctx.getSender();
}
packet.handle(player, LogicalSidedProvider.WORKQUEUE.get(expectedSide));
});
ctx.setPacketHandled(true);
};
this.channel.registerMessage(this.packetID.getAndIncrement(), clazz, encoder(encoder), decoder(decoder), buildHandler(handler));
}
@Override
public Packet<?> toServerBound(CraterPacket<?> packet) {
return this.channel.toVanillaPacket(packet, PlayNetworkDirection.PLAY_TO_SERVER);
}
@Override
public Packet<?> toClientBound(CraterPacket<?> packet) {
return this.channel.toVanillaPacket(packet, PlayNetworkDirection.PLAY_TO_CLIENT);
}
@Override
public void sendToServer(CraterPacket<?> packet) {
CraterNetworkHandler.super.sendToServer(packet);
}
private LogicalSide getSideFromDirection(PacketDirection direction) {
return direction == PacketDirection.TO_CLIENT ? LogicalSide.CLIENT : LogicalSide.SERVER;
}
private <T> MessageFunctions.MessageEncoder<T> encoder(BiConsumer<T, FriendlyByteBuf> encoder) {
return encoder::accept;
}
private <T> MessageFunctions.MessageDecoder<T> decoder(Function<FriendlyByteBuf, T> decoder) {
return decoder::apply;
}
private <T> MessageFunctions.MessageConsumer<T> buildHandler(BiConsumer<T, NetworkEvent.Context> handler) {
return (message, ctx) -> handler.accept(message, ctx);
}
}

View File

@@ -1,31 +0,0 @@
modLoader = "javafml"
loaderVersion = "[1,)"
license = "MIT"
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
[[mods]]
modId = "${mod_id}"
version = "${version}"
displayName = "${mod_name}"
displayURL = "https://modrinth.com/mod/craterlib"
logoFile = "craterlib_logo.png"
#credits="Thanks for this example mod goes to Java"
authors = "${mod_author}, Zenith"
description = '''
A library mod used by First Dark Development and HypherionSA Mods
'''
displayTest = "MATCH_VERSION"
[[dependencies.${ mod_id }]]
modId = "neoforge"
mandatory = true
versionRange = "[20.3,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.${ mod_id }]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.3,1.21)"
ordering = "NONE"
side = "BOTH"

View File

@@ -1 +0,0 @@
com.hypherionmc.craterlib.client.NeoForgeClientHelper

View File

@@ -1 +0,0 @@
com.hypherionmc.craterlib.common.NeoForgeCommonHelper

View File

@@ -1 +0,0 @@
com.hypherionmc.craterlib.common.NeoForgeLoaderHelper

View File

@@ -1,16 +0,0 @@
{
"required": true,
"minVersion": "0.8",
"package": "com.hypherionmc.craterlib.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
],
"client": [
"ConfigScreenHandlerMixin"
],
"server": [
],
"injectors": {
"defaultRequire": 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

View File

@@ -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
]) ])

View File

@@ -1,27 +1,32 @@
#Project #Project
version_major=1 version_major=1
version_minor=1 version_minor=1
version_patch=0 version_patch=2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
mod_id=craterlib mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=1.20.3 minecraft_version=1.19.2
# Fabric # Fabric
fabric_loader=0.15.0 fabric_api=0.76.0+1.19.2
fabric_api=0.91.1+1.20.3 fabric_loader=0.14.21
# Forge # Forge
forge_version=49.0.2 forge_version=43.2.0
# NeoForged
neoforge_version=8-beta
# Dependencies # Dependencies
mod_menu_version=8.0.0-beta.2 mod_menu_version=4.2.0-beta.2
moon_config=1.0.9 moon_config=1.0.9
# Publishing # Publishing
curse_id=867099 curse_id=867099
modrinth_id=Nn8Wasaq modrinth_id=Nn8Wasaq
# Gradle # Gradle
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false

View File

@@ -12,4 +12,3 @@ pluginManagement {
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
include("Common", "Fabric", "Forge") include("Common", "Fabric", "Forge")
include 'NeoForge'