Skip to content

Commit

Permalink
Update to Minecraft 1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
Roundaround committed Jun 11, 2022
1 parent 7a186ad commit b565467
Show file tree
Hide file tree
Showing 10 changed files with 358 additions and 304 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,9 @@ bin/
# fabric

run/

# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Roundaround's Enchantment Compatibility

<img src="https://img.shields.io/badge/Loader-Fabric-%23313e51?style=for-the-badge"/>
<img src="https://img.shields.io/badge/MC-1.18.2-%23313e51?style=for-the-badge"/>
<img src="https://img.shields.io/badge/MC-1.19-%23313e51?style=for-the-badge"/>
<img src="https://img.shields.io/badge/Side-Server-%23313e51?style=for-the-badge"/>

Make many mutually-exclusive enchantments compatible.
Expand Down
182 changes: 91 additions & 91 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,91 +1,91 @@
plugins {
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

repositories {
maven {
name = "ModMenu"
url = "https://maven.terraformersmc.com/releases/"
}
maven {
name = 'Roundaround Maven'
allowInsecureProtocol = true
url = "https://maven.rnda.dev/releases"
}
}

dependencies {
// To change the versions see the gradle.properties file
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}"

// Test using real account
modImplementation "com.ptsmods:devlogin:2.1"

// ModMenu integration
modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"

// RoundaLib for config screen
modImplementation "me.roundaround:roundalib:${project.roundalib_version}"
include "me.roundaround:roundalib:${project.roundalib_version}"
}

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

filesMatching("fabric.mod.json") {
expand "version": project.version
}
}

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 17
}

java {
withSourcesJar()
}

jar {
from("LICENSE") {
rename { "${it}_${project.archives_base_name}"}
}
}

tasks.publish.dependsOn build
publishing {
publications {
mavenJava(MavenPublication) {
artifactId project.archives_base_name
version = project.mod_version + "+" + project.minecraft_version

artifact(remapJar) {
builtBy remapJar
}
}
}
repositories {
maven {
allowInsecureProtocol = true
url = "https://maven.rnda.dev/releases"
credentials {
username = selfHostedMavenUser
password = selfHostedMavenPass
}
authentication {
basic(BasicAuthentication)
}
}
}
}
plugins {
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

repositories {
maven {
name = "ModMenu"
url = "https://maven.terraformersmc.com/releases/"
}
maven {
name = 'Roundaround Maven'
allowInsecureProtocol = true
url = "https://maven.rnda.dev/releases"
}
}

dependencies {
// To change the versions see the gradle.properties file
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}"

// Test using real account
modImplementation "com.ptsmods:devlogin:2.1"

// ModMenu integration
modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"

// RoundaLib for config screen
modImplementation "me.roundaround:roundalib:${project.roundalib_version}"
include "me.roundaround:roundalib:${project.roundalib_version}"
}

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

filesMatching("fabric.mod.json") {
expand "version": project.version
}
}

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 17
}

java {
withSourcesJar()
}

jar {
from("LICENSE") {
rename { "${it}_${project.archives_base_name}"}
}
}

tasks.publish.dependsOn build
publishing {
publications {
mavenJava(MavenPublication) {
artifactId project.archives_base_name
version = project.mod_version + "+" + project.minecraft_version

artifact(remapJar) {
builtBy remapJar
}
}
}
repositories {
maven {
allowInsecureProtocol = true
url = "https://maven.rnda.dev/releases"
credentials {
username = selfHostedMavenUser
password = selfHostedMavenPass
}
authentication {
basic(BasicAuthentication)
}
}
}
}
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
org.gradle.jvmargs=-Xmx1G

# Fabric Properties
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.3
minecraft_version=1.19
yarn_mappings=1.19+build.1
loader_version=0.14.6

# Mod Properties
Expand All @@ -12,6 +12,6 @@ maven_group = me.roundaround
archives_base_name = enchantmentcompat

# Dependencies
fabric_version=0.53.0+1.18.2
mod_menu_version=3.2.2
roundalib_version=0.1.8+1.18.2
fabric_version=0.55.1+1.19
mod_menu_version=4.0.0
roundalib_version=0.1.8+1.19
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Thu May 26 00:27:06 EDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b565467

Please sign in to comment.