From ca925404e76b100c1882ed59d4f1296ccfe674b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E9=9B=A8=E8=90=BD?= Date: Sun, 24 Sep 2023 08:46:38 +0800 Subject: [PATCH] :sparkles: Backport to 1.19.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 秋雨落 --- .../cx/rain/mc/nbtedit/gui/NBTEditGui.java | 22 +++----- .../gui/component/NBTNodeComponent.java | 26 +++++----- .../component/button/NBTOperatorButton.java | 15 ++++-- .../button/SpecialCharacterButton.java | 48 ------------------ .../component/window/EditValueSubWindow.java | 50 ++++++++----------- .../component/window/SubWindowComponent.java | 4 +- .../mc/nbtedit/gui/screen/NBTEditScreen.java | 12 ++--- .../rain/mc/nbtedit/forge/data/DataGen.java | 6 +-- .../data/provider/LanguageProviderENUS.java | 6 +-- .../data/provider/LanguageProviderZHCN.java | 6 +-- gradle.properties | 22 ++++---- 11 files changed, 75 insertions(+), 142 deletions(-) delete mode 100644 common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/SpecialCharacterButton.java diff --git a/common/src/main/java/cx/rain/mc/nbtedit/gui/NBTEditGui.java b/common/src/main/java/cx/rain/mc/nbtedit/gui/NBTEditGui.java index 9fd08b9..38833ab 100644 --- a/common/src/main/java/cx/rain/mc/nbtedit/gui/NBTEditGui.java +++ b/common/src/main/java/cx/rain/mc/nbtedit/gui/NBTEditGui.java @@ -177,36 +177,30 @@ private void addButtons() { int xLoc = 18; int yLoc = 4; - copyButton = new NBTOperatorButton(17, xLoc, yLoc, this, this::onCopyButtonClick, - componentSupplier -> componentSupplier.get().append(Component.translatable(Constants.GUI_NARRATION_BUTTON_COPY))); // Copy Button. + copyButton = new NBTOperatorButton(17, xLoc, yLoc, this, this::onCopyButtonClick, Component.translatable(Constants.GUI_NARRATION_BUTTON_COPY)); // Copy Button. addButton(copyButton); xLoc += 15; - cutButton = new NBTOperatorButton(16, xLoc, yLoc, this, this::onCutButtonClick, - componentSupplier -> componentSupplier.get().append(Component.translatable(Constants.GUI_NARRATION_BUTTON_CUT))); // Cut Button. + cutButton = new NBTOperatorButton(16, xLoc, yLoc, this, this::onCutButtonClick, Component.translatable(Constants.GUI_NARRATION_BUTTON_CUT)); // Cut Button. addButton(cutButton); xLoc += 15; - pasteButton = new NBTOperatorButton(15, xLoc, yLoc, this, this::onPasteButtonClick, - componentSupplier -> componentSupplier.get().append(Component.translatable(Constants.GUI_NARRATION_BUTTON_PASTE))); // Paste Button. + pasteButton = new NBTOperatorButton(15, xLoc, yLoc, this, this::onPasteButtonClick, Component.translatable(Constants.GUI_NARRATION_BUTTON_PASTE)); // Paste Button. addButton(pasteButton); xLoc += 45; - editButton = new NBTOperatorButton(13, xLoc, yLoc, this, this::onEditButtonClick, - componentSupplier -> componentSupplier.get().append(Component.translatable(Constants.GUI_NARRATION_BUTTON_EDIT))); // Edit Button. + editButton = new NBTOperatorButton(13, xLoc, yLoc, this, this::onEditButtonClick, Component.translatable(Constants.GUI_NARRATION_BUTTON_EDIT)); // Edit Button. addButton(editButton); xLoc += 15; - deleteButton = new NBTOperatorButton(14, xLoc, yLoc, this, this::onDeleteButtonClick, - componentSupplier -> componentSupplier.get().append(Component.translatable(Constants.GUI_NARRATION_BUTTON_DELETE))); // Delete Button. + deleteButton = new NBTOperatorButton(14, xLoc, yLoc, this, this::onDeleteButtonClick, Component.translatable(Constants.GUI_NARRATION_BUTTON_DELETE)); // Delete Button. addButton(deleteButton); // Add nbt type buttons. xLoc = 18; yLoc = 17; for (var i = 1; i < 13; i++) { - var button = new NBTOperatorButton(i, xLoc, yLoc, this, this::onAddButtonsClick, - componentSupplier -> componentSupplier.get().append(Component.translatable(Constants.GUI_NARRATION_BUTTON_ADD))); + var button = new NBTOperatorButton(i, xLoc, yLoc, this, this::onAddButtonsClick); addButtons[i - 1] = button; addButton(button); xLoc += 9; @@ -434,7 +428,7 @@ private void shiftToFocus(NBTTree.Node focused) { var index = getIndexOf(focused); if (index != -1) { var component = nodes.get(index); - shiftY((bottom + START_Y + 1) / 2 - (component.getY() + component.getHeight())); + shiftY((bottom + START_Y + 1) / 2 - (component.y + component.getHeight())); } } @@ -561,7 +555,7 @@ public boolean onMouseClicked(int mouseX, int mouseY, int partialTick) { if (node.spoilerClicked(mouseX, mouseY)) { // Check hide/show children buttons shouldUpdate = true; if (node.shouldShowChildren()) { - heightOffset = (START_Y + 1) - (node.getY()) + heightOffset; + heightOffset = (START_Y + 1) - (node.y) + heightOffset; } break; } diff --git a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/NBTNodeComponent.java b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/NBTNodeComponent.java index e3cc14e..308036f 100644 --- a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/NBTNodeComponent.java +++ b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/NBTNodeComponent.java @@ -48,11 +48,11 @@ protected void update() { } public boolean isMouseInsideText(int mouseX, int mouseY) { - return mouseX >= getX() && mouseY >= getY() && mouseX < width + getX() && mouseY < height + getY(); + return mouseX >= x && mouseY >= y && mouseX < width + x && mouseY < height + y; } public boolean isMouseInsideSpoiler(int mouseX, int mouseY) { - return mouseX >= getX() - 9 && mouseY >= getY() && mouseX < getX() && mouseY < getY() + height; + return mouseX >= x - 9 && mouseY >= y && mouseX < x && mouseY < y + height; } public boolean shouldShowChildren() { @@ -76,16 +76,11 @@ public boolean spoilerClicked(int mouseX, int mouseY) { } public void shiftY(int offsetY) { - setY(getY() + offsetY); + y += offsetY; } public boolean shouldRender(int top, int bottom) { - return getY() + height >= top && getY() <= bottom; - } - - @Override - protected void updateWidgetNarration(NarrationElementOutput narration) { - narration.add(NarratedElementType.TITLE, text); + return y + height >= top && y <= bottom; } @Override @@ -96,7 +91,7 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic var color = isSelected ? 0xff : isTextHover ? 16777120 : (node.hasParent()) ? 14737632 : -6250336; if (isSelected) { - fill(poseStack, getX() + 11, getY(), getX() + width, getY() + height, Integer.MIN_VALUE); + fill(poseStack, x + 11, y, x + width, y + height, Integer.MIN_VALUE); } var w = 18; @@ -118,11 +113,16 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic if (node.hasChild()) { RenderSystem.setShaderTexture(0, WIDGET_TEXTURE); - blit(poseStack, getX() - 9, getY(), 9, height, u, 16, w, h, 512, 512); + blit(poseStack, x - 9, y, 9, height, u, 16, w, h, 512, 512); } RenderSystem.setShaderTexture(0, WIDGET_TEXTURE); - blit(poseStack, getX() + 1, getY(), 9, height, (node.getTag().getId() - 1) * 16, 0, 16, 16, 512, 512); - getMinecraft().font.draw(poseStack, text, getX() + 11, getY() + (this.height - 8) / 2, color); + blit(poseStack, x + 1, y, 9, height, (node.getTag().getId() - 1) * 16, 0, 16, 16, 512, 512); + getMinecraft().font.draw(poseStack, text, x + 11, y + (this.height - 8) / 2, color); + } + + @Override + public void updateNarration(NarrationElementOutput narrationElementOutput) { + narrationElementOutput.add(NarratedElementType.TITLE, text); } } diff --git a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/NBTOperatorButton.java b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/NBTOperatorButton.java index e2070e0..f2df577 100644 --- a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/NBTOperatorButton.java +++ b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/NBTOperatorButton.java @@ -8,6 +8,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -21,8 +22,12 @@ public class NBTOperatorButton extends Button { private NBTEditGui gui; - public NBTOperatorButton(int id, int x, int y, NBTEditGui parent, OnPress onPressed, CreateNarration createNarration) { - super(x, y, 9, 9, Component.literal(NBTHelper.getNameByButton((byte) id)), onPressed, createNarration); + public NBTOperatorButton(int id, int x, int y, NBTEditGui parent, OnPress onPressed) { + this(id, x, y, parent, onPressed, Component.literal(NBTHelper.getNameByButton((byte) id))); + } + + public NBTOperatorButton(int id, int x, int y, NBTEditGui parent, OnPress onPressed, Component title) { + super(x, y, 9, 9, title, onPressed); buttonId = id; gui = parent; @@ -33,7 +38,7 @@ protected Minecraft getMinecraft() { } public boolean isMouseInside(int mouseX, int mouseY) { - return isActive() && mouseX >= getX() && mouseY >= getY() && mouseX < getX() + width && mouseY < getY() + height; + return isActive() && mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; } public byte getButtonId() { @@ -43,7 +48,7 @@ public byte getButtonId() { @Override public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick) { if (isMouseInside(mouseX, mouseY)) { // checks if the mouse is over the button - fill(poseStack, getX(), getY(), getX() + width, getY() + height, 0x80ffffff); // draw a grayish background + fill(poseStack, x, y, x + width, y + height, 0x80ffffff); // draw a grayish background if (hoverTime == -1) { hoverTime = System.currentTimeMillis(); } @@ -53,7 +58,7 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic if (isActive()) { RenderSystem.setShaderTexture(0, BUTTONS_TEXTURE); - blit(poseStack, getX(), getY(), width, height, (buttonId - 1) * 16, 0, 16, 16, 512, 512); //Draw the texture + blit(poseStack, x, y, width, height, (buttonId - 1) * 16, 0, 16, 16, 512, 512); //Draw the texture } if (hoverTime != -1 && System.currentTimeMillis() - hoverTime > 300) { diff --git a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/SpecialCharacterButton.java b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/SpecialCharacterButton.java deleted file mode 100644 index c899b28..0000000 --- a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/button/SpecialCharacterButton.java +++ /dev/null @@ -1,48 +0,0 @@ -package cx.rain.mc.nbtedit.gui.component.button; - -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import cx.rain.mc.nbtedit.NBTEdit; -import cx.rain.mc.nbtedit.utility.Constants; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.Button; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; - -public class SpecialCharacterButton extends Button { - public static final ResourceLocation WIDGET_TEXTURE = - new ResourceLocation(NBTEdit.MODID, "textures/gui/widgets.png"); - - protected int buttonId; - - public SpecialCharacterButton(int id, int x, int y, OnPress onPress) { - super(x, y, 14, 14, Component.empty(), onPress, componentSupplier -> componentSupplier.get().append(Component.translatable(Constants.GUI_NARRATION_BUTTON_SPECIAL_CHARACTER))); - - buttonId = id; - } - - protected Minecraft getMinecraft() { - return Minecraft.getInstance(); - } - - @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick) { - if (isMouseInside(mouseX, mouseY)) { - fill(poseStack, getX(), getY(), getX() + width, getY() + height, 0x80ffffff); - } - - if (isActive()) { - GlStateManager._clearColor(1.0F, 1.0F, 1.0F, 1.0F); - } else { - GlStateManager._clearColor(0.5F, 0.5F, 0.5F, 1.0F); - } - - RenderSystem.setShaderTexture(0, WIDGET_TEXTURE); - blit(poseStack, getX(), getY(), buttonId * width, 27, width, height); - } - - public boolean isMouseInside(int mouseX, int mouseY) { - return isActive() && mouseX >= getX() && mouseY >= getY() && mouseX < getX() + width && mouseY < getY() + height; - } -} diff --git a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/EditValueSubWindow.java b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/EditValueSubWindow.java index be4c73d..ebfe30b 100644 --- a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/EditValueSubWindow.java +++ b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/EditValueSubWindow.java @@ -5,7 +5,6 @@ import cx.rain.mc.nbtedit.NBTEdit; import cx.rain.mc.nbtedit.gui.NBTEditGui; import cx.rain.mc.nbtedit.gui.component.IWidgetHolder; -import cx.rain.mc.nbtedit.gui.component.button.SpecialCharacterButton; import cx.rain.mc.nbtedit.nbt.NBTTree; import cx.rain.mc.nbtedit.utility.Constants; import cx.rain.mc.nbtedit.nbt.NBTHelper; @@ -43,9 +42,6 @@ public class EditValueSubWindow extends SubWindowComponent implements IWidgetHol protected Button saveButton; protected Button cancelButton; - protected SpecialCharacterButton colorButton; - protected SpecialCharacterButton newLineButton; - protected String nameError; protected String valueError; @@ -61,18 +57,18 @@ public EditValueSubWindow(NBTEditGui parent, NBTTree.Node nodeIn, } public void init(int xLoc, int yLoc) { - setX(getX() + xLoc); - setY(getY() + yLoc); + x += xLoc; + y += yLoc; // Todo: newline and color button. String name = (nameField == null) ? node.getName() : nameField.getValue(); String value = (valueField == null) ? getValue(nbt) : valueField.getValue(); - nameField = new EditBox(getMinecraft().font, getX() + 46, getY() + 18, 116, 15, Component.literal("Name")); + nameField = new EditBox(getMinecraft().font, x + 46, y + 18, 116, 15, Component.literal("Name")); addWidget(nameField); - valueField = new EditBox(getMinecraft().font, getX() + 46, getY() + 44, 116, 15, Component.literal("Value")); + valueField = new EditBox(getMinecraft().font, x + 46, y + 44, 116, 15, Component.literal("Value")); addWidget(valueField); nameField.setValue(name); @@ -94,29 +90,23 @@ public void init(int xLoc, int yLoc) { // Todo: newline and color button. - saveButton = Button.builder(Component.translatable(Constants.GUI_BUTTON_SAVE), this::onSaveButtonClicked) - .pos(getX() + 9, getY() + 62) - .size(75, 20) - .build(); + saveButton = new Button(x + 9, y + 62, 75, 20, Component.translatable(Constants.GUI_BUTTON_SAVE), this::onSaveButtonClicked); addWidget(saveButton); - cancelButton = Button.builder(Component.translatable(Constants.GUI_BUTTON_CANCEL), this::onCancelButtonClicked) - .pos(getX() + 93, getY() + 62) - .size(75, 20) - .build(); + cancelButton = new Button(x + 93, y + 62, 75, 20, Component.translatable(Constants.GUI_BUTTON_CANCEL), this::onCancelButtonClicked); addWidget(cancelButton); } protected void onSaveButtonClicked(Button button) { - nameField.mouseClicked(button.getX(), button.getY(), 0); - valueField.mouseClicked(button.getX(), button.getY(), 0); + nameField.mouseClicked(button.x, button.y, 0); + valueField.mouseClicked(button.x, button.y, 0); save(); quit(); } protected void onCancelButtonClicked(Button button) { - nameField.mouseClicked(button.getX(), button.getY(), 0); - valueField.mouseClicked(button.getX(), button.getY(), 0); + nameField.mouseClicked(button.x, button.y, 0); + valueField.mouseClicked(button.x, button.y, 0); quit(); } @@ -149,23 +139,23 @@ protected Minecraft getMinecraft() { @Override public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick) { RenderSystem.setShaderTexture(0, WINDOW_TEXTURE); - blit(poseStack, getX(), getY(), 0, 0, width, height); + blit(poseStack, x, y, 0, 0, width, height); if (!canEditName) { - fill(poseStack, getX() + 42, getY() + 15, getX() + 169, getY() + 31, 0x80000000); + fill(poseStack, x + 42, y + 15, x + 169, y + 31, 0x80000000); } if (!canEditValue) { - fill(poseStack, getX() + 42, getY() + 41, getX() + 169, getY() + 57, 0x80000000); + fill(poseStack, x + 42, y + 41, x + 169, y + 57, 0x80000000); } renderWidgets(poseStack, mouseX, mouseY, partialTick); if (nameError != null) { - getMinecraft().font.draw(poseStack, nameError, getX() + width / 2, getY() + 4, 0xFF0000); + getMinecraft().font.draw(poseStack, nameError, x + width / 2, y + 4, 0xFF0000); } if (valueError != null) { - getMinecraft().font.draw(poseStack, nameError, getX() + width / 2, getY() + 32, 0xFF0000); + getMinecraft().font.draw(poseStack, nameError, x + width / 2, y + 32, 0xFF0000); } // Todo: newline and color button. @@ -216,11 +206,6 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { return false; } - @Override - public void updateWidgetNarration(NarrationElementOutput narration) { - narration.add(NarratedElementType.HINT, Component.translatable(Constants.GUI_NARRATION_SUB_WINDOW_VALUE_EDITOR)); - } - private void isValidInput() { boolean isValid = true; nameError = null; @@ -371,4 +356,9 @@ public void addWidget(AbstractWidget widget) { public void clearWidgets() { widgets.clear(); } + + @Override + public void updateNarration(NarrationElementOutput narrationElementOutput) { + narrationElementOutput.add(NarratedElementType.HINT, Component.translatable(Constants.GUI_NARRATION_SUB_WINDOW_VALUE_EDITOR)); + } } diff --git a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/SubWindowComponent.java b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/SubWindowComponent.java index 018f3e0..1947cb9 100644 --- a/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/SubWindowComponent.java +++ b/common/src/main/java/cx/rain/mc/nbtedit/gui/component/window/SubWindowComponent.java @@ -36,8 +36,8 @@ public void inactive() { protected void onDrag(double startX, double startY, double dragX, double dragY) { super.onDrag(startX, startY, dragX, dragY); - setX(getX() + (int) (startX + dragX)); - setY(getY() + (int) (startY + dragY)); + x += (int) (startX + dragX); + y += (int) (startY + dragY); } public void tick() { diff --git a/common/src/main/java/cx/rain/mc/nbtedit/gui/screen/NBTEditScreen.java b/common/src/main/java/cx/rain/mc/nbtedit/gui/screen/NBTEditScreen.java index a1ca3a0..9248a89 100644 --- a/common/src/main/java/cx/rain/mc/nbtedit/gui/screen/NBTEditScreen.java +++ b/common/src/main/java/cx/rain/mc/nbtedit/gui/screen/NBTEditScreen.java @@ -66,15 +66,9 @@ protected void init() { gui.init(width, height, height - 35); - addRenderableWidget(Button.builder(Component.translatable(Constants.GUI_BUTTON_SAVE), this::onSaveClicked) - .pos(width / 4 - 100, height - 27) - .size(200, 20) - .build()); - - addRenderableWidget(Button.builder(Component.translatable(Constants.GUI_BUTTON_QUIT), this::onQuitClicked) - .pos(width * 3 / 4 - 100, height - 27) - .size(200, 20) - .build()); + addRenderableWidget(new Button(width / 4 - 100, height - 27, 200, 20, Component.translatable(Constants.GUI_BUTTON_SAVE), this::onSaveClicked)); + + addRenderableWidget(new Button(width * 3 / 4 - 100, height - 27, 200, 20, Component.translatable(Constants.GUI_BUTTON_QUIT), this::onQuitClicked)); } @Override diff --git a/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/DataGen.java b/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/DataGen.java index 2121845..d401290 100644 --- a/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/DataGen.java +++ b/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/DataGen.java @@ -13,15 +13,13 @@ public class DataGen { @SubscribeEvent public static void onGatherData(GatherDataEvent event) { DataGenerator generator = event.getGenerator(); - var exHelper = event.getExistingFileHelper(); - var packOutput = generator.getPackOutput(); if (event.includeClient()) { } if (event.includeServer()) { - generator.addProvider(true, new LanguageProviderENUS(packOutput)); - generator.addProvider(true, new LanguageProviderZHCN(packOutput)); + generator.addProvider(true, new LanguageProviderENUS(generator)); + generator.addProvider(true, new LanguageProviderZHCN(generator)); } } } \ No newline at end of file diff --git a/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderENUS.java b/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderENUS.java index f0e0dfc..2d47c9d 100644 --- a/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderENUS.java +++ b/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderENUS.java @@ -2,12 +2,12 @@ import cx.rain.mc.nbtedit.NBTEdit; import cx.rain.mc.nbtedit.utility.Constants; -import net.minecraft.data.PackOutput; +import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.LanguageProvider; public class LanguageProviderENUS extends LanguageProvider { - public LanguageProviderENUS(PackOutput packOutput) { - super(packOutput, NBTEdit.MODID, "en_us"); + public LanguageProviderENUS(DataGenerator gen) { + super(gen, NBTEdit.MODID, "en_us"); } @Override diff --git a/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderZHCN.java b/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderZHCN.java index d8ddc45..390c2c3 100644 --- a/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderZHCN.java +++ b/forge/src/main/java/cx/rain/mc/nbtedit/forge/data/provider/LanguageProviderZHCN.java @@ -2,12 +2,12 @@ import cx.rain.mc.nbtedit.NBTEdit; import cx.rain.mc.nbtedit.utility.Constants; -import net.minecraft.data.PackOutput; +import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.LanguageProvider; public class LanguageProviderZHCN extends LanguageProvider { - public LanguageProviderZHCN(PackOutput packOutput) { - super(packOutput, NBTEdit.MODID, "zh_cn"); + public LanguageProviderZHCN(DataGenerator gen) { + super(gen, NBTEdit.MODID, "zh_cn"); } @Override diff --git a/gradle.properties b/gradle.properties index 78813c5..873c3be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,20 +10,20 @@ archives_base_name=nbtedit mod_id=nbtedit mod_name=NBTEdit mod_full_name=In-game NBTEdit Reborn -mod_version=1.19.3-4.1.1 +mod_version=1.19.2-4.0.5 -minecraft_version=1.19.3 +minecraft_version=1.19.2 -parchment_minecraft_version=1.19.3 -parchment_version=2023.06.25 +parchment_minecraft_version=1.19.2 +parchment_version=2022.11.27 fabric_loader_version=0.14.13 -fabric_api_version=0.76.1+1.19.3 -mod_menu_version=5.1.0 +fabric_api_version=0.76.1+1.19.2 +mod_menu_version=4.1.2 -forge_loader_version=44 -forge_version=1.19.3-44.1.0 +forge_loader_version=43 +forge_version=1.19.2-43.2.0 -next_minecraft_version=1.19.4 -next_forge_loader_version=45 -next_forge_version=45 +next_minecraft_version=1.19.3 +next_forge_loader_version=44 +next_forge_version=44