Update deps
This commit is contained in:
parent
df80d2a152
commit
b43b6f5722
|
@ -12,6 +12,5 @@ dependencies {
|
||||||
mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
|
mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
|
||||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||||
|
|
||||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
|
||||||
modImplementation "com.terraformersmc:modmenu:2.0.0-beta.7"
|
modImplementation "com.terraformersmc:modmenu:2.0.0-beta.7"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,14 @@
|
||||||
# Done to increase the memory available to gradle.
|
# Done to increase the memory available to gradle.
|
||||||
org.gradle.jvmargs=-Xmx1G
|
org.gradle.jvmargs=-Xmx1G
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://modmuss50.me/fabric.html
|
# check these on https://fabricmc.net/versions.html
|
||||||
minecraft_version=1.17
|
minecraft_version=1.17.1
|
||||||
yarn_mappings=build.1
|
yarn_mappings=build.61
|
||||||
loader_version=0.11.3
|
loader_version=0.12.1
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=1.7.1
|
mod_version=1.7.1
|
||||||
maven_group=io.gitlab.jfronny
|
maven_group=io.gitlab.jfronny
|
||||||
archives_base_name=resclone
|
archives_base_name=resclone
|
||||||
# Dependencies
|
|
||||||
# check this on https://modmuss50.me/fabric.html
|
|
||||||
fabric_version=0.34.9+1.17
|
|
||||||
|
|
||||||
modrinth_id=kVAQyCLX
|
modrinth_id=kVAQyCLX
|
||||||
modrinth_required_dependencies=
|
modrinth_required_dependencies=
|
||||||
|
|
|
@ -11,7 +11,6 @@ import net.fabricmc.api.EnvType;
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
|
|
||||||
public class RescloneEntryDefault implements RescloneEntry {
|
public class RescloneEntryDefault implements RescloneEntry {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init(RescloneApi api) {
|
public void init(RescloneApi api) {
|
||||||
api.addFetcher(new BasicFileFetcher());
|
api.addFetcher(new BasicFileFetcher());
|
||||||
|
@ -21,5 +20,4 @@ public class RescloneEntryDefault implements RescloneEntry {
|
||||||
api.addProcessor(new PruneVanillaProcessor());
|
api.addProcessor(new PruneVanillaProcessor());
|
||||||
ConfigLoader.load(api);
|
ConfigLoader.load(api);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -17,9 +17,7 @@ import java.util.function.Consumer;
|
||||||
|
|
||||||
@Mixin(FileResourcePackProvider.class)
|
@Mixin(FileResourcePackProvider.class)
|
||||||
public class FileResourcePackProviderMixin {
|
public class FileResourcePackProviderMixin {
|
||||||
@Shadow
|
@Shadow @Final private ResourcePackSource source;
|
||||||
@Final
|
|
||||||
private ResourcePackSource field_25345;
|
|
||||||
|
|
||||||
@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;Lnet/minecraft/resource/ResourcePackProfile$Factory;)V")
|
||||||
public void registerExtra(Consumer<ResourcePackProfile> consumer, ResourcePackProfile.Factory factory, CallbackInfo info) {
|
public void registerExtra(Consumer<ResourcePackProfile> consumer, ResourcePackProfile.Factory factory, CallbackInfo info) {
|
||||||
|
@ -30,7 +28,7 @@ public class FileResourcePackProviderMixin {
|
||||||
() -> new RescloneResourcePack(meta.zipPath.toFile(), meta.name),
|
() -> new RescloneResourcePack(meta.zipPath.toFile(), meta.name),
|
||||||
factory,
|
factory,
|
||||||
ResourcePackProfile.InsertionPosition.TOP,
|
ResourcePackProfile.InsertionPosition.TOP,
|
||||||
this.field_25345
|
this.source
|
||||||
);
|
);
|
||||||
if (resourcePackProfile != null) {
|
if (resourcePackProfile != null) {
|
||||||
consumer.accept(resourcePackProfile);
|
consumer.accept(resourcePackProfile);
|
||||||
|
|
|
@ -12,7 +12,6 @@ import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class ConfigLoader {
|
public class ConfigLoader {
|
||||||
|
|
||||||
public static void load(RescloneApi api) {
|
public static void load(RescloneApi api) {
|
||||||
Path configPath = api.getConfigPath().resolve("config.json");
|
Path configPath = api.getConfigPath().resolve("config.json");
|
||||||
if (!Files.exists(configPath)) {
|
if (!Files.exists(configPath)) {
|
||||||
|
@ -43,5 +42,4 @@ public class ConfigLoader {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -23,8 +23,7 @@
|
||||||
"resclone.mixins.json"
|
"resclone.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.10.8",
|
"fabricloader": ">=0.12.0",
|
||||||
"fabric": "*",
|
|
||||||
"minecraft": "*"
|
"minecraft": "*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue