Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 610461a

Browse files
skyecodesskyecodes
committed
feat: 1.19.4 update
1 parent f23930a commit 610461a

18 files changed

+137
-96
lines changed

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- '1.19.3'
7+
- '1.19.4'
88
paths-ignore:
99
- 'README.md'
1010
- 'LICENSE'
@@ -29,7 +29,7 @@ jobs:
2929
- name: Build & release mod
3030
uses: gradle/gradle-build-action@v2
3131
with:
32-
arguments: build curseforgeRelease modrinthRelease githubRelease --no-daemon
32+
arguments: build publishUnified githubRelease --no-daemon
3333
env:
3434
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
3535
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

‎build.gradle

+11-57
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import com.modrinth.minotaur.TaskModrinthUpload
2-
import com.modrinth.minotaur.request.VersionType
32
import groovy.json.JsonSlurper
43
import net.darkhax.curseforgegradle.TaskPublishCurseForge
54

65
plugins {
76
id "architectury-plugin" version "3.4-SNAPSHOT"
8-
id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
7+
id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
98
id "net.darkhax.curseforgegradle" version "1.0.10"
10-
id "com.modrinth.minotaur" version "1.2.1"
9+
id "me.shedaniel.unified-publishing" version "0.1.+" apply false
1110
id "com.github.breadmoirai.github-release" version "2.2.12"
1211
}
1312

