diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 363266d..2ef3bb1 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ }, "depends": { "fabricloader": ">=0.15.10", - "minecraft": [ "1.20.4" ], + "minecraft": [ "1.20", "1.20.1", "1.20.2" ], "architectury": "*", "fabric-api": "*" }, diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index f6401fc..3a66ba5 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -23,7 +23,7 @@ side = "BOTH" [[dependencies.factory_blocks]] modId = "minecraft" mandatory = true -versionRange = "[1.20.3,1.20.4]" +versionRange = "[1.20,1.20.2]" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index bdf1508..0c44f52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,19 @@ org.gradle.jvmargs=-Xmx2048M -enabled_platforms=fabric,neoforge,forge +enabled_platforms=fabric,forge mod_version=1.4.0 maven_group=com.periut.factoryblocks archives_name=factory_blocks # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=11.1.17 +architectury_version=9.2.14 # https://fabricmc.net/develop/ -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.3 fabric_loader_version=0.16.9 -fabric_api_version=0.97.0+1.20.4 +fabric_api_version=0.92.3+1.20.1 #--- -# https://projects.neoforged.net/neoforged/neoforge -neoforge_version=20.4.234 - -forge_version=1.20.4-49.2.0 \ No newline at end of file +forge_version=1.20.1-47.4.0 \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle deleted file mode 100644 index fe70049..0000000 --- a/neoforge/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -plugins { - id 'com.github.johnrengelman.shadow' -} - -architectury { - platformSetupLoomIde() - neoForge() -} - -configurations { - common { - canBeResolved = true - canBeConsumed = false - } - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentNeoForge.extendsFrom common - - // Files in this configuration will be bundled into your mod using the Shadow plugin. - // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files. - shadowBundle { - canBeResolved = true - canBeConsumed = false - } -} - -repositories { - maven { - name = 'NeoForged' - url = 'https://maven.neoforged.net/releases' - } -} - -dependencies { - neoForge "net.neoforged:neoforge:$rootProject.neoforge_version" - modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" - - common(project(path: ':common', configuration: 'namedElements')) { transitive false } - shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge') -} - -processResources { - inputs.property 'version', project.version - - filesMatching('META-INF/mods.toml') { - expand version: project.version - } -} - -shadowJar { - configurations = [project.configurations.shadowBundle] - archiveClassifier = 'dev-shadow' -} - -remapJar { - inputFile.set shadowJar.archiveFile -} diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties deleted file mode 100644 index 2914393..0000000 --- a/neoforge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loom.platform=neoforge \ No newline at end of file diff --git a/neoforge/src/main/java/com/periut/factoryblocks/neoforge/FactoryBlocksNeoforge.java b/neoforge/src/main/java/com/periut/factoryblocks/neoforge/FactoryBlocksNeoforge.java deleted file mode 100644 index 8567ab7..0000000 --- a/neoforge/src/main/java/com/periut/factoryblocks/neoforge/FactoryBlocksNeoforge.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.periut.factoryblocks.neoforge; - -import com.periut.factoryblocks.FactoryBlocksMod; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.fml.ModList; -import net.neoforged.fml.common.Mod; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; - -@Mod(FactoryBlocksMod.MODID) -public class FactoryBlocksNeoforge -{ - public FactoryBlocksNeoforge(IEventBus modEventBus) - { - // Submit our event bus to let architectury register our content on the right time - FactoryBlocksMod.init(); - modEventBus.addListener(this::commonSetup); - } - - private void commonSetup(final FMLCommonSetupEvent event) { - FactoryBlocksMod.post(ModList.get().isLoaded("chisel")); - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 10c32d2..0000000 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,29 +0,0 @@ -modLoader="javafml" #mandatory -loaderVersion="[2,)" #mandatory -license="MIT" -issueTrackerURL = "https://github.com/matthewperiut/Chisel-Reborn/issues" - -[[mods]] -modId = "factory_blocks" -version = "${version}" -displayName = "Factory Blocks" -authors = "slaincow" -description = ''' -Adds Factory Blocks to Chisel Reborn or Chipped -''' -logoFile = "assets/factory_blocks/icon.png" - -[[dependencies.factory_blocks]] -modId="minecraft" -type="required" -versionRange="[1.20.4]" - -[[dependencies.factory_blocks]] -modId="neoforge" -type="required" -versionRange="[0,)" - -[[dependencies.factory_blocks]] -modId="architectury" -type="required" -versionRange="[0,)" \ No newline at end of file diff --git a/neoforge/src/main/resources/assets/factory_blocks/icon.png b/neoforge/src/main/resources/assets/factory_blocks/icon.png deleted file mode 100644 index 8c1f2ae..0000000 Binary files a/neoforge/src/main/resources/assets/factory_blocks/icon.png and /dev/null differ diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta deleted file mode 100644 index 371abb3..0000000 --- a/neoforge/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "Chisel", - "pack_format": 15 - } -} diff --git a/settings.gradle b/settings.gradle index a805ed3..7cd6af2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,7 +9,6 @@ pluginManagement { include("common") include("fabric") -include("neoforge") include("forge") rootProject.name = "factory_blocks"