JfMods/LibJF
JfMods/LibJF
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update yarn

Browse Source
This commit is contained in:
JFronny 2021-08-21 19:35:20 +02:00
parent 001f639825
commit 187ce56f3e
No known key found for this signature in database
GPG Key ID: BEC5ACBBD4EE17E5
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -1,7 +1,10 @@
apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle" apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
repositories { repositories {
maven { url = 'https://raw.githubusercontent.com/TerraformersMC/Archive/main/releases/'; name = "ModMenu" } maven {
name = 'TerraformersMC'
url = 'https://maven.terraformersmc.com/'
}
} }
sourceSets { sourceSets {
@ -17,8 +20,8 @@ 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}"
include modImplementation(fabricApi.module("fabric-tag-extensions-v0", "0.37.0+1.17")) include modImplementation(fabricApi.module("fabric-tag-extensions-v0", "0.38.1+1.17"))
modImplementation "com.terraformersmc:modmenu:2.0.2" modImplementation "com.terraformersmc:modmenu:2.0.5"
} }
loom { loom {

2
gradle.properties
View File

@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.17.1 minecraft_version=1.17.1
yarn_mappings=build.1 yarn_mappings=build.40
loader_version=0.11.6 loader_version=0.11.6
# Mod Properties # Mod Properties
mod_version=1.2.0 mod_version=1.2.0

4
src/main/java/io/gitlab/jfronny/libjf/Libjf.java
View File

@ -4,11 +4,7 @@ import com.google.common.collect.ImmutableMap;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import io.gitlab.jfronny.libjf.config.Config; import io.gitlab.jfronny.libjf.config.Config;
import io.gitlab.jfronny.libjf.config.JfConfig;
import io.gitlab.jfronny.libjf.gson.HiddenAnnotationExclusionStrategy; import io.gitlab.jfronny.libjf.gson.HiddenAnnotationExclusionStrategy;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;

6
src/main/java/io/gitlab/jfronny/libjf/config/gui/TinyConfigScreen.java
View File

@ -69,7 +69,7 @@ public class TinyConfigScreen extends Screen {
} }
} }
} }
Objects.requireNonNull(client).openScreen(parent); Objects.requireNonNull(client).setScreen(parent);
})); }));
ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> { ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
@ -78,7 +78,7 @@ public class TinyConfigScreen extends Screen {
info.field.set(null, info.value); info.field.set(null, info.value);
} catch (IllegalAccessException ignored) {} } catch (IllegalAccessException ignored) {}
config.write(); config.write();
Objects.requireNonNull(client).openScreen(parent); Objects.requireNonNull(client).setScreen(parent);
})); }));
this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25); this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
@ -89,7 +89,7 @@ public class TinyConfigScreen extends Screen {
info.value = info.defaultValue; info.value = info.defaultValue;
info.tempValue = info.value.toString(); info.tempValue = info.value.toString();
double scrollAmount = list.getScrollAmount(); double scrollAmount = list.getScrollAmount();
Objects.requireNonNull(client).openScreen(this); Objects.requireNonNull(client).setScreen(this);
list.setScrollAmount(scrollAmount); list.setScrollAmount(scrollAmount);
})); }));