LibJF 2.0

This commit is contained in:
JFronny 2021-10-09 13:12:42 +02:00
parent 2608093c3f
commit 0082cb4e5c
No known key found for this signature in database
GPG Key ID: BEC5ACBBD4EE17E5
8 changed files with 229 additions and 174 deletions

View File

@ -5,6 +5,10 @@ repositories {
name = 'TerraformersMC'
url = 'https://maven.terraformersmc.com/'
}
maven {
url "https://gitlab.com/api/v4/projects/25805200/packages/maven"
}
mavenCentral()
}
dependencies {
@ -13,14 +17,13 @@ dependencies {
mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
download("https://gitlab.com/jfmods/LibJF/-/jobs/artifacts/master/raw/latest-dev.jar?job=build_test", "libjf")
include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}")
include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}")
modImplementation "com.terraformersmc:modmenu:2.0.3"
testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
testImplementation('org.junit.jupiter:junit-jupiter:5.8.1')
}
test {

View File

@ -2,15 +2,15 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.17
yarn_mappings=build.1
loader_version=0.11.3
minecraft_version=1.17.1
yarn_mappings=build.61
loader_version=0.12.1
# Mod Properties
mod_version=1.2.2
maven_group=io.gitlab.jfronny
archives_base_name=translater
# Dependencies
fabric_version=0.34.9+1.17
jfapi_version=2.0+385445857
modrinth_id=YnU8kpyc
modrinth_required_dependencies=dOW0jmMj

View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.translater;
import io.gitlab.jfronny.libjf.config.Entry;
import io.gitlab.jfronny.libjf.config.JfConfig;
import io.gitlab.jfronny.libjf.config.api.Entry;
import io.gitlab.jfronny.libjf.config.api.JfConfig;
public class Cfg implements JfConfig {
@Entry

View File

@ -1,7 +1,5 @@
package io.gitlab.jfronny.translater.mixin;
import io.gitlab.jfronny.libjf.Libjf;
import io.gitlab.jfronny.translater.Cfg;
import io.gitlab.jfronny.translater.Translater;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;

View File

@ -8,7 +8,7 @@ import net.minecraft.client.font.FontStorage;
import net.minecraft.client.font.FontType;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.screen.Overlay;
import net.minecraft.client.gui.screen.SplashScreen;
import net.minecraft.client.gui.screen.SplashOverlay;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Final;
@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Collections;
@Mixin(SplashScreen.class)
@Mixin(SplashOverlay.class)
public abstract class SplashScreenMixin extends Overlay {
@Shadow
@Final

View File

@ -1,6 +1,6 @@
package io.gitlab.jfronny.translater.transformer;
import io.gitlab.jfronny.libjf.Libjf;
import io.gitlab.jfronny.libjf.config.impl.ConfigHolder;
import io.gitlab.jfronny.translater.Cfg;
import io.gitlab.jfronny.translater.Translater;
import net.fabricmc.loader.api.FabricLoader;
@ -38,7 +38,7 @@ public class CachingTransformer implements ITransformer {
cache = new Properties();
if (Cfg.forceRegenerate) {
Cfg.forceRegenerate = false;
Libjf.getConfigs().get(Translater.MOD_ID).write();
ConfigHolder.getConfigs().get(Translater.MOD_ID).write();
} else {
//Load cache
if (Files.exists(cacheFile) && Files.isRegularFile(cacheFile)) {

View File

@ -22,9 +22,8 @@
],
"depends": {
"fabricloader": ">=0.9.0+build.204",
"fabric": "*",
"minecraft": "*",
"libjf": ">=1.2.0"
"libjf-config-v0": ">=2.0"
},
"custom": {
"modupdater": {

File diff suppressed because it is too large Load Diff