Skip to content

Commit 07a5a91

Browse files
ChachyDevChachyDev
committed
fix: support for 1.20
1 parent e8f6265 commit 07a5a91

File tree

13 files changed

+29
-30
lines changed

13 files changed

+29
-30
lines changed

‎build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ java {
1010
withSourcesJar()
1111
}
1212

13-
version = "0.3.2"
14-
group = "club.chachy"
13+
version = "0.3.3"
14+
group = "dev.chachy"
1515

1616
dependencies {
17-
minecraft "com.mojang:minecraft:1.19.4"
18-
mappings "net.fabricmc:yarn:1.19.4+build.1:v2"
19-
modImplementation "net.fabricmc:fabric-loader:0.14.17"
17+
minecraft "com.mojang:minecraft:1.20"
18+
mappings "net.fabricmc:yarn:1.20+build.1:v2"
19+
modImplementation "net.fabricmc:fabric-loader:0.14.21"
2020
}
2121

2222
processResources {
@@ -29,7 +29,7 @@ processResources {
2929

3030
tasks.withType(JavaCompile).configureEach {
3131
it.options.encoding = "UTF-8"
32-
it.options.release = 17
32+
it.options.release.set(17)
3333
}
3434

3535
jar {

‎src/main/java/club/chachy/lazylanguageloader/client/LazyLanguageLoaderMod.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/LazyLanguageLoaderMod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package club.chachy.lazylanguageloader.client;
1+
package dev.chachy.lazylanguageloader.client;
22

33
import net.fabricmc.api.ClientModInitializer;
44

‎src/main/java/club/chachy/lazylanguageloader/client/api/scroll/Scrollable.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/api/scroll/Scrollable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package club.chachy.lazylanguageloader.client.api.scroll;
1+
package dev.chachy.lazylanguageloader.client.api.scroll;
22

33
public interface Scrollable {
44
boolean hasScrolled();

‎src/main/java/club/chachy/lazylanguageloader/client/impl/state/StateManager.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/impl/state/StateManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package club.chachy.lazylanguageloader.client.impl.state;
1+
package dev.chachy.lazylanguageloader.client.impl.state;
22

33
import net.minecraft.resource.ResourceReloader;
44
import net.minecraft.text.Text;

‎src/main/java/club/chachy/lazylanguageloader/client/impl/utils/Constants.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/impl/utils/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package club.chachy.lazylanguageloader.client.impl.utils;
1+
package dev.chachy.lazylanguageloader.client.impl.utils;
22

33
public class Constants {
44
public static final String SUGGESTION_TEXT = "Search for a language";

‎src/main/java/club/chachy/lazylanguageloader/client/mixin/optimizations/loading/MixinLanguageOptionsScreen.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/mixin/optimizations/loading/MixinLanguageOptionsScreen.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package club.chachy.lazylanguageloader.client.mixin.optimizations.loading;
1+
package dev.chachy.lazylanguageloader.client.mixin.optimizations.loading;
22

3-
import club.chachy.lazylanguageloader.client.impl.state.StateManager;
3+
import dev.chachy.lazylanguageloader.client.impl.state.StateManager;
44
import net.minecraft.client.gui.screen.option.LanguageOptionsScreen;
5-
import net.minecraft.client.gui.widget.ButtonWidget;
65
import org.spongepowered.asm.mixin.Mixin;
76
import org.spongepowered.asm.mixin.injection.At;
87
import org.spongepowered.asm.mixin.injection.Inject;
@@ -11,27 +10,27 @@
1110
@Mixin(LanguageOptionsScreen.class)
1211
public class MixinLanguageOptionsScreen {
1312
@Inject(
14-
method = "method_19820",
13+
method = "onDone",
1514
at = @At(
1615
value = "INVOKE",
1716
target = "Lnet/minecraft/client/MinecraftClient;reloadResources()Ljava/util/concurrent/CompletableFuture;",
1817
ordinal = 0
1918
)
2019
)
21-
private void lazyLanguageLoader$$preResourceLoad(ButtonWidget widget, CallbackInfo info) {
20+
private void lazyLanguageLoader$$preResourceLoad(CallbackInfo info) {
2221
StateManager.setResourceLoadViaLanguage(true);
2322
}
2423

2524
@Inject(
26-
method = "method_19820",
25+
method = "onDone",
2726
at = @At(
2827
value = "INVOKE",
2928
target = "Lnet/minecraft/client/MinecraftClient;reloadResources()Ljava/util/concurrent/CompletableFuture;",
3029
ordinal = 0,
3130
shift = At.Shift.AFTER
3231
)
3332
)
34-
private void lazyLanguageLoader$$postResourceLoad(ButtonWidget widget, CallbackInfo info) {
33+
private void lazyLanguageLoader$$postResourceLoad(CallbackInfo info) {
3534
StateManager.setResourceLoadViaLanguage(false);
3635
}
3736
}

‎src/main/java/club/chachy/lazylanguageloader/client/mixin/optimizations/loading/MixinReloadableResourceManagerImpl.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/mixin/optimizations/loading/MixinReloadableResourceManagerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package club.chachy.lazylanguageloader.client.mixin.optimizations.loading;
1+
package dev.chachy.lazylanguageloader.client.mixin.optimizations.loading;
22

3-
import club.chachy.lazylanguageloader.client.impl.state.StateManager;
3+
import dev.chachy.lazylanguageloader.client.impl.state.StateManager;
44
import net.minecraft.client.resource.language.LanguageManager;
55
import net.minecraft.client.search.SearchManager;
66
import net.minecraft.resource.ReloadableResourceManagerImpl;

‎src/main/java/club/chachy/lazylanguageloader/client/mixin/optimizations/splash/MixinMinecraftClient.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/mixin/optimizations/splash/MixinMinecraftClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package club.chachy.lazylanguageloader.client.mixin.optimizations.splash;
1+
package dev.chachy.lazylanguageloader.client.mixin.optimizations.splash;
22

33
import net.minecraft.client.MinecraftClient;
44
import net.minecraft.client.gui.screen.Overlay;

‎src/main/java/club/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinEntryListWidget.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinEntryListWidget.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package club.chachy.lazylanguageloader.client.mixin.ui.searchbar;
1+
package dev.chachy.lazylanguageloader.client.mixin.ui.searchbar;
22

3-
import club.chachy.lazylanguageloader.client.api.scroll.Scrollable;
3+
import dev.chachy.lazylanguageloader.client.api.scroll.Scrollable;
44
import net.minecraft.client.gui.widget.EntryListWidget;
55
import org.spongepowered.asm.mixin.Mixin;
66
import org.spongepowered.asm.mixin.injection.At;

‎src/main/java/club/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinLanguageOptionsScreen.java renamed to ‎src/main/java/dev/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinLanguageOptionsScreen.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package club.chachy.lazylanguageloader.client.mixin.ui.searchbar;
1+
package dev.chachy.lazylanguageloader.client.mixin.ui.searchbar;
22

3-
import club.chachy.lazylanguageloader.client.api.scroll.Scrollable;
4-
import club.chachy.lazylanguageloader.client.impl.state.StateManager;
5-
import club.chachy.lazylanguageloader.client.impl.utils.Constants;
6-
import club.chachy.lazylanguageloader.client.mixin.ui.searchbar.accessor.LanguageEntryAccessor;
3+
import dev.chachy.lazylanguageloader.client.api.scroll.Scrollable;
4+
import dev.chachy.lazylanguageloader.client.impl.state.StateManager;
5+
import dev.chachy.lazylanguageloader.client.impl.utils.Constants;
6+
import dev.chachy.lazylanguageloader.client.mixin.ui.searchbar.accessor.LanguageEntryAccessor;
77
import net.minecraft.client.gui.screen.Screen;
88
import net.minecraft.client.gui.screen.option.LanguageOptionsScreen;
99
import net.minecraft.client.gui.widget.ClickableWidget;

0 commit comments

Comments
 (0)