diff --git a/build.gradle b/build.gradle index 5f7659ab8..ade81fd84 100644 --- a/build.gradle +++ b/build.gradle @@ -128,6 +128,18 @@ dependencies { jar { zip64 true + manifest { + attributes([ + 'Specification-Title' : mod_id, + 'Specification-Vendor' : "GT-Reimagined", + 'Specification-Version' : '1', // We are version 1 of ourselves + 'Implementation-Title' : "GT4 Reimagined", + 'Implementation-Version' : project.version, + 'Implementation-Vendor' : "GT-Reimagined", + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + "MixinConfigs" : "gt4r.mixins.json" + ]) + } } processResources { diff --git a/common/build.gradle b/common/build.gradle deleted file mode 100644 index 45ed8d618..000000000 --- a/common/build.gradle +++ /dev/null @@ -1,102 +0,0 @@ -plugins { - id "net.neoforged.moddev.legacyforge" - id 'xyz.wagyourtail.unimined.expect-platform' version '1.0.5' -} -archivesBaseName = "${project.archive_base_name}" - -legacyForge { - version = "${project.minecraft_version}-${project.forge_version}" - parchment { - minecraftVersion = project.minecraft_version - mappingsVersion = project.mappings_version - } - runs { - client { - client() - - } - data { - data() - } - server { - server() - } - } - mods { - "${mod_id}" { - sourceSet sourceSets.main - } - } -} - -def mainRefmapFile; - -mixin { - mainRefmapFile = add sourceSets.main, "gt4r.refmap.json" - config "gt4r.mixins.json" - config "antimatter.mixins.json" - config "antimatter-forge.mixins.json" - config "antimatter.rei.mixins.json" - config "tesseract-forge.mixins.json" -} - - -dependencies { - implementation(expectPlatform.annotationsDep) - //subprojects - implementation(project(path: ":tesseract-forge")) - compileOnly(project(path: ":tesseract-common")) - implementation(project(path: ":antimatter-common")) - //antimatter deps - implementation 'org.apache.commons:commons-collections4:4.4' - implementation("org.jetbrains:annotations:26.0.1") - //modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge:${rootProject.jei_version}") - //modRuntimeOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge:${rootProject.jei_version}") - modImplementation("mezz.jei:jei-1.18.2:9.7.2.1001") - modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${project.rei_version}") - modCompileOnly("me.shedaniel.cloth:cloth-config-forge:6.5.133") - modImplementation("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:${project.crafttweaker_version}") - modImplementation("dev.trinsdar:arrp-forge:0.6.7.1") - modImplementation("dev.trinsdar:terraform-utils-v1:3.1.5") - modImplementation("org.gt-reimagined:structurelib-forge:${project.structurelib_version}-${project.minecraft_version}") - modImplementation("com.teamresourceful.resourcefullib:resourcefullib-forge-1.18.2:${project.resourcefullib_version}") - modImplementation("maven.modrinth:carbon-config:${project.carbon_config_forge_version}") - modImplementation("dev.latvian.mods:kubejs-forge:${project.kubejs_version}") - modImplementation("dev.latvian.mods:rhino-forge:${project.rhino_version}") - modImplementation("dev.architectury:architectury-forge:${project.architectury_version}") - modRuntimeOnly("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:${project.crafttweaker_version}") - modImplementation("curse.maven:the-one-probe-245211:${project.top_forge_file}") - implementation("io.github.llamalad7:mixinextras-forge:0.4.1") - //MIXIN - if (System.getProperty('idea.sync.active') != 'true') { - annotationProcessor 'org.spongepowered:mixin:0.8.5-SNAPSHOT:processor' - } - - //gt4r deps - //minecraftRuntimeLibraries(group: 'com.github.Speiger', name: 'Primitive-Collections', version: '[0.8,0.9)') - modImplementation(jarJar("org.gt-reimagined:gtcore-forge:${project.gt_core_version}-${project.minecraft_version}")) - modRuntimeOnly(jarJar("dev.trinsdar:terraform-wood-api-v1:3.1.5")) - runtimeOnly("curse.maven:portality-291493:3840074") - runtimeOnly("curse.maven:titanium-287342:4117991") - modImplementation("curse.maven:the-one-probe-245211:${project.top_forge_file}") - modImplementation("curse.maven:ctm-267602:3933537") - modRuntimeOnly("curse.maven:worldstripper-250603:3670854") - //modImplementation("com.simibubi.create:create-${minecraft_version}:0.5.0.i-249:slim") { transitive = false } - modImplementation("com.tterrag.registrate:Registrate:MC1.18.2-1.1.3") - modImplementation("com.jozufozu.flywheel:flywheel-forge-${minecraft_version}:0.6.8.a-99") -} - -jar { - zip64 true -} - -processResources { - exclude('gtuassets1.14') - exclude('assets/gt4r/textures/old_textures') - - inputs.property "version", project.mod_version - - filesMatching("META-INF/mods.toml") { - expand "version": project.mod_version - } -} \ No newline at end of file diff --git a/common/gradle.properties b/common/gradle.properties deleted file mode 100644 index c9b295f79..000000000 --- a/common/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -mod_id=gt4r \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle deleted file mode 100644 index ccb338b91..000000000 --- a/fabric/build.gradle +++ /dev/null @@ -1,118 +0,0 @@ -import xyz.wagyourtail.unimined.expect.task.ExpectPlatformJar - -plugins { - id "fabric-loom" - id 'xyz.wagyourtail.unimined.expect-platform' version '1.0.5' -} -archivesBaseName = "${project.archive_base_name}-fabric" - -def accessWidenerFile = project(":antimatter-common").file("src/main/resources/antimatter.accesswidener") - -loom { - accessWidenerPath = accessWidenerFile - mixin { - defaultRefmapName = "gt4r.refmap.json" - } -} - -repositories { - maven { - url = uri("https://storage.googleapis.com/devan-maven/") - } -} - -dependencies{ - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.layered() { - officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip") - } - implementation(expectPlatform.annotationsDep) - modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" - modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - implementation(project(path: ":tesseract-common")) { transitive false } - implementation(project(path: ":tesseract-fabric")) { transitive false } - implementation(project(path: ":antimatter-common")) { transitive false } - implementation(project(path: ":antimatter-fabric")) { transitive false } - compileOnly(project(":common")) - modImplementation("io.github.fabricators_of_create:Porting-Lib:${rootProject.port_lib_version}-beta+1.18.2-stable"){ - exclude(group: "net.fabricmc.fabric-api") - exclude(group: "com.github.LlamaLad7") - } - modImplementation("net.feltmc:felt-recipe-api:1.0.1"){ - exclude(group: "net.fabricmc.fabric-api") - exclude(group: "com.terraformersmc") - } - modImplementation("net.feltmc:felt-player-item-api:1.1.0"){ - exclude(group: "net.fabricmc.fabric-api") - exclude(group: "com.terraformersmc") - } - modImplementation("net.feltmc:felt-enchanting-api:1.1.0") { transitive false } - modImplementation("dev.trinsdar:arrp:0.6.7") - modImplementation("org.gt-reimagined:structurelib-fabric:${project.structurelib_version}-${project.minecraft_version}") - modImplementation "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}" - modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric:${rootProject.jei_version}"){ - exclude(group: "mezz.jei", module: "jei-1.18.2-fabric-api") - } - modImplementation("teamreborn:energy:${rootProject.energy_version}") { - transitive = false - } - modRuntimeOnly("com.terraformersmc:modmenu:${rootProject.mod_menu_version}") { - exclude(group: "net.fabricmc.fabric-api") - } - modImplementation "maven.modrinth:carbon-config:${project.carbon_config_fabric_version}" - modImplementation("earth.terrarium:botarium-fabric-1.18.2:${project.botarium_version}"){ - transitive = false - } - modImplementation("com.teamresourceful.resourcefullib:resourcefullib-fabric-1.18.2:${project.resourcefullib_version}") - modRuntimeOnly("dev.latvian.mods:kubejs-fabric:${project.kubejs_version}") - - - modImplementation(include("org.gt-reimagined:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}")){ - transitive = false - } - modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:3.1.0") - modRuntimeOnly("curse.maven:energizedpower-782147:4567261") -} - -processResources { - from project(":common").sourceSets.main.resources - exclude('gtuassets1.14') - - def toReplace = [ - "version" : project.mod_version - ] - - inputs.properties toReplace - filesMatching("fabric.mod.json") { - expand toReplace - } -} - -tasks.named('compileJava', JavaCompile) { - source(project(":common").sourceSets.main.allSource) -} - -sourcesJar { - from(project(':common').sourceSets.main.allSource) -} - -tasks.create("platformJar", ExpectPlatformJar){ - platformName = "fabric" - inputFiles = sourceSets.main.output - archiveClassifier.set "dev" - remap = [ - "xyz/wagyourtail/unimined/expect/annotation/Environment": "net/fabricmc/api/Environment", - "xyz/wagyourtail/unimined/expect/annotation/Environment\$EnvType": "net/fabricmc/api/EnvType", - ] -} - -remapJar { - inputFile.set platformJar.archiveFile - dependsOn platformJar - archiveClassifier.set null -} - -jar{ - archiveClassifier.set "dev-unmapped" -} diff --git a/fabric/gradle/wrapper/gradle-wrapper.properties b/fabric/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index ffed3a254..000000000 --- a/fabric/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/fabric/run/config/fabric_loader_dependencies.json b/fabric/run/config/fabric_loader_dependencies.json deleted file mode 100644 index cd0884be5..000000000 --- a/fabric/run/config/fabric_loader_dependencies.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": 1, - "overrides": { - "forgeconfigapiport": { - "-depends": { - "com_electronwill_night-config_core": "", - "com_electronwill_night-config_toml": "" - } - } - } -} \ No newline at end of file diff --git a/fabric/src/main/java/org/gtreimagined/gt4r/client/fabric/GT4RClientInitializer.java b/fabric/src/main/java/org/gtreimagined/gt4r/client/fabric/GT4RClientInitializer.java deleted file mode 100644 index 077c49535..000000000 --- a/fabric/src/main/java/org/gtreimagined/gt4r/client/fabric/GT4RClientInitializer.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.gtreimagined.gt4r.client.fabric; - -import muramasa.antimatter.client.fabric.IAntimatterClientInitializer; -import org.gtreimagined.gt4r.proxy.ClientHandler; - -public class GT4RClientInitializer implements IAntimatterClientInitializer { - @Override - public void onInitializeClient() { - ClientHandler.setup(); - } -} diff --git a/fabric/src/main/java/org/gtreimagined/gt4r/fabric/GT4RFabricRegistrar.java b/fabric/src/main/java/org/gtreimagined/gt4r/fabric/GT4RFabricRegistrar.java deleted file mode 100644 index c71c2aad9..000000000 --- a/fabric/src/main/java/org/gtreimagined/gt4r/fabric/GT4RFabricRegistrar.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.gtreimagined.gt4r.fabric; - -import muramasa.antimatter.AntimatterMod; -import muramasa.antimatter.registration.RegistrationEvent; -import muramasa.antimatter.registration.Side; -import org.gtreimagined.gt4r.GT4RRef; - -public class GT4RFabricRegistrar extends AntimatterMod { - - @Override - public String getId() { - return GT4RRef.ID + "_fabric"; - } - - @Override - public void onRegistrationEvent(RegistrationEvent event, Side side) { - } - - @Override - public int getPriority() { - return 700; - } -} diff --git a/fabric/src/main/java/org/gtreimagined/gt4r/fabric/GT4ReimaginedFabric.java b/fabric/src/main/java/org/gtreimagined/gt4r/fabric/GT4ReimaginedFabric.java deleted file mode 100644 index 682fbed57..000000000 --- a/fabric/src/main/java/org/gtreimagined/gt4r/fabric/GT4ReimaginedFabric.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.gtreimagined.gt4r.fabric; - -import muramasa.antimatter.AntimatterAPI; -import muramasa.antimatter.event.fabric.CraftingEvents; -import muramasa.antimatter.event.fabric.LoaderEvents; -import muramasa.antimatter.event.fabric.ProviderEvents; -import muramasa.antimatter.event.fabric.WorldGenEvents; -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.player.UseBlockCallback; -import net.minecraft.world.InteractionResult; -import org.gtreimagined.gt4r.events.AntimatterEvents; -import org.gtreimagined.gt4r.events.CommonEvents; - -public class GT4ReimaginedFabric implements ModInitializer { - @Override - public void onInitialize() { - WorldGenEvents.WORLD_GEN.register(AntimatterEvents::registerWorldgen); - LoaderEvents.LOADER.register(AntimatterEvents::registerRecipeLoaders); - CraftingEvents.CRAFTING.register(AntimatterEvents::registerCraftingLoaders); - ProviderEvents.PROVIDERS.register(AntimatterEvents::onProviders); - UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> { - CommonEvents.onRightlickBlock(player, hand, AntimatterAPI.getSIDE().isServer()); - return InteractionResult.PASS; - }); - } -} diff --git a/fabric/src/main/resources/data/minecraft/recipes/golden_axe.json b/fabric/src/main/resources/data/minecraft/recipes/golden_axe.json deleted file mode 100644 index 581c16ac6..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/golden_axe.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "PIH", - "PR ", - "FR " - ], - "key": { - "P": { - "tag": "c:plates/gold" - }, - "I": { - "tag": "c:ingots/gold" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:golden_axe" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/golden_hoe.json b/fabric/src/main/resources/data/minecraft/recipes/golden_hoe.json deleted file mode 100644 index b32e753b2..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/golden_hoe.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "PIH", - "FR ", - " R " - ], - "key": { - "P": { - "tag": "c:plates/gold" - }, - "I": { - "tag": "c:ingots/gold" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:golden_hoe" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/golden_pickaxe.json b/fabric/src/main/resources/data/minecraft/recipes/golden_pickaxe.json deleted file mode 100644 index 6551250d9..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/golden_pickaxe.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "PII", - "FRH", - " R " - ], - "key": { - "P": { - "tag": "c:plates/gold" - }, - "I": { - "tag": "c:ingots/gold" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:golden_pickaxe" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/golden_shovel.json b/fabric/src/main/resources/data/minecraft/recipes/golden_shovel.json deleted file mode 100644 index dc2a4ae74..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/golden_shovel.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "FPH", - " R ", - " R " - ], - "key": { - "P": { - "tag": "c:plates/gold" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:golden_shovel" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/golden_sword.json b/fabric/src/main/resources/data/minecraft/recipes/golden_sword.json deleted file mode 100644 index fc40a0707..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/golden_sword.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - " P ", - "FPH", - " R " - ], - "key": { - "P": { - "tag": "c:plates/gold" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:golden_sword" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/iron_axe.json b/fabric/src/main/resources/data/minecraft/recipes/iron_axe.json deleted file mode 100644 index b9091a71f..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/iron_axe.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "HIP", - " RP", - " RF" - ], - "key": { - "P": { - "tag": "c:plates/iron" - }, - "I": { - "tag": "c:ingots/iron" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:iron_axe" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/iron_hoe.json b/fabric/src/main/resources/data/minecraft/recipes/iron_hoe.json deleted file mode 100644 index 7dcd02075..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/iron_hoe.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "HIP", - " RF", - " R " - ], - "key": { - "P": { - "tag": "c:plates/iron" - }, - "I": { - "tag": "c:ingots/iron" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:iron_hoe" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/iron_pickaxe.json b/fabric/src/main/resources/data/minecraft/recipes/iron_pickaxe.json deleted file mode 100644 index e55095e07..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/iron_pickaxe.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "IIP", - "HRF", - " R " - ], - "key": { - "P": { - "tag": "c:plates/iron" - }, - "I": { - "tag": "c:ingots/iron" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:iron_pickaxe" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/iron_shovel.json b/fabric/src/main/resources/data/minecraft/recipes/iron_shovel.json deleted file mode 100644 index f92036486..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/iron_shovel.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - "FPH", - " R ", - " R " - ], - "key": { - "P": { - "tag": "c:ingots/iron" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:iron_shovel" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/data/minecraft/recipes/iron_sword.json b/fabric/src/main/resources/data/minecraft/recipes/iron_sword.json deleted file mode 100644 index 6ddc45387..000000000 --- a/fabric/src/main/resources/data/minecraft/recipes/iron_sword.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "antimatter:container_shaped", - "pattern": [ - " P ", - "FPH", - " R " - ], - "key": { - "P": { - "tag": "c:ingots/iron" - }, - "H": { - "tag": "antimatter:hammer" - }, - "F": { - "tag": "antimatter:file" - }, - "R": { - "tag": "c:rods/wooden" - } - }, - "result": { - "item": "minecraft:iron_sword" - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json deleted file mode 100644 index 3553ee23b..000000000 --- a/fabric/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "schemaVersion": 1, - "id": "gt4r", - "version": "${version}", - "name": "GT 4 Reimagined", - "description": "My remake of GregTech 4", - "authors": [ - "Trinsdar" - ], - "contact": { - "sources": "https://github.com/GregTech-Intergalactical/GT-4-Reimagined", - "issues": "https://github.com/GregTech-Intergalactical/GT-4-Reimagined/issues", - "discord": "https://discord.gg/9kM4bRj" - }, - "license": "LGPL-3.0", - "mixins": [ - "gt4r.mixins.json", - "gt4r-fabric.mixins.json" - ], - "depends": { - "fabricloader": ">=0.14.0", - "fabric": "*", - "tesseractapi": ">=0.2", - "antimatter": ">=0.2-rc4" - }, - "entrypoints": { - "antimatter_client": [ - "org.gtreimagined.gt4r.client.fabric.GT4RClientInitializer" - ], - "main": [ - "org.gtreimagined.gt4r.fabric.GT4ReimaginedFabric" - ], - "antimatter": [ - "org.gtreimagined.gt4r.GT4Reimagined", - "org.gtreimagined.gt4r.fabric.GT4RFabricRegistrar" - ] - } -} \ No newline at end of file diff --git a/fabric/src/main/resources/gt4r-fabric.mixins.json b/fabric/src/main/resources/gt4r-fabric.mixins.json deleted file mode 100644 index 3024c9b26..000000000 --- a/fabric/src/main/resources/gt4r-fabric.mixins.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "required": true, - "package": "org.gtreimagined.gt4r.mixin.fabric", - "compatibilityLevel": "JAVA_8", - "mixins": [ - ], - "minVersion": "0.8" -} \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle deleted file mode 100644 index 691b6bc1e..000000000 --- a/forge/build.gradle +++ /dev/null @@ -1,147 +0,0 @@ -import xyz.wagyourtail.unimined.expect.task.ExpectPlatformJar -plugins { - id "net.neoforged.moddev.legacyforge" - id 'xyz.wagyourtail.unimined.expect-platform' version '1.0.5' -} -archivesBaseName = "${project.archive_base_name}-forge" - -neoForge { - version = "${project.minecraft_version}-${project.forge_version}" - def at = project(':antimatter-common').file('src/main/resources/META-INF/accesstransformer.cfg') - if (at.exists()) { - accessTransformers.add(at.absolutePath) - } - parchment { - minecraftVersion = project.minecraft_version - mappingsVersion = project.mappings_version - } - runs { - client { - client() - - } - data { - data() - } - server { - server() - } - } - mods { - "${mod_id}" { - sourceSet sourceSets.main - } - } -} - -def mainRefmapFile; - -mixin { - mainRefmapFile = add sourceSets.main, "gt4r.refmap.json" - config "gt4r.mixins.json" - config "antimatter.mixins.json" - config "antimatter-forge.mixins.json" - config "antimatter.rei.mixins.json" - config "tesseract-forge.mixins.json" -} - - -dependencies { - implementation(expectPlatform.annotationsDep) - //subprojects - implementation(project(path: ":tesseract-forge")) - compileOnly(project(path: ":tesseract-common")) - implementation(project(path: ":antimatter-forge")) - compileOnly(project(path: ":antimatter-common")) - compileOnly(project(":common")) - //antimatter deps - implementation 'org.apache.commons:commons-collections4:4.4' - implementation("org.jetbrains:annotations:26.0.1") - //modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge:${rootProject.jei_version}") - //modRuntimeOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge:${rootProject.jei_version}") - modImplementation("mezz.jei:jei-1.18.2:9.7.2.1001") - modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${project.rei_version}") - modCompileOnly("me.shedaniel.cloth:cloth-config-forge:6.5.133") - modImplementation("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:${project.crafttweaker_version}") - modImplementation("dev.trinsdar:arrp-forge:0.6.7.1") - modImplementation("dev.trinsdar:terraform-utils-v1:3.1.5") - modImplementation("earth.terrarium:botarium-forge-1.18.2:${project.botarium_version}") - modImplementation("org.gt-reimagined:structurelib-forge:${project.structurelib_version}-${project.minecraft_version}") - modImplementation("com.teamresourceful.resourcefullib:resourcefullib-forge-1.18.2:${project.resourcefullib_version}") - modImplementation("maven.modrinth:carbon-config:${project.carbon_config_forge_version}") - modImplementation("dev.latvian.mods:kubejs-forge:${project.kubejs_version}") - modImplementation("dev.latvian.mods:rhino-forge:${project.rhino_version}") - modImplementation("dev.architectury:architectury-forge:${project.architectury_version}") - modRuntimeOnly("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:${project.crafttweaker_version}") - modImplementation("curse.maven:the-one-probe-245211:${project.top_forge_file}") - implementation("io.github.llamalad7:mixinextras-forge:0.4.1") - //MIXIN - if (System.getProperty('idea.sync.active') != 'true') { - annotationProcessor 'org.spongepowered:mixin:0.8.5-SNAPSHOT:processor' - } - - //gt4r deps - //minecraftRuntimeLibraries(group: 'com.github.Speiger', name: 'Primitive-Collections', version: '[0.8,0.9)') - modImplementation(jarJar("org.gt-reimagined:gtcore-forge:${project.gt_core_version}-${project.minecraft_version}")) - modRuntimeOnly(jarJar("dev.trinsdar:terraform-wood-api-v1:3.1.5")) - runtimeOnly("curse.maven:portality-291493:3840074") - runtimeOnly("curse.maven:titanium-287342:4117991") - modImplementation("curse.maven:the-one-probe-245211:${project.top_forge_file}") - modImplementation("curse.maven:ctm-267602:3933537") - modRuntimeOnly("curse.maven:worldstripper-250603:3670854") - //modImplementation("com.simibubi.create:create-${minecraft_version}:0.5.0.i-249:slim") { transitive = false } - modImplementation("com.tterrag.registrate:Registrate:MC1.18.2-1.1.3") - modImplementation("com.jozufozu.flywheel:flywheel-forge-${minecraft_version}:0.6.8.a-99") -} - -jar { - zip64 true -} - -tasks.named('compileJava', JavaCompile) { - source(project(":common").sourceSets.main.allSource) -} - -processResources { - from project(":common").sourceSets.main.resources - exclude('gtuassets1.14') - exclude('assets/gt4r/textures/old_textures') - - inputs.property "version", project.mod_version - - filesMatching("META-INF/mods.toml") { - expand "version": project.mod_version - } -} - -sourcesJar { - from(project(':common').sourceSets.main.allSource) -} - -tasks.create("platformJar", ExpectPlatformJar){ - platformName = "forge" - from(jarJar) - from(mainRefmapFile) - inputFiles = sourceSets.main.output - archiveClassifier.set "dev" - remap = ["xyz/wagyourtail/unimined/expect/annotation/Environment": "net/minecraftforge/api/distmarker/OnlyIn", - "xyz/wagyourtail/unimined/expect/annotation/Environment\$EnvType": "net/minecraftforge/api/distmarker/Dist", - "xyz/wagyourtail/unimined/expect/annotation/Environment\$EnvType.SERVER": "DEDICATED_SERVER"] - manifest { - attributes([ - 'Specification-Title' : mod_id, - 'Specification-Vendor' : "GT-Reimagined", - 'Specification-Version' : '1', // We are version 1 of ourselves - 'Implementation-Title' : "GT4 Reimagined", - 'Implementation-Version' : project.version, - 'Implementation-Vendor' : "GT-Reimagined", - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - "MixinConfigs" : "gt4r.mixins.json" - ]) - } -} - -tasks.named('reobfJar', Jar).configure { - input.set(platformJar.archiveFile) - dependsOn platformJar -} diff --git a/forge/gradle.properties b/forge/gradle.properties deleted file mode 100644 index c9b295f79..000000000 --- a/forge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -mod_id=gt4r \ No newline at end of file