Skip to content

Commit

Permalink
Fix injection site on 1.18.2 & Bump version
Browse files Browse the repository at this point in the history
This commit breaks the mod for < 1.18.2
  • Loading branch information
ChachyDev committed Mar 4, 2022
1 parent a20e70d commit 18bc591
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ java {
withSourcesJar()
}

version = "0.2.6"
version = "0.3.0"
group = "club.chachy"

dependencies {
minecraft "com.mojang:minecraft:1.18"
mappings "net.fabricmc:yarn:1.18+build.1:v2"
minecraft "com.mojang:minecraft:1.18.2"
mappings "net.fabricmc:yarn:1.18.2+build.1:v2"
modImplementation "net.fabricmc:fabric-loader:0.12.6"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,19 @@
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.List;

@Mixin(ReloadableResourceManagerImpl.class)
public class MixinReloadableResourceManagerImpl {
@ModifyArg(
method = "reload",
at = @At(
value = "INVOKE",
target = "Lcom/google/common/collect/Lists;newArrayList(Ljava/lang/Iterable;)Ljava/util/ArrayList;",
remap = false
target = "Lnet/minecraft/resource/SimpleResourceReload;start(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Z)Lnet/minecraft/resource/ResourceReload;"
)
)
private Iterable<ResourceReloader> lazyLanguageLoader$$onReload(Iterable<ResourceReloader> reloaders) {
if (StateManager.isResourceLoadViaLanguage()) {
return StateManager.getResourceReloaders();
}

return reloaders;
private List<ResourceReloader> lazyLanguageLoader$$onReload(List<ResourceReloader> reloaders) {
return StateManager.isResourceLoadViaLanguage() ? StateManager.getResourceReloaders() : reloaders;
}

@Inject(method = "registerReloader", at = @At("HEAD"))
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"accessWidener": "lazy-language-loader.accesswidener",
"depends": {
"fabricloader": ">=0.12.3",
"minecraft": "1.18.x",
"minecraft": ">=1.18.2",
"java": ">=17"
}
}

0 comments on commit 18bc591

Please sign in to comment.