diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy index 3359e66..32ab7eb 100644 --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy @@ -9,7 +9,7 @@ pipeline { stage("Notify Discord") { steps { discordSend webhookURL: env.FDD_WH_ADMIN, - title: "Deploy Started: CraterLib 1.20 Deploy #${BUILD_NUMBER}", + title: "Deploy Started: CraterLib 1.19.3/4 Deploy #${BUILD_NUMBER}", link: env.BUILD_URL, result: 'SUCCESS', description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" @@ -38,7 +38,7 @@ pipeline { deleteDir() discordSend webhookURL: env.FDD_WH_ADMIN, - title: "CraterLib 1.20 Deploy #${BUILD_NUMBER}", + title: "CraterLib 1.19.3/4 Deploy #${BUILD_NUMBER}", link: env.BUILD_URL, result: currentBuild.currentResult, description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}" diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot index 5829e94..29ac606 100644 --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot @@ -13,7 +13,7 @@ pipeline { stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, - title: "Deploy Started: ${projectName} 1.20.1/2 Deploy #${BUILD_NUMBER}", + title: "Deploy Started: ${projectName} 1.19.3/4 Deploy #${BUILD_NUMBER}", link: env.BUILD_URL, result: 'SUCCESS', description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" @@ -54,7 +54,7 @@ pipeline { versionName: "Snapshot 1.0.${BUILD_NUMBER}", version: "1.0.${BUILD_NUMBER}", modLoaders: "forge|fabric|quilt", - minecraftVersions: "1.20|1.20.1", + minecraftVersions: "1.19.3|1.19.4", failWebhook: env.SSS_WEBHOOK, publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java index 1bd1ff5..26c715b 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java @@ -11,7 +11,6 @@ import com.mojang.blaze3d.vertex.*; import me.hypherionmc.moonconfig.core.conversion.SpecComment; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.ConfirmScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.GameRenderer; @@ -177,19 +176,19 @@ public class CraterConfigScreen extends Screen { } @Override - public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { - overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) { + overlayBackground(matrices, TOP, height - BOTTOM, 32); renderScrollBar(); - matrices.pose().pushPose(); - matrices.pose().translate(0, 0, 500.0); - overlayBackground(matrices.pose(), 0, TOP, 64); - overlayBackground(matrices.pose(), height - BOTTOM, height, 64); - renderShadow(matrices.pose()); - matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF); + matrices.pushPose(); + matrices.translate(0, 0, 500.0); + overlayBackground(matrices, 0, TOP, 64); + overlayBackground(matrices, height - BOTTOM, height, 64); + renderShadow(matrices); + drawCenteredString(matrices, font, getTitle(), width / 2, 9, 0xFFFFFF); super.render(matrices, mouseX, mouseY, delta); - matrices.pose().popPose(); + matrices.popPose(); int y = (int) (TOP + 4 - Math.round(scrollerAmount)); 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 (mouseY > startY && mouseY < startY + sizeY) { List list = new ArrayList<>(); @@ -387,7 +386,7 @@ public class CraterConfigScreen extends Screen { for (String desc : description) { list.add(Component.translatable(desc)); } - stack.renderComponentTooltip(font, list, mouseX, mouseY); + renderComponentTooltip(stack, list, mouseX, mouseY); } } } diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java index ed34f6b..dc7ac98 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java @@ -1,8 +1,8 @@ package com.hypherionmc.craterlib.client.gui.config.widgets; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.EditBox; @@ -17,7 +17,7 @@ public class AbstractConfigWidget extends BaseWidge public W widget; @Override - public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) { + public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) { super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta); int i = (widget instanceof EditBox ? 1 : 0); widget.setX(x + width - 200 - resetButtonOffset + i); diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java index 79ef163..14a0695 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java @@ -1,9 +1,9 @@ package com.hypherionmc.craterlib.client.gui.config.widgets; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -39,7 +39,7 @@ public class BaseWidget extends Option { } @Override - public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) { + public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) { MutableComponent text = Component.literal(this.text.getString()); boolean edited = isEdited() || hasErrors; if (edited) { @@ -50,7 +50,7 @@ public class BaseWidget extends Option { } else { text.withStyle(ChatFormatting.GRAY); } - matrices.drawString(font, text, x, y, 0xFFFFFF); + font.draw(matrices, text, x, y, 0xFFFFFF); resetButton.setX(x + width - 46); resetButton.setY(y + 1); resetButton.active = isNotDefault(); diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java index c1ee0fd..c4cf1e8 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java @@ -1,7 +1,7 @@ package com.hypherionmc.craterlib.client.gui.config.widgets; import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen; -import net.minecraft.client.gui.GuiGraphics; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; @@ -23,7 +23,7 @@ public class InternalConfigButton extends AbstractButton { } @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) { setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel")); } else { diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java index 821c749..b307167 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java @@ -1,8 +1,8 @@ package com.hypherionmc.craterlib.client.gui.config.widgets; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.AbstractContainerEventHandler; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.network.chat.Component; @@ -38,7 +38,7 @@ public abstract class Option extends AbstractContainerEventHandler { 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() { return 22; diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java index 9426ccf..c284781 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java @@ -2,9 +2,9 @@ package com.hypherionmc.craterlib.client.gui.config.widgets; import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen; import com.hypherionmc.craterlib.core.config.ModuleConfig; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; @@ -27,7 +27,7 @@ public class SubConfigWidget extends AbstractConfigWidget { } @Override - public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) { + public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) { this.text = Component.literal(subConfig.getClass().getSimpleName().toLowerCase()); this.hideReset(); super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta); diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java index cc05cec..192da97 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java @@ -1,8 +1,8 @@ package com.hypherionmc.craterlib.client.gui.config.widgets; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; import java.util.function.Function; @@ -29,7 +29,7 @@ public class TextConfigOption extends AbstractConfigWidget } @Override - public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) { + public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) { widget.setTextColor(hasErrors ? 16733525 : 14737632); super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta); } diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/WrappedEditBox.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/WrappedEditBox.java index 42c0c0c..13c026f 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/WrappedEditBox.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/WrappedEditBox.java @@ -21,7 +21,7 @@ public class WrappedEditBox extends EditBox { for (GuiEventListener child : Minecraft.getInstance().screen.children()) { if (child instanceof TextConfigOption option) { WrappedEditBox box = option.widget; - super.setFocused(box == this); + box.setFocused(box == this); } } super.setFocused(bl); diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/commands/AbstractCommand.java b/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/commands/AbstractCommand.java index 901a5fb..564a1f4 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/commands/AbstractCommand.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/commands/AbstractCommand.java @@ -7,7 +7,7 @@ import net.minecraft.network.chat.MutableComponent; public class AbstractCommand { public static void replySuccess(CommandContext stack, MutableComponent message) { - stack.getSource().sendSuccess(() -> message, false); + stack.getSource().sendSuccess(message, false); } public static void replyFailure(CommandContext stack, MutableComponent message) { diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/server/AbstractFakePlayer.java b/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/server/AbstractFakePlayer.java index 9c6b5bd..422cfc1 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/server/AbstractFakePlayer.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/server/AbstractFakePlayer.java @@ -25,13 +25,13 @@ public class AbstractFakePlayer extends CommandSourceStack { } @Override - public void sendSuccess(Supplier component, boolean bl) { - this.onSuccess(component.get(), bl); + public void sendSuccess(Component component, boolean bl) { + this.onSuccess(component, bl); } @Override public void sendFailure(Component component) { - sendSuccess(() -> component, false); + sendSuccess(component, false); } public UUID getUuid() { diff --git a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/MinecraftMixin.java b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/MinecraftMixin.java index b9b8596..ad5b7ef 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/MinecraftMixin.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/MinecraftMixin.java @@ -4,18 +4,18 @@ import com.hypherionmc.craterlib.api.event.client.ScreenEvent; import com.hypherionmc.craterlib.core.event.CraterEventBus; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; -import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.jetbrains.annotations.Nullable; + @Mixin(Minecraft.class) public class MinecraftMixin { - @Shadow @Nullable - public Screen screen; + @Shadow @Nullable public Screen screen; @Inject(method = "setScreen", at = @At(value = "TAIL")) private void injectScreenOpeningEvent(Screen screen, CallbackInfo ci) { diff --git a/Common/src/main/java/com/hypherionmc/craterlib/util/RenderUtils.java b/Common/src/main/java/com/hypherionmc/craterlib/util/RenderUtils.java index c489db0..d19adc3 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/util/RenderUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/util/RenderUtils.java @@ -42,7 +42,7 @@ public class RenderUtils { } public static int renderColorFromDye(DyeColor color) { - return color.getMapColor().col | 0xFF000000; + return color.getMaterialColor().col | 0xFF000000; } public static int alphaColorFromDye(DyeColor color, float alpha) { diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 26e47fd..564a1c9 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -116,8 +116,8 @@ publisher { versionType = "release" changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md" version = "${minecraft_version}-${project.version}" - displayName = "[FABRIC/QUILT 1.20.1/2] CraterLib - ${project.version}" - gameVersions = ["1.20", "1.20.1"] + displayName = "[FABRIC/QUILT 1.19.3/4] CraterLib - ${project.version}" + gameVersions = ["1.19.3", "1.19.4"] loaders = ["fabric", "quilt"] artifact = remapJar diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 68897d9..6f5bcd3 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ "depends": { "fabricloader": ">=0.14.21", "fabric-api": "*", - "minecraft": ">=1.20", + "minecraft": ">=1.19.3", "java": ">=17" } } diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index 3b053ed..dcb2da0 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[46,)" +loaderVersion = "[44,)" license = "MIT" issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues" @@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION" [[dependencies.${mod_id}]] modId = "forge" mandatory = true -versionRange = "[46,)" +versionRange = "[44,)" ordering = "NONE" side = "BOTH" [[dependencies.${mod_id}]] modId = "minecraft" mandatory = true -versionRange = "[1.20,1.20.2)" +versionRange = "[1.19.3,1.20)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index 3f72771..ca8e1a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,17 +10,17 @@ mod_id=craterlib mod_name=CraterLib # Shared -minecraft_version=1.20 +minecraft_version=1.19.3 # Fabric fabric_loader=0.14.21 -fabric_api=0.83.0+1.20 +fabric_api=0.76.1+1.19.3 # Forge -forge_version=46.0.1 +forge_version=44.1.0 # Dependencies -mod_menu_version=7.0.0-beta.2 +mod_menu_version=5.1.0-beta.4 moon_config=1.0.9 # Publishing