Update to 1.19.3
This commit is contained in:
parent
01221ca98a
commit
a8fa45837b
|
@ -10,5 +10,5 @@ dependencies {
|
||||||
include(modImplementation(fabricApi.module("fabric-resource-loader-v0", prop("fabric_version")))!!)
|
include(modImplementation(fabricApi.module("fabric-resource-loader-v0", prop("fabric_version")))!!)
|
||||||
|
|
||||||
// Dev env
|
// Dev env
|
||||||
modLocalRuntime("com.terraformersmc:modmenu:4.1.1")
|
modLocalRuntime("com.terraformersmc:modmenu:5.0.0-alpha.4")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# https://fabricmc.net/develop
|
# https://fabricmc.net/develop
|
||||||
minecraft_version=1.19.2
|
minecraft_version=1.19.3
|
||||||
yarn_mappings=build.24
|
yarn_mappings=build.2
|
||||||
loader_version=0.14.11
|
loader_version=0.14.11
|
||||||
|
|
||||||
maven_group=io.gitlab.jfronny
|
maven_group=io.gitlab.jfronny
|
||||||
|
@ -8,5 +8,5 @@ archives_base_name=resclone
|
||||||
|
|
||||||
modrinth_id=resclone
|
modrinth_id=resclone
|
||||||
|
|
||||||
fabric_version=0.68.0+1.19.2
|
fabric_version=0.68.1+1.19.3
|
||||||
libjf_version=3.2.1
|
libjf_version=3.3.1
|
|
@ -12,7 +12,7 @@ public class RescloneResourcePack extends ZipResourcePack implements ModResource
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
public RescloneResourcePack(File file, String name) {
|
public RescloneResourcePack(File file, String name) {
|
||||||
super(file);
|
super(name, file, true);
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,8 @@ package io.gitlab.jfronny.resclone.mixin;
|
||||||
import io.gitlab.jfronny.resclone.Resclone;
|
import io.gitlab.jfronny.resclone.Resclone;
|
||||||
import io.gitlab.jfronny.resclone.RescloneResourcePack;
|
import io.gitlab.jfronny.resclone.RescloneResourcePack;
|
||||||
import io.gitlab.jfronny.resclone.data.PackMetaLoaded;
|
import io.gitlab.jfronny.resclone.data.PackMetaLoaded;
|
||||||
import net.minecraft.resource.FileResourcePackProvider;
|
import net.minecraft.resource.*;
|
||||||
import net.minecraft.resource.ResourcePackProfile;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.resource.ResourcePackSource;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
@ -18,17 +17,19 @@ import java.util.function.Consumer;
|
||||||
@Mixin(FileResourcePackProvider.class)
|
@Mixin(FileResourcePackProvider.class)
|
||||||
public class FileResourcePackProviderMixin {
|
public class FileResourcePackProviderMixin {
|
||||||
@Shadow @Final private ResourcePackSource source;
|
@Shadow @Final private ResourcePackSource source;
|
||||||
|
@Shadow @Final private ResourceType type;
|
||||||
|
|
||||||
@Inject(at = @At("TAIL"), method = "register(Ljava/util/function/Consumer;Lnet/minecraft/resource/ResourcePackProfile$Factory;)V")
|
@Inject(at = @At("TAIL"), method = "register(Ljava/util/function/Consumer;)V")
|
||||||
public void registerExtra(Consumer<ResourcePackProfile> consumer, ResourcePackProfile.Factory factory, CallbackInfo info) {
|
public void registerExtra(Consumer<ResourcePackProfile> consumer, CallbackInfo info) {
|
||||||
for (PackMetaLoaded meta : Resclone.DOWNLOADED_PACKS) {
|
for (PackMetaLoaded meta : Resclone.DOWNLOADED_PACKS) {
|
||||||
ResourcePackProfile resourcePackProfile = ResourcePackProfile.of(
|
ResourcePackProfile resourcePackProfile = ResourcePackProfile.create(
|
||||||
"resclone/" + meta.name(),
|
"resclone/" + meta.name(),
|
||||||
|
Text.literal(meta.name()),
|
||||||
meta.forceEnable(),
|
meta.forceEnable(),
|
||||||
() -> new RescloneResourcePack(meta.zipPath().toFile(), meta.name()),
|
name -> new RescloneResourcePack(meta.zipPath().toFile(), meta.name()),
|
||||||
factory,
|
type,
|
||||||
ResourcePackProfile.InsertionPosition.TOP,
|
ResourcePackProfile.InsertionPosition.TOP,
|
||||||
this.source
|
source
|
||||||
);
|
);
|
||||||
if (resourcePackProfile != null) {
|
if (resourcePackProfile != null) {
|
||||||
consumer.accept(resourcePackProfile);
|
consumer.accept(resourcePackProfile);
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"id": "resclone",
|
"id": "resclone",
|
||||||
"name": "Resclone",
|
"name": "Resclone",
|
||||||
"version": "${version}",
|
"version": "${version}",
|
||||||
"description": "Downloads and updates resourcepacks",
|
"description": "Downloads and updates resource packs",
|
||||||
"authors": ["JFronny"],
|
"authors": ["JFronny"],
|
||||||
"contact": {
|
"contact": {
|
||||||
"email": "projects.contact@frohnmeyer-wds.de",
|
"email": "projects.contact@frohnmeyer-wds.de",
|
||||||
|
|
Loading…
Reference in New Issue