Skip to content

Commit

Permalink
Merge pull request #5 from QuantumXenon/1.19.x
Browse files Browse the repository at this point in the history
Updated to 1.19 thanks to QuantumXenon
  • Loading branch information
latokike authored Sep 17, 2022
2 parents 38f3d1e + ec10e32 commit 4820e33
Show file tree
Hide file tree
Showing 40 changed files with 569 additions and 1,096 deletions.
25 changes: 25 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# eclipse
bin
*.launch
.settings
.metadata
.classpath
.project

# idea
out
*.ipr
*.iws
*.iml
.idea

# gradle
build
.gradle

# other
eclipse
run

*.un~
libs
40 changes: 17 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.10-SNAPSHOT'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -11,12 +11,6 @@ version = project.mod_version
group = project.maven_group

repositories {
maven {
url = 'https://maven.cafeteria.dev'
content {
includeGroup 'net.adriantodt.fabricmc'
}
}
maven {
name "cloth config"
url "https://maven.shedaniel.me/"
Expand All @@ -40,35 +34,35 @@ repositories {
}

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "com.github.apace100:origins-fabric:${project.origins_version}"
modImplementation("com.github.virtuoel:pehkui:${project.pehkui_version}") {
minecraft "com.mojang:minecraft:${minecraft_version}"
mappings "net.fabricmc:yarn:${yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${loader_version}"

modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
modImplementation "com.github.apace100:origins-fabric:${origins_version}"
modImplementation("com.github.virtuoel:pehkui:${pehkui_version}") {
exclude(group: "net.fabricmc.fabric-api")
}
}

processResources {
inputs.property "version", project.version

duplicatesStrategy = DuplicatesStrategy.EXCLUDE

from(sourceSets.main.resources.srcDirs) {
include "fabric.mod.json"
filesMatching("fabric.mod.json") {
expand "version": project.version
}
}

from(sourceSets.main.resources.srcDirs) {
exclude "fabric.mod.json"
}
tasks.withType(JavaCompile).configureEach {
it.options.release = 17
}

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
java {
withSourcesJar()
}

jar {
from "LICENSE"
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}" }
}
}
17 changes: 10 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
org.gradle.jvmargs=-Xmx4G

# Fabric Properties
minecraft_version=1.18.1
yarn_mappings=1.18.1+build.1
loader_version=0.12.12
minecraft_version=1.19
yarn_mappings=1.19+build.4
loader_version=0.14.9

# Mod Properties
mod_version=1.18.1-0.1.1
mod_version=1.19-0.2.0
maven_group=latokike
archives_base_name=MythOrigins

# Dependencies
fabric_version=0.43.1+1.18
origins_version=1.3.1
pehkui_version=3.0.0
fabric_version=0.58.0+1.19
origins_version=1.6.2
pehkui_version=3.4.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 4820e33

Please sign in to comment.