diff --git a/build.gradle b/build.gradle index 709776b..517b9a5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,7 @@ import org.gradle.api.tasks.compile.JavaCompile plugins { id "maven-publish" - id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.1-SNAPSHOT" apply(false) - id "com.github.johnrengelman.shadow" version "7.0.0" apply(false) -} - -architectury { - minecraft = rootProject.minecraft_version + id "xyz.wagyourtail.unimined" version "1.2.6-SNAPSHOT" apply false } //Print out JVM information so that we know what version is running. Extreamly useful for people to know when helping you. @@ -23,11 +17,10 @@ def gitHash() { return "" } -allprojects { +subprojects { + apply plugin: "xyz.wagyourtail.unimined" apply plugin: "maven-publish" - apply plugin: "java" - apply plugin: "architectury-plugin" - + java.toolchain.languageVersion = JavaLanguageVersion.of(17) group = rootProject.maven_group @@ -37,6 +30,13 @@ allprojects { withSourcesJar() } + configurations { + modCompileOnly + compileOnly.extendsFrom modCompileOnly + modRuntimeOnly + runtimeOnly.extendsFrom modRuntimeOnly + } + tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' } @@ -47,14 +47,68 @@ allprojects { } println("In CI mode") } -} -subprojects { - apply plugin: "dev.architectury.loom" - java.toolchain.languageVersion = JavaLanguageVersion.of(17) + repositories { + maven { + url "https://mcentral.firstdark.dev/releases" + } + } + + jar { + manifest { + attributes([ + 'Specification-Title' : project.archivesBaseName, + 'Specification-Vendor' : "Trinsdar", + 'Specification-Version' : project.version, + 'Implementation-Title' : project.name, + 'Implementation-Version' : project.version, + 'Implementation-Vendor' : "Trinsdar", + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + 'Timestamp' : System.currentTimeMillis(), + 'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})", + 'Built-On-Minecraft' : minecraft_version + ]) + } + } + + unimined.minecraft(sourceSets.main, true) { + version minecraft_version + if (project.name != "common"){ + combineWith(project(":common"), project(":common").sourceSets.main) + } else { + if (project.name == "common") { + mappings { + intermediary() + } + + mods.modImplementation { + namespace("intermediary") + } + } + } + + mods { + remap(configurations.modCompileOnly){ + catchAWNamespaceAssertion() + } + remap(configurations.modRuntimeOnly){ + catchAWNamespaceAssertion() + } + modImplementation { + catchAWNamespaceAssertion() + } + } + + mappings { + mojmap() + devFallbackNamespace "official" + devNamespace "mojmap" + parchment(rootProject.minecraft_version, rootProject.mappings_version) + } + } + - if (!project.path.contains("common")){ - apply plugin: "com.github.johnrengelman.shadow" + /*if (!project.path.contains("common")){ configurations { common @@ -88,37 +142,13 @@ subprojects { skip() } } - } - - loom { - silentMojangMappingsLicense() - } - - dependencies { - minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" - // The following line declares the mojmap mappings, you may use other mappings as well - mappings loom.layered() { - officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.mappings_version}@zip") - } - // The following line declares the yarn mappings you may select this one as well. - // mappings "net.fabricmc:yarn:1.17.1+build.32:v2" - } + }*/ publishing { publications { mavenJava(org.gradle.api.publish.maven.MavenPublication) { artifactId = "gtcore-" + project.name - artifact(sourcesJar) { - builtBy remapSourcesJar - } - - afterEvaluate { - artifact remapJar - if (project.name != "common"){ - artifact shadowJar - } - } + from components.java } } repositories { diff --git a/common/build.gradle b/common/build.gradle index 1e9cffe..25b843f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,11 +1,20 @@ archivesBaseName = "${rootProject.archive_base_name}-common" version = "${project.mod_version}-${rootProject.minecraft_version}" -loom { +/*loom { accessWidenerPath = file("src/main/resources/gtcore.accesswidener") +}*/ + +unimined.minecraft { + accessWidener { + accessWidener(file("src/main/resources/gtcore.accesswidener")) + } + + defaultRemapJar = true } dependencies { + compileOnly("org.spongepowered:mixin:0.8.5") modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation("io.github.gregtechintergalactical:antimatter-common:${antimatter_version}"){ exclude(group: "maven.modrinth") @@ -18,16 +27,12 @@ dependencies { modImplementation("earth.terrarium:botarium-common-1.18.2:${project.botarium_version}") modImplementation("com.gtnewhorizon.structurelib:structurelib-common:${project.structurelib_version}-${project.minecraft_version}") modImplementation "com.teamresourceful.resourcefullib:resourcefullib-common-1.18.2:${project.resourcefullib_version}" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin:${rootProject.rei_version}" - modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-common-api:${rootProject.jei_version}") + modImplementation "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}" + modImplementation "me.shedaniel:RoughlyEnoughItems-default-plugin:${rootProject.rei_version}" + modImplementation("mezz.jei:jei-${rootProject.minecraft_version}-common-api:${rootProject.jei_version}") modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_version_fabric}"){ transitive = false } - modCompileOnly("curse.maven:the-one-probe-fabric-581847:${project.top_fabric_file}") + modImplementation("curse.maven:the-one-probe-fabric-581847:${project.top_fabric_file}") modImplementation "maven.modrinth:carbon-config:${project.carbon_config_fabric_version}" } - -architectury { - common("forge", "fabric") -} diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockMaterialChest.java b/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockMaterialChest.java index 415477c..f6dc80d 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockMaterialChest.java +++ b/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockMaterialChest.java @@ -8,8 +8,6 @@ import muramasa.antimatter.gui.SlotType; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.machine.types.Machine; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.Container; @@ -118,7 +116,7 @@ public boolean triggerEvent(BlockState state, Level worldIn, BlockPos pos, int i return tileentity != null && tileentity.triggerEvent(id, param); } - @Environment(EnvType.CLIENT) + //@Environment(EnvType.CLIENT) public static DoubleBlockCombiner.Combiner getLid(final LidBlockEntity p_226917_0_) { return new DoubleBlockCombiner.Combiner() { @Override diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityBarrel.java b/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityBarrel.java index c73a31d..6a91fd4 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityBarrel.java +++ b/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityBarrel.java @@ -4,8 +4,6 @@ import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine; import muramasa.antimatter.gui.container.ContainerMachine; import muramasa.antimatter.machine.MachineState; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityChest.java b/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityChest.java index 9f830a0..ea05682 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityChest.java +++ b/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityChest.java @@ -7,8 +7,6 @@ import muramasa.antimatter.capability.machine.MachineItemHandler; import muramasa.antimatter.gui.SlotType; import muramasa.antimatter.gui.container.ContainerMachine; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; @@ -123,7 +121,7 @@ private static void playSound(Level world, BlockPos pos, BlockState state, Sound } @Override - @Environment(EnvType.CLIENT) + //@Environment(EnvType.CLIENT) public float getOpenNess(float partialTicks) { return lidController.getOpenness(partialTicks); //return Mth.lerp(partialTicks, this.prevLidAngle, this.lidAngle); diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreBlocks.java b/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreBlocks.java index d7b0c94..28835ca 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreBlocks.java +++ b/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreBlocks.java @@ -1,6 +1,5 @@ package io.github.gregtechintergalactical.gtcore.data; -import dev.architectury.injectables.annotations.ExpectPlatform; import io.github.gregtechintergalactical.gtcore.GTCore; import io.github.gregtechintergalactical.gtcore.block.BlockSapBag; import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntitySapBag; @@ -98,9 +97,8 @@ public static void init() { AntimatterAPI.register(BlockEntityType.class, "sap_bag", GTCore.ID, SAP_BAG_BLOCK_ENTITY); } - @ExpectPlatform private static void initTFC(){ - throw new AssertionError(); + IGTBlockInit.INSTANCE.init(); } public static DrumMachine createDrum(Material material, int maxCapacity){ diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/IGTBlockInit.java b/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/IGTBlockInit.java new file mode 100644 index 0000000..4017dfa --- /dev/null +++ b/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/IGTBlockInit.java @@ -0,0 +1,10 @@ +package io.github.gregtechintergalactical.gtcore.data; + +import tesseract.TesseractCapUtils; + +import java.util.ServiceLoader; + +public interface IGTBlockInit { + IGTBlockInit INSTANCE = ServiceLoader.load(IGTBlockInit.class).findFirst().orElse(null); + void init(); +} diff --git a/common/src/main/resources/gtcore.accesswidener b/common/src/main/resources/gtcore.accesswidener index d485042..591012e 100644 --- a/common/src/main/resources/gtcore.accesswidener +++ b/common/src/main/resources/gtcore.accesswidener @@ -6,4 +6,9 @@ accessible field net/minecraft/world/level/biome/Biome$ClimateSettings precipita accessible method net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacerType (Lcom/mojang/serialization/Codec;)V accessible method net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacerType (Lcom/mojang/serialization/Codec;)V extendable method net/minecraft/world/level/levelgen/feature/TreeFeature getMaxFreeTreeHeight (Lnet/minecraft/world/level/LevelSimulatedReader;ILnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration;)I -accessible method net/minecraft/world/level/block/state/properties/WoodType register (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/world/level/block/state/properties/WoodType; \ No newline at end of file +accessible method net/minecraft/world/level/block/state/properties/WoodType register (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/world/level/block/state/properties/WoodType; +accessible class net/minecraft/client/gui/screens/MenuScreens$ScreenConstructor +accessible class net/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier +accessible method net/minecraft/data/loot/BlockLoot createLeavesDrops (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;[F)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; +accessible method net/minecraft/data/loot/BlockLoot createSlabItemTable (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; +accessible method net/minecraft/data/loot/BlockLoot createSingleItemTable (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index 3893f67..b7d6426 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -4,26 +4,33 @@ version = "${project.mod_version}-${rootProject.minecraft_version}" def generatedResources = file("src/generated/resources") def accessWidenerFile = project(":common").file("src/main/resources/gtcore.accesswidener") -architectury { - platformSetupLoomIde() - fabric() -} - -loom { +/*loom { accessWidenerPath = accessWidenerFile +}*/ +unimined.minecraft { + fabric { + loader fabric_loader_version + accessWidener(accessWidenerFile) + } + + defaultRemapJar = true } dependencies { - modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" - modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - common(project(path: ":common", configuration: "namedElements")) - shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) + //modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" + implementation(project(path: ":common")) + //shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) modImplementation("io.github.gregtechintergalactical:antimatter-fabric:${antimatter_version}"){ exclude(group: "maven.modrinth") exclude(group: "TechReborn") exclude(group: "com.github.Trins-mods") exclude(group: "com.github.Trinsdar") } + modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric:${rootProject.jei_version}"){ + exclude(group: "mezz.jei", module: "jei-1.18.2-fabric-api") + } + modCompileOnly("curse.maven:the-one-probe-fabric-581847:${project.top_fabric_file}") modImplementation(include("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") @@ -38,16 +45,16 @@ task copyAccessWidener(type: Copy) { into generatedResources } -sourceSets { +/*sourceSets { main { resources { srcDir copyAccessWidener } } -} +}*/ processResources { - dependsOn copyAccessWidener + //dependsOn copyAccessWidener inputs.property "version", project.mod_version filesMatching("fabric.mod.json") { @@ -56,7 +63,5 @@ processResources { } sourcesJar { - from(project(':common').sourceSets.main.allSource) { - exclude("gtcore.accesswidener") // duplicate on fabric, unneeded on forge - } + from(project(':common').sourceSets.main.allSource) } diff --git a/fabric/src/generated/resources/gtcore.accesswidener b/fabric/src/generated/resources/gtcore.accesswidener deleted file mode 100644 index d485042..0000000 --- a/fabric/src/generated/resources/gtcore.accesswidener +++ /dev/null @@ -1,9 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/world/level/biome/Biome$ClimateSettings -accessible field net/minecraft/world/level/biome/Biome$ClimateSettings temperature F -accessible field net/minecraft/world/level/biome/Biome$ClimateSettings precipitation Lnet/minecraft/world/level/biome/Biome$Precipitation; -accessible method net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacerType (Lcom/mojang/serialization/Codec;)V -accessible method net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacerType (Lcom/mojang/serialization/Codec;)V -extendable method net/minecraft/world/level/levelgen/feature/TreeFeature getMaxFreeTreeHeight (Lnet/minecraft/world/level/LevelSimulatedReader;ILnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration;)I -accessible method net/minecraft/world/level/block/state/properties/WoodType register (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/world/level/block/state/properties/WoodType; \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index e676095..79fa695 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,32 +1,30 @@ archivesBaseName = "${rootProject.archive_base_name}-forge" version = "${project.mod_version}-${rootProject.minecraft_version}" -architectury { - platformSetupLoomIde() - forge() -} - -loom { +/*loom { accessWidenerPath = project(":common").file("src/main/resources/gtcore.accesswidener") - forge{ - mixinConfigs = [ - "gtcore.mixins.json" - ] +}*/ + +unimined.minecraft { + minecraftForge { + loader forge_version + mixinConfig("gtcore.mixins.json") + //accessWidener(project(":common").file("src/main/resources/gtcore.accesswidener")) + aw2at(project(":common").file("src/main/resources/gtcore.accesswidener")); } + defaultRemapJar = true } dependencies { - forge "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}" modImplementation("io.github.gregtechintergalactical:antimatter-forge:${antimatter_version}"){ //exclude(group: "mezz.jei") exclude(group: "com.github.Reforged-Mods.Terraform-Reforged") } - common(project(path: ":common", configuration: "namedElements")) - shadowCommon(project(path: ":common", configuration: "transformProductionForge")) + implementation(project(path: ":common")) //modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-forge:${rootProject.rei_version}" modCompileOnly "me.shedaniel:RoughlyEnoughItems-forge:${rootProject.rei_version}" modCompileOnly("curse.maven:terrafirmacraft-302973:4723717") - modImplementation(include("io.github.reforgedmods.terraform-api:terraform-wood-api-v1:${project.terraform_version_forge}")) + modImplementation("io.github.reforgedmods.terraform-api:terraform-wood-api-v1:${project.terraform_version_forge}") //modRuntimeOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge:${rootProject.jei_version}") modImplementation("maven.modrinth:carbon-config:${project.carbon_config_forge_version}") modRuntimeOnly("curse.maven:the-twilight-forest-227639:4337390") @@ -39,3 +37,9 @@ processResources { expand "version": project.mod_version } } + +sourcesJar { + from(project(':common').sourceSets.main.allSource) { + exclude("gtcore.accesswidener") + } +} \ No newline at end of file diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java b/forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java index da8ee98..492f85a 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java +++ b/forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java @@ -1,10 +1,11 @@ package io.github.gregtechintergalactical.gtcore.data.forge; +import io.github.gregtechintergalactical.gtcore.data.IGTBlockInit; import io.github.gregtechintergalactical.gtcore.integration.tfc.TFCRubberData; -public class GTCoreBlocksImpl { - public static void initTFC(){ +public class GTCoreBlocksImpl implements IGTBlockInit { + public void init(){ TFCRubberData.init(); } } diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg index c108498..826365d 100644 --- a/forge/src/main/resources/META-INF/accesstransformer.cfg +++ b/forge/src/main/resources/META-INF/accesstransformer.cfg @@ -1,7 +1,12 @@ public net.minecraft.world.level.biome.Biome$ClimateSettings -public net.minecraft.world.level.biome.Biome$ClimateSettings f_47681_ -public net.minecraft.world.level.biome.Biome$ClimateSettings f_47680_ -public net.minecraft.world.level.block.state.properties.WoodType m_61844_(Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/world/level/block/state/properties/WoodType; -public-f net.minecraft.world.level.levelgen.feature.TreeFeature m_67215_(Lnet/minecraft/world/level/LevelSimulatedReader;ILnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration;)I -public net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType (Lcom/mojang/serialization/Codec;)V +public net.minecraft.client.gui.screens.MenuScreens$ScreenConstructor +public net.minecraft.world.level.block.entity.BlockEntityType$BlockEntitySupplier +public net.minecraft.world.level.biome.Biome$ClimateSettings temperature +public net.minecraft.world.level.biome.Biome$ClimateSettings precipitation public net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType (Lcom/mojang/serialization/Codec;)V +public net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType (Lcom/mojang/serialization/Codec;)V +protected-f net.minecraft.world.level.levelgen.feature.TreeFeature getMaxFreeTreeHeight(Lnet/minecraft/world/level/LevelSimulatedReader;ILnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration;)I +public net.minecraft.world.level.block.state.properties.WoodType register(Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/world/level/block/state/properties/WoodType; +public net.minecraft.data.loot.BlockLoot createLeavesDrops(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;[F)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; +public net.minecraft.data.loot.BlockLoot createSlabItemTable(Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; +public net.minecraft.data.loot.BlockLoot createSingleItemTable(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; diff --git a/forge/src/main/resources/META-INF/services/io.github.gregtechintergalactical.gtcore.data.IGTBlockInit b/forge/src/main/resources/META-INF/services/io.github.gregtechintergalactical.gtcore.data.IGTBlockInit new file mode 100644 index 0000000..6663ab5 --- /dev/null +++ b/forge/src/main/resources/META-INF/services/io.github.gregtechintergalactical.gtcore.data.IGTBlockInit @@ -0,0 +1 @@ +io.github.gregtechintergalactical.gtcore.data.forge.GTCoreBlocksImpl \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1de7bbd..4f53e10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ fabric_loader_version=0.15.9 antimatter_version=0.2.1-pre32-1.18.2 tesseract_version=0.2.3-pre4-1.18.2 -jei_version=10.1.0.223 +jei_version=10.2.1.1004 rei_version=8.3.557 terraform_version_forge=3.1.5 terraform_version_fabric=3.1.0 diff --git a/settings.gradle b/settings.gradle index b2a47fe..7a39a66 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,6 +11,12 @@ pluginManagement { name = 'parchment' url = 'https://maven.parchmentmc.org' } + maven { + url = "https://maven.wagyourtail.xyz/releases" + } + maven { + url = "https://maven.wagyourtail.xyz/snapshots" + } gradlePluginPortal() mavenCentral() }