diff --git a/build.gradle b/build.gradle index 2e17521865d..05e8103a68d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ */ plugins { - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'io.github.juuxel.loom-quiltflower' version '1.7.1' id "com.github.johnrengelman.shadow" version "7.0.0" } @@ -59,7 +59,7 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings loom.layered() { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-1.18.1:2021.12.19@zip") + parchment("org.parchmentmc.data:parchment-1.19.2:2022.11.27@zip") } modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" @@ -116,9 +116,15 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}") - include modImplementation("teamreborn:energy:${project.tr_energy_version}") { - exclude group: "net.fabricmc.fabric-api" + + // Create - dependencies are added transitively + modCompileOnly("com.simibubi.create:create-fabric-1.19.2:0.5.0f-776") { + exclude group: "net.fabricmc.fabric-api" + exclude group: "dev.onyxstudios.cardinal-components-api" + exclude group: "dev.cafeteria" } + modLocalRuntime("maven.modrinth:lazydfu:0.1.3") + modLocalRuntime("com.terraformersmc:modmenu:4.2.0-beta.2") internal 'com.google.code.findbugs:jsr305:3.0.2' @@ -191,6 +197,17 @@ allprojects { includeGroup "curse.maven" } } + maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI + maven { url = "https://dvs1.progwml6.com/files/maven/" } // JEI + maven { url = "https://maven.parchmentmc.org" } // Parchment mappings + maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings + maven { url = "https://api.modrinth.com/maven" } // LazyDFU + maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu + maven { url = "https://mvn.devos.one/snapshots/" } // Create, Porting Lib, Forge Tags, Milk Lib, Registrate + maven { url = "https://cursemaven.com" } // Forge Config API Port + maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes + maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM + maven { url = "https://maven.tterrag.com/" } // Flywheel } // ensure everything uses UTF-8 and not some random codepage chosen by gradle @@ -242,9 +259,9 @@ sourceSets { main { compileClasspath += sourceSets.portaforgy.output runtimeClasspath += sourceSets.portaforgy.output - resources { - srcDir 'src/generated/resources' - } + resources.srcDirs += 'src/generated/resources' + java.srcDirs += 'src/nsmp/java' + resources.srcDirs += 'src/nsmp/res' } test { compileClasspath += sourceSets.portaforgy.output diff --git a/gradle.properties b/gradle.properties index 7212ee88334..0ec76f27523 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ version_major=0 version_minor=0 -version_patch=0 +version_patch=1 artifact_group=appeng -artifact_basename=appliedenergistics2-fabric +artifact_basename=nsmp-ae2 ######################################################### # Minecraft Versions # @@ -22,7 +22,6 @@ fabric_version=0.66.0+1.19.2 rei_version=9.1.530 wthit_version=5.9.0 jade_file_id=3903505 -tr_energy_version=2.0.0-beta1 no_indium_version=1.1.0+1.19 # Set to rei or jei to pick which tooltip mod gets picked at runtime @@ -31,7 +30,7 @@ runtime_itemlist_mod=rei # Set to wthit or jade to pick which tooltip mod gets picked at runtime # for the dev environment. -runtime_tooltip_mod=jade +runtime_tooltip_mod=wthit ######################################################### # Third party dependencies @@ -39,11 +38,6 @@ runtime_tooltip_mod=jade snakeyaml_version=1.33 directory_watcher_version=0.17.1 -######################################################### -# Deployment # -######################################################### -curseforge_project=223794 - ######################################################### # Gradle # ######################################################### diff --git a/src/main/java/appeng/api/behaviors/package-info.java b/src/main/java/appeng/api/behaviors/package-info.java index 21c63c33f3f..73f2e8afd41 100644 --- a/src/main/java/appeng/api/behaviors/package-info.java +++ b/src/main/java/appeng/api/behaviors/package-info.java @@ -1,14 +1,6 @@ /** * Classes to allow addons to define behavior of AE2's own devices when they have to interact with custom key types. * - *

Part implementations

- * - * *

Working with inventories

*