Skip to content

Commit eb0267c

Browse files
kyrptonaughtkyrptonaught
committed
Fix compat with MidnightControls 1.5.0+1.19
1 parent 6c38dfd commit eb0267c

File tree

15 files changed

+65
-59
lines changed

15 files changed

+65
-59
lines changed

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
plugins {
2-
id 'fabric-loom' version '0.11-SNAPSHOT'
2+
id 'fabric-loom' version '0.12-SNAPSHOT'
33
id 'maven-publish'
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_16
7-
targetCompatibility = JavaVersion.VERSION_16
6+
sourceCompatibility = JavaVersion.VERSION_17
7+
targetCompatibility = JavaVersion.VERSION_17
88

99
archivesBaseName = project.archives_base_name
1010
version = project.mod_version
1111
group = project.maven_group
1212

1313
repositories {
14-
maven { url 'https://maven.gegy.dev/releases/' }
15-
maven { url 'https://aperlambda.github.io/maven' }
1614
maven { url 'https://maven.terraformersmc.com/' }
1715
maven { url = "https://maven.kyrptonaught.dev" }
1816

17+
//midnight controls
18+
mavenLocal()
19+
mavenCentral()
20+
maven { url 'https://aperlambda.github.io/maven' }
1921
maven {
2022
name 'Gegy'
2123
url 'https://maven.gegy.dev'
2224
}
2325
maven {
24-
name 'CottonMC'
25-
url 'https://server.bbkr.space/artifactory/libs-snapshot'
26+
name = "CottonMC"
27+
url = "https://server.bbkr.space/artifactory/libs-release"
2628
}
29+
maven { url "https://maven.terraformersmc.com/releases/" }
2730
maven { url 'https://maven.kosmx.dev' }
2831
maven { url 'https://maven.shedaniel.me/' }
2932
maven { url 'https://jitpack.io' }
@@ -38,18 +41,18 @@ loom {
3841
dependencies {
3942
// To change the versions see the gradle.properties file
4043
minecraft "com.mojang:minecraft:${project.minecraft_version}"
41-
mappings "net.fabricmc:yarn:${project.yarn_mappings}"
44+
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
4245
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
4346

4447
// Fabric API. This is technically optional, but you probably want it anyway.
4548
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
4649

4750
//modImplementation "dev.lambdaurora:lambdacontrols:1.7.1+1.17"
48-
optionalDependency('eu.midnightdust:midnightcontrols:1.0.0-1.18')
51+
optionalDependency('eu.midnightdust:midnightcontrols:1.5.0-1.19')
4952

5053

51-
modImplementation('net.kyrptonaught:kyrptconfig:1.4.4-1.18')
52-
include('net.kyrptonaught:kyrptconfig:1.4.4-1.18')
54+
modImplementation('net.kyrptonaught:kyrptconfig:1.4.14-1.19')
55+
include('net.kyrptonaught:kyrptconfig:1.4.14-1.19')
5356
}
5457

5558
def optionalDependency(String dep) {

‎gradle.properties‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
org.gradle.jvmargs=-Xmx4G
22

3-
minecraft_version=1.18.2
4-
yarn_mappings=1.18.2+build.3:v2
5-
loader_version=0.14.6
3+
minecraft_version=1.19
4+
yarn_mappings=1.19+build.4
5+
loader_version=0.14.9
66

77
#Fabric api
8-
fabric_version=0.53.0+1.18.2
8+
fabric_version=0.58.0+1.19
99

1010
# Mod Properties
11-
mod_version=0.0.8-1.18
11+
mod_version=0.0.9-1.19
1212
maven_group=net.kyrptonaught
13-
archives_base_name=lemclienthelper
14-
13+
archives_base_name=lemclienthelper

‎src/main/java/net/kyrptonaught/lemclienthelper/ResourcePreloader/AllPacks.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import net.minecraft.text.Text;
5-
import net.minecraft.text.TranslatableText;
65
import net.minecraft.util.ProgressListener;
76

87
import java.io.File;
@@ -43,7 +42,7 @@ public void setTitle(Text title) {
4342

4443
public void setTitleAndTask(Text title) {
4544
this.title = title;
46-
this.setTask(new TranslatableText("progress.working"));
45+
this.setTask(Text.translatable("progress.working"));
4746
}
4847

4948
@Override
@@ -62,7 +61,7 @@ public void skip(Text title) {
6261

6362
@Override
6463
public void setDone() {
65-
done(new TranslatableText("key.lemclienthelper.downloadcomplete"), this.task);
64+
done(Text.translatable("key.lemclienthelper.downloadcomplete"), this.task);
6665
}
6766

6867
private void done(Text title, Text task) {

‎src/main/java/net/kyrptonaught/lemclienthelper/ResourcePreloader/ResourcePreloader.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
import net.minecraft.client.toast.SystemToast;
1111
import net.minecraft.client.util.NetworkUtils;
1212
import net.minecraft.resource.ResourceType;
13-
import net.minecraft.text.LiteralText;
14-
import net.minecraft.text.TranslatableText;
13+
import net.minecraft.text.Text;
1514
import org.apache.commons.codec.digest.DigestUtils;
1615
import org.apache.commons.io.FileUtils;
1716
import org.apache.commons.io.IOUtils;
1817
import org.apache.commons.io.filefilter.TrueFileFilter;
1918

2019
import java.io.File;
2120
import java.io.IOException;
21+
import java.net.MalformedURLException;
2222
import java.net.URL;
2323
import java.util.ArrayList;
2424
import java.util.Locale;
@@ -81,7 +81,7 @@ static void downloadNextPack() {
8181

8282
static void downloadComplete(AllPacks.RPOption rpOption) {
8383
if (getConfig().toastComplete)
84-
SystemToast.show(MinecraftClient.getInstance().getToastManager(), SystemToast.Type.TUTORIAL_HINT, rpOption.progressListener.title, new LiteralText(rpOption.packname));
84+
SystemToast.show(MinecraftClient.getInstance().getToastManager(), SystemToast.Type.TUTORIAL_HINT, rpOption.progressListener.title, Text.literal(rpOption.packname));
8585
if (!getConfig().multiDownload)
8686
downloadNextPack();
8787
if (verifyFile(rpOption.hash, rpOption.downloadedFile)) {
@@ -98,7 +98,7 @@ private static void checkIfComplete() {
9898
}
9999
}
100100
downloadsComplete = true;
101-
SystemToast.add(MinecraftClient.getInstance().getToastManager(), SystemToast.Type.TUTORIAL_HINT, new TranslatableText("key.lemclienthelper.alldownloadcomplete"), new LiteralText("Took: " + (System.currentTimeMillis() - startTime) + " milliseconds"));
101+
//SystemToast.add(MinecraftClient.getInstance().getToastManager(), SystemToast.Type.TUTORIAL_HINT, Text.translatable("key.lemclienthelper.alldownloadcomplete"), Text.literal("Took: " + (System.currentTimeMillis() - startTime) + " milliseconds"));
102102
}
103103

104104
private static void download(AllPacks.RPOption rpOption, boolean previewOnly) {
@@ -108,12 +108,16 @@ private static void download(AllPacks.RPOption rpOption, boolean previewOnly) {
108108
rpOption.downloadedFile = file;
109109
if ((getConfig().allowOptifine && rpOption.packCompatibility == AllPacks.RPOption.PACKCOMPATIBILITY.VANILLA) ||
110110
(!getConfig().allowOptifine && rpOption.packCompatibility == AllPacks.RPOption.PACKCOMPATIBILITY.OPTIFINE)) {
111-
rpOption.progressListener.skip(new TranslatableText("key.lemclienthelper.wrongpackcompatibility"));
111+
rpOption.progressListener.skip(Text.translatable("key.lemclienthelper.wrongpackcompatibility"));
112112
} else if (file.exists()) {
113-
rpOption.progressListener.skip(new TranslatableText("key.lemclienthelper.alreadydownloaded"));
113+
rpOption.progressListener.skip(Text.translatable("key.lemclienthelper.alreadydownloaded"));
114114
} else if (!previewOnly) {
115115
Map<String, String> map = getDownloadHeaders();
116-
NetworkUtils.downloadResourcePack(file, rpOption.url, map, Integer.MAX_VALUE, rpOption.progressListener, minecraftClient.getNetworkProxy());
116+
try {
117+
NetworkUtils.downloadResourcePack(file, new URL(rpOption.url), map, Integer.MAX_VALUE, rpOption.progressListener, minecraftClient.getNetworkProxy());
118+
} catch (MalformedURLException exception) {
119+
System.out.println("Bad URL detected: " + rpOption.url);
120+
}
117121
}
118122
}
119123

‎src/main/java/net/kyrptonaught/lemclienthelper/SmallInv/SmallInvInit.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static SmallInvConfig getConfig() {
4343
}
4444

4545
public static boolean isSmallInv(PlayerEntity player) {
46-
//if (true) return true;
46+
//if (true) return true; // force enabling for testing
4747
if (!getConfig().enabled) return false;
4848

4949
//give @p knowledge_book{display:{Name:'{"text":" "}'},SmallInv:1,CustomModelData:1}

‎src/main/java/net/kyrptonaught/lemclienthelper/SmallInv/SmallInvScreen.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.minecraft.client.util.math.MatrixStack;
99
import net.minecraft.entity.player.PlayerEntity;
1010
import net.minecraft.screen.PlayerScreenHandler;
11-
import net.minecraft.text.TranslatableText;
11+
import net.minecraft.text.Text;
1212
import net.minecraft.util.Identifier;
1313

1414
public class SmallInvScreen extends AbstractInventoryScreen<PlayerScreenHandler> {
@@ -17,7 +17,7 @@ public class SmallInvScreen extends AbstractInventoryScreen<PlayerScreenHandler>
1717
private float mouseY;
1818

1919
public SmallInvScreen(PlayerEntity player) {
20-
super(player.playerScreenHandler, player.getInventory(), new TranslatableText("container.inventory"));
20+
super(player.playerScreenHandler, player.getInventory(), Text.translatable("container.inventory"));
2121
this.passEvents = false;
2222
this.titleY = 86;
2323
this.backgroundHeight = 124;

‎src/main/java/net/kyrptonaught/lemclienthelper/TakeEverything/LambdControlsCompat.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
import eu.midnightdust.midnightcontrols.client.controller.PressAction;
88
import net.kyrptonaught.lemclienthelper.LEMClientHelperMod;
99
import net.minecraft.screen.PlayerScreenHandler;
10-
import net.minecraft.util.Identifier;
1110
import org.jetbrains.annotations.NotNull;
1211
import org.lwjgl.glfw.GLFW;
1312

1413

15-
1614
public class LambdControlsCompat implements CompatHandler {
1715

1816
public static void register() {
@@ -29,7 +27,7 @@ public static void register() {
2927

3028
@Override
3129
public void handle(@NotNull MidnightControlsClient mod) {
32-
new ButtonBinding.Builder(LEMClientHelperMod.MOD_ID+".takeeverything")
30+
new ButtonBinding.Builder(LEMClientHelperMod.MOD_ID + ".takeeverything")
3331
.buttons(GLFW.GLFW_GAMEPAD_BUTTON_LEFT_THUMB)
3432
.onlyInInventory()
3533
.action(TAKE_EVERYTHING)

‎src/main/java/net/kyrptonaught/lemclienthelper/config/ModMenuIntegration.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,40 @@
1414
import net.minecraft.client.font.TextRenderer;
1515
import net.minecraft.client.gui.screen.Screen;
1616
import net.minecraft.client.util.math.MatrixStack;
17-
import net.minecraft.text.LiteralText;
1817
import net.minecraft.text.Text;
19-
import net.minecraft.text.TranslatableText;
2018

2119
public class ModMenuIntegration implements ModMenuApi {
2220

2321
@Override
2422
public ConfigScreenFactory<?> getModConfigScreenFactory() {
2523
return (screen) -> {
2624
ResourcePreloaderConfig config = ResourcePreloader.getConfig();
27-
ConfigScreen configScreen = new ConfigScreen(screen, new TranslatableText("key.lemclienthelper.title"));
25+
ConfigScreen configScreen = new ConfigScreen(screen, Text.translatable("key.lemclienthelper.title"));
2826
configScreen.setSavingEvent(() -> {
2927
LEMClientHelperMod.configManager.save();
3028
});
3129

32-
ConfigSection rplSection = new ConfigSection(configScreen, new TranslatableText("key.lemclienthelper.resourcepreloader"));
30+
ConfigSection rplSection = new ConfigSection(configScreen, Text.translatable("key.lemclienthelper.resourcepreloader"));
3331

34-
rplSection.addConfigItem(new TextItem(new TranslatableText("key.lemclienthelper.downloadurl"), config.URL, ResourcePreloaderConfig.DEFAULT_URL).setMaxLength(1024).setSaveConsumer(val -> config.URL = val));
35-
rplSection.addConfigItem(new BooleanItem(new TranslatableText("key.lemclienthelper.allowOptifine"), config.allowOptifine, false).setSaveConsumer(val -> config.allowOptifine = val));
36-
rplSection.addConfigItem(new BooleanItem(new TranslatableText("key.lemclienthelper.multiDownload"), config.multiDownload, true).setSaveConsumer(val -> config.multiDownload = val));
37-
rplSection.addConfigItem(new BooleanItem(new TranslatableText("key.lemclienthelper.toastcomplete"), config.toastComplete, true).setSaveConsumer(val -> config.toastComplete = val));
32+
rplSection.addConfigItem(new TextItem(Text.translatable("key.lemclienthelper.downloadurl"), config.URL, ResourcePreloaderConfig.DEFAULT_URL).setMaxLength(1024).setSaveConsumer(val -> config.URL = val));
33+
rplSection.addConfigItem(new BooleanItem(Text.translatable("key.lemclienthelper.allowOptifine"), config.allowOptifine, false).setSaveConsumer(val -> config.allowOptifine = val));
34+
rplSection.addConfigItem(new BooleanItem(Text.translatable("key.lemclienthelper.multiDownload"), config.multiDownload, true).setSaveConsumer(val -> config.multiDownload = val));
35+
rplSection.addConfigItem(new BooleanItem(Text.translatable("key.lemclienthelper.toastcomplete"), config.toastComplete, true).setSaveConsumer(val -> config.toastComplete = val));
3836

39-
rplSection.addConfigItem(new ButtonItem(new TranslatableText("key.lemclienthelper.deletePacks")).setClickEvent(() -> {
37+
rplSection.addConfigItem(new ButtonItem(Text.translatable("key.lemclienthelper.deletePacks")).setClickEvent(() -> {
4038
configScreen.save();
4139
ResourcePreloader.deletePacks();
4240
}));
4341

44-
SubItem<?> sub = new SubItem<>(new TranslatableText("key.lemclienthelper.packdownloads"), true);
42+
SubItem<?> sub = new SubItem<>(Text.translatable("key.lemclienthelper.packdownloads"), true);
4543

46-
rplSection.addConfigItem(new ButtonItem(new TranslatableText("key.lemclienthelper.previewList")).setClickEvent(() -> {
44+
rplSection.addConfigItem(new ButtonItem(Text.translatable("key.lemclienthelper.previewList")).setClickEvent(() -> {
4745
configScreen.save();
4846
ResourcePreloader.getPackList();
4947
addPacksToSub(sub);
5048
}));
5149

52-
rplSection.addConfigItem(new ButtonItem(new TranslatableText("key.lemclienthelper.startdownload")).setClickEvent(() -> {
50+
rplSection.addConfigItem(new ButtonItem(Text.translatable("key.lemclienthelper.startdownload")).setClickEvent(() -> {
5351
configScreen.save();
5452
ResourcePreloader.getPackList();
5553
ResourcePreloader.downloadPacks();
@@ -59,8 +57,8 @@ public ConfigScreenFactory<?> getModConfigScreenFactory() {
5957
rplSection.addConfigItem(sub);
6058
addPacksToSub(sub);
6159

62-
ConfigSection smallInvSection = new ConfigSection(configScreen, new TranslatableText("key.lemclienthelper.smallinv"));
63-
smallInvSection.addConfigItem(new BooleanItem(new TranslatableText("key.lemclienthelper.smallinv.enabled"), SmallInvInit.getConfig().enabled, true).setSaveConsumer(val -> SmallInvInit.getConfig().enabled = val));
60+
ConfigSection smallInvSection = new ConfigSection(configScreen, Text.translatable("key.lemclienthelper.smallinv"));
61+
smallInvSection.addConfigItem(new BooleanItem(Text.translatable("key.lemclienthelper.smallinv.enabled"), SmallInvInit.getConfig().enabled, true).setSaveConsumer(val -> SmallInvInit.getConfig().enabled = val));
6462

6563
return configScreen;
6664
};
@@ -70,7 +68,7 @@ public void addPacksToSub(SubItem<?> sub) {
7068
if (ResourcePreloader.allPacks != null && ResourcePreloader.allPacks.packs.size() > 0) {
7169
sub.clearConfigItems();
7270
ResourcePreloader.allPacks.packs.forEach(rpOption -> {
73-
sub.addConfigItem(new RPDownloadItem(rpOption).setToolTip(new LiteralText(rpOption.url)));
71+
sub.addConfigItem(new RPDownloadItem(rpOption).setToolTip(Text.literal(rpOption.url)));
7472
});
7573
}
7674
}
@@ -79,7 +77,7 @@ public static class RPDownloadItem extends ConfigItem<Object> {
7977
private final AllPacks.RPOption rpOption;
8078

8179
public RPDownloadItem(AllPacks.RPOption option) {
82-
super(new LiteralText(option.packname), null, null);
80+
super(Text.literal(option.packname), null, null);
8381
this.rpOption = option;
8482
}
8583

@@ -98,7 +96,7 @@ public void render(MatrixStack matrices, int x, int y, int mouseX, int mouseY, f
9896
Screen.drawCenteredText(matrices, textRenderer, progressListener.title, titleX, y, 16777215);
9997

10098
if (rpOption.progressListener.task != null) {
101-
Text task = (new LiteralText("")).append(progressListener.task).append(" " + progressListener.progress + "%");
99+
Text task = (Text.literal("")).append(progressListener.task).append(" " + progressListener.progress + "%");
102100
Screen.drawCenteredText(matrices, textRenderer, task, titleX, y + 10, 16777215);
103101
}
104102
}

‎src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/MidnightControlsMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Mixin(InputHandlers.class)
1414
public class MidnightControlsMixin {
1515

16-
@Inject(method = "lambda$handleInventorySlotPad$5", at = @At(value = "HEAD"), cancellable = true)
16+
@Inject(method = "lambda$handleInventorySlotPad$16", at = @At(value = "HEAD"), cancellable = true)
1717
private static void skipDisabledSlots(int guiLeft, int guiTop, double mouseX, double mouseY, Slot mouseSlot, int direction, Pair<Slot, Double> entry, CallbackInfoReturnable<Boolean> cir) {
1818
if (!entry.key.isEnabled()) cir.setReturnValue(false);
1919
}

0 commit comments

Comments
 (0)