Skip to content

Commit 1071c4b

Browse files
committed
Merge branch 'feature-1.19.2' into nyan-work/dev
2 parents 6c9e729 + 89a7236 commit 1071c4b

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

common.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ remapJar {
157157
}
158158

159159
processResources {
160+
outputs.upToDateWhen { false }
161+
160162
from("${rootDir}/icon.png") {
161163
into("assets/${project.mod_id}")
162164
}

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ mod_sources=https://github.com/plusls/oh-my-minecraft-client
1515
mod_version=0.5
1616

1717
# Required Libraries
18-
# MagicLib - 0.7.319
19-
magiclib_dependency=0.7.319+530ec3a-beta
20-
magiclib_version=0.7.319+530ec3a-beta
18+
# MagicLib - 0.7.322
19+
magiclib_dependency=0.7.322+57464f9-beta
20+
magiclib_version=0.7.322+57464f9-beta
2121

2222
# Annotation processor
2323
lombok_version=1.18.26

src/main/java/com/plusls/ommc/compat/modmenu/ModMenuApiImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ModMenuApiImpl implements ModMenuCompatApi {
99
public ConfigScreenFactoryCompat<?> getConfigScreenFactoryCompat() {
1010
return (screen) -> {
1111
GuiConfigs gui = GuiConfigs.getInstance();
12-
//#if MC > 11903 && MC < 12000
12+
//#if MC > 11903
1313
gui.setParent(screen);
1414
//#else
1515
//$$ gui.setParentGui(screen);

src/main/java/com/plusls/ommc/config/Configs.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public static void init(@NotNull ConfigManager cm) {
253253

254254
openConfigGui.getKeybind().setCallback((keyAction, iKeybind) -> {
255255
GuiConfigs screen = GuiConfigs.getInstance();
256-
//#if MC > 11903 && MC < 12000
256+
//#if MC > 11903
257257
screen.setParent(Minecraft.getInstance().screen);
258258
//#else
259259
//$$ screen.setParentGui(Minecraft.getInstance().screen);

versions/1.20/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Development Environment
2-
minecraft_version=23w18a
3-
minecraft_dependency=1.20-alpha.23.18.a
2+
minecraft_version=1.20-pre1
3+
minecraft_dependency=1.20-beta.1

0 commit comments

Comments
 (0)