Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lklkl #4

Open
wants to merge 3 commits into
base: vicu”
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
buildscript {
repositories {
jcenter()
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
mavenCentral()
maven {
name = "Jitpack"
url 'https://jitpack.io/'
}
}
dependencies {
classpath "net.fabricmc:fabric-loom:0.12-SNAPSHOT"
classpath "net.fabricmc:fabric-loom:0.2.6-SNAPSHOT"
}
}

plugins {
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}
apply plugin: net.fabricmc.loom.LoomGradlePlugin
apply plugin: 'maven-publish'

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -29,18 +23,30 @@ group = project.maven_group

repositories {
mavenCentral()
maven {
name "Modmuss50 Repository"
url 'https://maven.fabricmc.net/'
}
maven { url 'https://jitpack.io' }
}

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modCompile "com.github.modmuss50:Fabric-ASM:${project.fabric_asm_version}"
include "com.github.modmuss50:Fabric-ASM:${project.fabric_asm_version}"

modImplementation "com.github.Chocohead:Fabric-ASM:${project.fabric_asm_version}"
include "com.github.Chocohead:Fabric-ASM:${project.fabric_asm_version}"
//Used to handle the zip processing
compile "org.zeroturnaround:zt-zip:${project.zt_zip_version}"
include "org.zeroturnaround:zt-zip:${project.zt_zip_version}"

//Required for zt-zip, kinda annoying
include "org.slf4j:slf4j-simple:${project.slf4j_version}"
include "org.slf4j:slf4j-api:${project.slf4j_version}"
}

task unzip(type: Copy) {
Expand All @@ -58,9 +64,14 @@ task unzip(type: Copy) {
processResources {
inputs.property "version", project.version

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

from(sourceSets.main.resources.srcDirs) {
exclude "fabric.mod.json"
}
}

// ensure that the encoding is set to UTF-8, no matter what the system default is
Expand Down
12 changes: 7 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
org.gradle.jvmargs=-Xmx1G

minecraft_version=1.14.4
yarn_mappings=1.14.4+build.18
loader_version=0.14.8
yarn_mappings=1.14.4+build.15
loader_version=0.7.0+build.171

fabric_version=0.28.5+1.14
fabric_asm_version=v2.3
fabric_version=0.4.2+build.246-1.14
fabric_asm_version=b97939c03a
zt_zip_version=1.13
slf4j_version=1.7.29

mod_version = 0.8.0
mod_version = 0.7.1
maven_group = me.modmuss50
archives_base_name = optifabric
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading