Skip to content

Commit

Permalink
0.1.2+1.18.1
Browse files Browse the repository at this point in the history
  • Loading branch information
EnnuiL committed Jan 5, 2022
1 parent 767d696 commit e05237c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 28 deletions.
25 changes: 11 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
plugins {
id 'fabric-loom' version '0.9-SNAPSHOT'
id 'io.github.juuxel.loom-quiltflower' version '1.3.0'
id 'fabric-loom' version '0.10-SNAPSHOT'
id 'io.github.juuxel.loom-quiltflower-mini' version '1.2.1'
id 'org.quiltmc.quilt-mappings-on-loom' version '3.1.2'
id 'maven-publish'
}

// Visual Studio Code completely ignores options.release.
// So, we still have those two.
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = System.env.GITHUB_ACTIONS == "true"
Expand All @@ -23,7 +24,9 @@ repositories {
dependencies {
// To change the versions, see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "org.quiltmc:yarn:${project.yarn_mappings}:v2"
mappings loom.layered {
addLayer quiltMappings.mappings("org.quiltmc:quilt-mappings:${project.mappings_version}:v2")
}
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
Expand All @@ -45,8 +48,8 @@ tasks.withType(JavaCompile).configureEach {
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"

// Minecraft 1.17 (21w19a) upwards uses Java 16.
it.options.release = 16
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17
}

java {
Expand All @@ -64,13 +67,7 @@ jar {
publishing {
publications {
mavenJava(MavenPublication) {
// Add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
}
artifact(sourcesJar) {
builtBy remapSourcesJar
}
from components.java
}
}

Expand Down
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs = -XX:+UseZGC -Xmx1G
org.gradle.jvmargs = -Xmx1G

# Fabric Properties, check these on https://fabricmc.net/versions.html
minecraft_version = 1.17.1
yarn_mappings = 1.17.1+build.3
loader_version = 0.11.6
# Fabric Properties, check these on https://github.com/QuiltMC/quilt-mappings/tags
minecraft_version = 1.18.1
mappings_version = 1.18.1+build.5
loader_version = 0.12.12

# Mod Properties
mod_version = 0.1.1+1.17.1
mod_version = 0.1.2+1.18.1
maven_group = io.github.ennuil
archives_base_name = boringdefaultgamerules

# Dependencies
fabric_version = 0.40.0+1.17
modmenu_version = 2.0.4
# Dependencies, check Fabric API's version on https://fabricmc.net/versions.html
fabric_version = 0.45.1+1.18
modmenu_version = 3.0.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 5 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
before_install:
- export SDKMAN_DIR="/home/jitpack/sdkman" && curl -s "https://get.sdkman.io" | bash
- source "/home/jitpack/sdkman/bin/sdkman-init.sh"
- sdk install java 17.0.1-tem
- sdk use java 17.0.1-tem
4 changes: 4 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ pluginManagement {
name = 'Cotton'
url = 'https://server.bbkr.space/artifactory/libs-release/'
}
maven {
name = 'Quilt'
url = 'https://maven.quiltmc.org/repository/release'
}
gradlePluginPortal()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
import net.minecraft.world.GameRules;

public class BoringDefaultGameRulesConfig {
public static Path SCHEMA_DIRECTORY_PATH = FabricLoader.getInstance().getConfigDir().resolve("schema");
public static Path SCHEMA_PATH = SCHEMA_DIRECTORY_PATH.resolve("boringdefaultgamerules.schema.json");
public static Path CONFIG_PATH = FabricLoader.getInstance().getConfigDir().resolve("boringdefaultgamerules.json");
public static final Path SCHEMA_DIRECTORY_PATH = FabricLoader.getInstance().getConfigDir().resolve("schema");
public static final Path SCHEMA_PATH = SCHEMA_DIRECTORY_PATH.resolve("boringdefaultgamerules.schema.json");
public static final Path CONFIG_PATH = FabricLoader.getInstance().getConfigDir().resolve("boringdefaultgamerules.json");

private static JsonObject defaultGameRulesProperties;
private static String newSchemaHash = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
import org.apache.logging.log4j.Logger;

public class LoggingUtils {
public static final Logger modLogger = LogManager.getFormatterLogger("Boring Default Game Rules");
public static final Logger modLogger = LogManager.getLogger("Boring Default Game Rules");
}

0 comments on commit e05237c

Please sign in to comment.