Skip to content

Commit

Permalink
fix dev env
Browse files Browse the repository at this point in the history
  • Loading branch information
Uraneptus committed Sep 9, 2024
1 parent c0ca765 commit bd9889b
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 16 deletions.
11 changes: 7 additions & 4 deletions Fabric/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.13.9'
id 'fabric-loom' version '1.3.8'
}

version = "${mc_version}-${build_number}-FABRIC"
Expand Down Expand Up @@ -29,10 +29,13 @@ repositories {

dependencies {
minecraft "com.mojang:minecraft:${mc_version}"
mappings loom.officialMojangMappings()
mappings loom.layered() {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-1.20.1:2023.09.03@zip")
}

modImplementation "net.fabricmc:fabric-loader:0.14.21"
modImplementation "net.fabricmc.fabric-api:fabric-api:0.83.0+1.20"
modImplementation "net.fabricmc:fabric-loader:0.15.6"
modImplementation "net.fabricmc.fabric-api:fabric-api:0.92.1+1.20.1"

compileOnly project(":Xplat")

Expand Down
4 changes: 2 additions & 2 deletions Forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:6.0.6'
classpath 'org.spongepowered:mixingradle:0.7.33'
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.25'
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
}
}

Expand Down
8 changes: 2 additions & 6 deletions Xplat/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
plugins {
id('java')
// Unfortunately, VG has not published a new non-SNAPSHOT version since 2021.
// This may break if this snapshot gets garbage-collected. In that case, visit
// https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/vanillagradle/
// (or wherever their maven is now) and pick another snapshot version.
id('org.spongepowered.gradle.vanilla') version '0.2.1-20230603.203956-54'
id('agency.highlysuspect.minivan') version '0.5'
}

archivesBaseName = "${project.mod_name}-xplat"
version = "${project.mc_version}-${project.build_number}"

minecraft {
minivan {
version(project.mc_version)
accessWideners 'src/main/resources/neat_xplat.accesswidener'
}
Expand Down
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ subprojects {

repositories {
mavenCentral()

maven {
name = 'Sponge / Mixin'
url = 'https://repo.spongepowered.org/repository/maven-public/'
}
}

tasks.withType(JavaCompile).configureEach {
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ org.gradle.jvmargs=-Xmx1G \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

group=vazkii.neat
forge_version=46.0.2
forge_version=47.1.3
mod_id=neat
build_number=36
build_number=37
mod_name=Neat
mc_version=1.20
mc_version=1.20.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-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
17 changes: 17 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
pluginManagement {
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
maven {
name = 'Sponge Snapshots'
url = 'https://repo.spongepowered.org/repository/maven-public/'
}
maven {
name = 'Sleeping Town'
url = 'https://repo.sleeping.town/'
content {
includeGroup 'agency.highlysuspect'
includeGroup 'agency.highlysuspect.minivan'
}
}
gradlePluginPortal()
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}

rootProject.name = 'Neat'
include("Xplat", "Fabric", "Forge")

0 comments on commit bd9889b

Please sign in to comment.