@@ -56,66 +55,21 @@ allprojects {
5655
java {
5756
withSourcesJar()
5857
}
59-
}
60-
61-
def slurper = new JsonSlurper()
62-
def versionInfo = slurper.parse(file("versions.json"))."${version}"
63-
String versionInfoType = versionInfo.type
64-
String versionInfoChangelog = versionInfo.changelog
65-
List<String> compatibleGameVersions = slurper.parseText(rootProject.compatible_minecraft_versions as String) as List<String>
66-
67-
task curseforgeRelease(type: TaskPublishCurseForge) {
68-
disableVersionDetection()
69-
apiToken = findProperty("curseforge_token") ?: System.getenv("CURSEFORGE_TOKEN")
7058

71-
ext.uploadFile = { modLoader, project ->
72-
def artifact = upload(256822, project.remapJar)
73-
artifact.displayName = "IBE Editor v${version} for ${modLoader} ${rootProject.minecraft_version}"
74-
artifact.releaseType = versionInfoType
75-
artifact.changelog = versionInfoChangelog
76-
artifact.changelogType = "markdown"
77-
artifact.addModLoader(modLoader)
78-
artifact.addJavaVersion("Java ${rootProject.java_version}")
79-
compatibleGameVersions.each { artifact.addGameVersion(it) }
80-
if (modLoader == "Fabric") {
81-
artifact.addRequirement("fabric-api")
82-
}
59+
ext {
60+
def slurper = new JsonSlurper()
61+
def versionInfo = slurper.parse(rootProject.file("versions.json"))."${version}"
62+
versionInfoType = versionInfo.type
63+
versionInfoChangelog = versionInfo.changelog
64+
compatibleGameVersions = slurper.parseText(rootProject.compatible_minecraft_versions as String) as List<String>
65+
curseforgeProjectId = "256822"
66+
modrinthProjectId = "E9sX1ncV"
8367
}
84-
85-
uploadFile("Forge", project(":forge"))
86-
uploadFile("Fabric", project(":fabric"))
87-
}
88-
89-
task modrinthReleaseForge(type: TaskModrinthUpload) {
90-
uploadFile = project(":forge").remapJar
91-
versionName = "IBE Editor v${version} for Forge ${rootProject.minecraft_version}"
92-
versionNumber = "${version}+${rootProject.major_minecraft_version}-forge"
93-
addLoader("forge")
94-
}
95-
96-
task modrinthReleaseFabric(type: TaskModrinthUpload) {
97-
uploadFile = project(":fabric").remapJar
98-
versionName = "IBE Editor v${version} for Fabric ${rootProject.minecraft_version}"
99-
versionNumber = "${version}+${rootProject.major_minecraft_version}-fabric"
100-
addLoader("fabric")
101-
//addDependency does not support project IDs yet
102-
}
103-
104-
task modrinthRelease {
105-
dependsOn modrinthReleaseForge, modrinthReleaseFabric
106-
}
107-
108-
tasks.withType(TaskModrinthUpload) {
109-
token = findProperty("modrinth_token") ?: System.getenv("MODRINTH_TOKEN")
110-
projectId = "E9sX1ncV"
111-
versionType = VersionType.valueOf(versionInfoType.toUpperCase())
112-
changelog = versionInfoChangelog
113-
compatibleGameVersions.each { addGameVersion(it) }
11468
}
11569

11670
githubRelease {
11771
setToken(findProperty("github_token") as String ?: System.getenv("GITHUB_TOKEN"))
118-
setOwner("Franckyi")
72+
setOwner("skyecodes")
11973
setRepo("IBE-Editor")
12074
setTagName("${version}+${rootProject.major_minecraft_version}")
12175
setTargetCommitish(rootProject.major_minecraft_version as String)

‎common/src/main/java/com/github/franckyi/guapi/api/RenderHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ public static void drawTooltip(PoseStack matrices, ItemStack itemStack, int x, i
8181
itemStack.getTooltipLines(Minecraft.getInstance().player, TooltipFlag.Default.NORMAL), x, y);
8282
}
8383

84-
public static void drawItem(ItemStack itemStack, int x, int y) {
85-
mc().getItemRenderer().renderAndDecorateFakeItem(itemStack, x, y);
84+
public static void drawItem(PoseStack matrices, ItemStack itemStack, int x, int y) {
85+
mc().getItemRenderer().renderAndDecorateFakeItem(matrices, itemStack, x, y);
8686
}
8787

88-
public static void drawItemDecorations(ItemStack itemStack, int x, int y) {
89-
mc().getItemRenderer().renderGuiItemDecorations(font(), itemStack, x, y);
88+
public static void drawItemDecorations(PoseStack matrices, ItemStack itemStack, int x, int y) {
89+
mc().getItemRenderer().renderGuiItemDecorations(matrices, font(), itemStack, x, y);
9090
}
9191
}

‎common/src/main/java/com/github/franckyi/guapi/base/ScreenHandlerImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private GuapiScreen() {
187187
public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float partialTicks) {
188188
if (!currentSceneProperty().hasValue()) return;
189189
if (getCurrentScene().isTexturedBackground()) {
190-
renderDirtBackground(0);
190+
renderDirtBackground(matrices);
191191
} else {
192192
renderBackground(matrices);
193193
}

‎common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/VanillaItemViewSkin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public void render(ItemView node, PoseStack matrices, int mouseX, int mouseY, fl
1919
if (item != null) {
2020
int x = node.getX() + (node.getWidth() - node.getComputedWidth()) / 2;
2121
int y = node.getY() + (node.getHeight() - node.getComputedHeight()) / 2;
22-
RenderHelper.drawItem(item, x, y);
22+
RenderHelper.drawItem(matrices, item, x, y);
2323
if (node.isDrawDecorations()) {
24-
RenderHelper.drawItemDecorations(item, x, y);
24+
RenderHelper.drawItemDecorations(matrices, item, x, y);
2525
}
2626
}
2727
}

‎common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaCheckBoxSkinDelegate.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void onPress() {
3333
}
3434

3535
@Override
36-
public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float delta) {
36+
public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float delta) {
3737
Minecraft mc = Minecraft.getInstance();
3838
RenderSystem.setShaderTexture(0, TEXTURE);
3939
RenderSystem.enableDepthTest();
@@ -42,7 +42,6 @@ public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float delt
4242
RenderSystem.defaultBlendFunc();
4343
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
4444
blit(poseStack, getX(), getY(), isHoveredOrFocused() ? 16 : 0, selected() ? 16 : 0, 16, 16, 32, 32);
45-
renderBg(poseStack, mc, mouseX, mouseY);
4645
drawString(poseStack, mc.font, getMessage(), getX() + 20, getY() + (height - mc.font.lineHeight - 1) / 2, 14737632 | Mth.ceil(alpha * 255.0F) << 24);
4746
}
4847
}

‎common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTextAreaSkinDelegate.java

+13
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.client.Minecraft;
77
import net.minecraft.client.gui.components.MultiLineEditBox;
88
import net.minecraft.client.gui.components.Whence;
9+
import net.minecraft.client.gui.screens.Screen;
910

1011
public class VanillaTextAreaSkinDelegate<N extends TextArea> extends MultiLineEditBox implements VanillaWidgetSkinDelegate {
1112
private final N node;
@@ -49,6 +50,18 @@ private void updateText(String text) {
4950
}
5051
}
5152

53+
// Mojang somehow broke moving the cursor with the mouse???
54+
@Override
55+
public boolean mouseClicked(double d, double e, int i) {
56+
if (this.withinContentAreaPoint(d, e) && i == 0) {
57+
self.getTextField().setSelecting(Screen.hasShiftDown());
58+
self.invokeSeekCursorScreen(d, e);
59+
return true;
60+
} else {
61+
return super.mouseClicked(d, e, i);
62+
}
63+
}
64+
5265
@Override
5366
public void doTick() {
5467
tick();

‎common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTextFieldSkinDelegate.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
148148
} else {
149149
boolean flag = mouseX >= getX() && mouseX < getX() + width && mouseY >= getY() && mouseY < getY() + height;
150150
if (self.canLoseFocus() && button == 0) {
151-
setFocus(flag);
151+
setFocused(flag);
152152
}
153153

154154
if (isFocused() && flag && button == 0) {
@@ -167,7 +167,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
167167
}
168168

169169
@Override
170-
public void renderButton(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
170+
public void renderWidget(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
171171
Font font = Minecraft.getInstance().font;
172172
if (isVisible()) {
173173
if (self.isBordered()) {
@@ -238,7 +238,7 @@ public void renderButton(@NotNull PoseStack matrices, int mouseX, int mouseY, fl
238238
Component highlightedText = renderText(getValue().substring(start, end), start);
239239
int highlightedTextWidth = font.width(highlightedText);
240240
int x0 = getX() + 4;
241-
self.invokeRenderHighlight(x0 + previousTextWidth, i1 - 1, x0 + previousTextWidth + highlightedTextWidth, i1 + 1 + 9);
241+
self.invokeRenderHighlight(matrices, x0 + previousTextWidth, i1 - 1, x0 + previousTextWidth + highlightedTextWidth, i1 + 1 + 9);
242242
}
243243

244244
}

‎common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTexturedButtonSkinDelegate.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public VanillaTexturedButtonSkinDelegate(N node) {
1919
}
2020

2121
@Override
22-
public void renderButton(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
22+
public void renderWidget(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
2323
if (node.isDrawButton()) {
24-
super.renderButton(matrices, mouseX, mouseY, delta);
24+
super.renderWidget(matrices, mouseX, mouseY, delta);
2525
}
2626
}
2727
}

‎common/src/main/java/com/github/franckyi/ibeeditor/common/network/BlockEditorPacket.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.github.franckyi.ibeeditor.common.EditorType;
44
import net.minecraft.core.BlockPos;
55
import net.minecraft.nbt.CompoundTag;
6+
import net.minecraft.nbt.NbtOps;
67
import net.minecraft.network.FriendlyByteBuf;
78
import net.minecraft.world.level.block.state.BlockState;
89

@@ -25,13 +26,13 @@ protected record ResponseData(BlockState blockState, CompoundTag tag) {
2526
public static final PacketSerializer<ResponseData> SERIALIZER = new PacketSerializer<>() {
2627
@Override
2728
public void write(ResponseData obj, FriendlyByteBuf buf) {
28-
buf.writeWithCodec(BlockState.CODEC, obj.blockState());
29+
buf.writeWithCodec(NbtOps.INSTANCE, BlockState.CODEC, obj.blockState());
2930
buf.writeNbt(obj.tag());
3031
}
3132

3233
@Override
3334
public ResponseData read(FriendlyByteBuf buf) {
34-
return new ResponseData(buf.readWithCodec(BlockState.CODEC), buf.readNbt());
35+
return new ResponseData(buf.readWithCodec(NbtOps.INSTANCE, BlockState.CODEC), buf.readNbt());
3536
}
3637
};
3738
}

‎common/src/main/java/com/github/franckyi/ibeeditor/mixin/EditBoxMixin.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.github.franckyi.ibeeditor.mixin;
22

3+
import com.mojang.blaze3d.vertex.PoseStack;
34
import net.minecraft.client.gui.components.EditBox;
45
import net.minecraft.util.FormattedCharSequence;
56
import org.spongepowered.asm.mixin.Mixin;
@@ -56,5 +57,5 @@ public interface EditBoxMixin {
5657
int invokeGetMaxLength();
5758

5859
@Invoker("renderHighlight")
59-
void invokeRenderHighlight(int x1, int y1, int x2, int y2);
60+
void invokeRenderHighlight(PoseStack poseStack, int x1, int y1, int x2, int y2);
6061
}

‎common/src/main/java/com/github/franckyi/ibeeditor/mixin/MultiLineEditBoxMixin.java

+4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55
import org.spongepowered.asm.mixin.Mixin;
66
import org.spongepowered.asm.mixin.Mutable;
77
import org.spongepowered.asm.mixin.gen.Accessor;
8+
import org.spongepowered.asm.mixin.gen.Invoker;
89

910
@Mixin(MultiLineEditBox.class)
1011
public interface MultiLineEditBoxMixin {
1112
@Accessor
1213
@Mutable
1314
MultilineTextField getTextField();
15+
16+
@Invoker
17+
void invokeSeekCursorScreen(double x, double y);
1418
}

‎fabric/build.gradle

+38-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id "com.github.johnrengelman.shadow" version "7.0.0"
3+
id "me.shedaniel.unified-publishing"
34
}
45

56
repositories {
@@ -29,7 +30,7 @@ configurations {
2930
dependencies {
3031
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
3132
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
32-
modImplementation "com.terraformersmc:modmenu:5.0.2"
33+
modImplementation "com.terraformersmc:modmenu:${rootProject.modmenu_version}"
3334

3435
common(project(path: ":common", configuration: "namedElements")) { transitive false }
3536
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
@@ -82,4 +83,39 @@ publishing {
8283
repositories {
8384
// Add repositories to publish to here.
8485
}
85-
}
86+
}
87+
88+
unifiedPublishing {
89+
project {
90+
displayName = "IBE Editor v${rootProject.version} for Fabric ${rootProject.minecraft_version}"
91+
releaseType = versionInfoType
92+
changelog = versionInfoChangelog
93+
compatibleGameVersions.each { gameVersions.add it }
94+
gameLoaders = ["fabric"]
95+
mainPublication tasks.remapJar
96+
relations {
97+
depends {
98+
curseforge = "fabric-api"
99+
modrinth = "fabric-api"
100+
}
101+
}
102+
103+
var CURSE_API_KEY = project.findProperty("curseforge_token") ?: System.getenv("CURSEFORGE_TOKEN")
104+
if (CURSE_API_KEY != null) {
105+
curseforge {
106+
token = CURSE_API_KEY
107+
id = curseforgeProjectId
108+
gameVersions.add "Java ${rootProject.java_version}"
109+
}
110+
}
111+
112+
var MODRINTH_TOKEN = project.findProperty("modrinth_token") ?: System.getenv("MODRINTH_TOKEN")
113+
if (MODRINTH_TOKEN != null) {
114+
modrinth {
115+
token = MODRINTH_TOKEN
116+
id = modrinthProjectId
117+
version = "${rootProject.version}+${rootProject.major_minecraft_version}-fabric"
118+
}
119+
}
120+
}
121+
}

‎fabric/src/main/resources/fabric.mod.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"name": "IBE Editor",
66
"description": "Simple GUI Mod to edit an item, a block or an entity in your current world",
77
"authors": [
8-
"Franckyi"
8+
"skyecodes"
99
],
1010
"contact": {
1111
"homepage": "https://www.curseforge.com/minecraft/mc-mods/ibe-editor",
12-
"sources": "https://github.com/Franckyi/IBE-Editor",
13-
"issues": "https://github.com/Franckyi/IBE-Editor/issues"
12+
"sources": "https://github.com/skyecodes/IBE-Editor",
13+
"issues": "https://github.com/skyecodes/IBE-Editor/issues"
1414
},
1515
"license": "MIT",
1616
"icon": "logo.png",
@@ -32,9 +32,9 @@
3232
],
3333
"accessWidener": "ibeeditor.accesswidener",
3434
"depends": {
35-
"fabricloader": ">=0.14.6",
35+
"fabricloader": ">=0.14",
3636
"fabric": "*",
37-
"minecraft": ">=1.19.3",
37+
"minecraft": ">=1.19.4",
3838
"java": ">=17"
3939
},
4040
"custom": {

0 commit comments

Comments
 (0)