Skip to content

Commit

Permalink
1.20.1 initial stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
rhysdh540 committed Jul 26, 2023
1 parent 8cbec37 commit d5a5264
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 74 deletions.
31 changes: 16 additions & 15 deletions 1.19.2.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,27 @@ fabric_loader_version=0.14.21
fabric_api_version=0.76.0

# Forge - https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.html
forge_version=43.2.14
forge_version=43.2.8

## Fabric Mods
sodium=mc1.19.2-0.4.4
lazydfu_fabric=0.1.3
smoothboot_fabric=3821513
starlight_fabric=3835973
modmenu_version=4.1.1

# Create
create_fabric_version = 0.5.1-c-build.1095
create_forge_version = 0.5.1.d-9
registrate_forge_version = MC1.20-1.3.3
flywheel_forge_minecraft_version = 1.20
flywheel_forge_version = 0.6.9-4

## Forge Mods
create_forge_version = 0.5.1.c-36
registrate_forge_version = MC1.19-1.1.5
flywheel_forge_minecraft_version = 1.19.2
flywheel_forge_version = 0.6.9-18
## Fabric Mods
lazydfu=0.1.3
#smoothboot_fabric=3821513
modmenu=7.2.1

## Forge Mods
# Better Mods Button - https://www.curseforge.com/minecraft/mc-mods/better-mods-button/files
bmb_version = 3963202
bmb = 4613425
# Catalogue - https://www.curseforge.com/minecraft/mc-mods/catalogue/files
catalogue_version = 4171024
catalogue = 4590890
# FerriteCore - https://www.curseforge.com/minecraft/mc-mods/ferritecore/files
ferritecore_version = 4117906
ferritecore = 4574361
# Smooth Boot
smoothboot_forge = 3821513
60 changes: 34 additions & 26 deletions 1.20.1.properties
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
# suppress inspection "UnusedProperty" for whole file
# https://linkie.shedaniel.me/dependencies

# Java Version
java_version=17

# Minecraft Version
minecraft_version=1.20.1

# Fabric
# https://fabricmc.net/develop/
fabric_loader_version=0.14.21
fabric_api_version=0.85.0+1.20.1

# Forge
# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.html
forge_version=1.20.1-47.1.1
# Mappings
# https://lambdaurora.dev/tools/import_quilt.html
qm_version = 20
# https://parchmentmc.org/docs/getting-started
parchment_version = 2023.07.16

# ModMenu Version
modmenu_version=7.1.0

# Dev Env Optimization Mods
# https://docs.modrinth.com/docs/tutorials/maven/
# https://www.cursemaven.com/

## Fabric
sodium=mc1.20-0.4.10
lazydfu_fabric=0.1.3
starlight_fabric=4572096

## Forge
# Fabric - https://fabricmc.net/develop/
fabric_loader_version=0.14.21
fabric_api_version=0.86.0

# Forge - https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.html
forge_version=47.1.39


# Create
create_fabric_version = 0.5.1-c-build.1113
create_forge_version = 0.5.1.d-9
registrate_forge_version = MC1.20-1.3.3
flywheel_forge_minecraft_version = 1.20
flywheel_forge_version = 0.6.9-4

## Fabric Mods
lazydfu=0.1.3
#smoothboot_fabric=3821513
modmenu=7.2.1

## Forge Mods
# Better Mods Button - https://www.curseforge.com/minecraft/mc-mods/better-mods-button/files
bmb = 4613425
# Catalogue - https://www.curseforge.com/minecraft/mc-mods/catalogue/files
catalogue = 4590890
# FerriteCore - https://www.curseforge.com/minecraft/mc-mods/ferritecore/files
ferritecore = 4574361
# Smooth Boot
#smoothboot_forge = 3821513
44 changes: 20 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ subprojects { p ->
apply plugin: "dev.architectury.loom"
apply plugin: "io.github.juuxel.loom-quiltflower"

loom {
silentMojangMappingsLicense()
}
loom { silentMojangMappingsLicense() }

def awFile = project(":common").file("src/main/resources/${rootProject.mod_id}.accesswidener")

Expand Down Expand Up @@ -81,46 +79,39 @@ subprojects { p ->
dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
mappings(loom.layered {
it.mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${qm_version}:intermediary-v2")
it.parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
it.mappings("org.quiltmc:quilt-mappings:${rootProject.minecraft_version}+build.${rootProject.qm_version}:intermediary-v2")
it.parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
it.officialMojangMappings { nameSyntheticMembers = false }
})

annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"

// https://github.com/LlamaLad7/MixinExtras/wiki
addJar "com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras}"
annotationProcessor("com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras}")

// Dev Env Optimizations
//// https://www.cursemaven.com/
//// https://docs.modrinth.com/docs/tutorials/maven/

if (p == project(":fabric")) {
if (rootProject.hasProperty("sodium")) {
modImplementation "maven.modrinth:sodium:${rootProject.sodium}"
}
if (rootProject.hasProperty("lazydfu_fabric")) {
modImplementation "maven.modrinth:lazydfu:${rootProject.lazydfu_fabric}"
if (rootProject.hasProperty("lazydfu")) {
modRuntimeOnly "maven.modrinth:lazydfu:${rootProject.lazydfu}"
}
if (rootProject.hasProperty("smoothboot_fabric")) {
modImplementation "curse.maven:smooth-boot-415758:${rootProject.smoothboot_fabric}"
}
if (rootProject.hasProperty("starlight_fabric")) {
modImplementation "curse.maven:starlight-521783:${rootProject.starlight_fabric}"
modRuntimeOnly "curse.maven:smooth-boot-415758:${rootProject.smoothboot_fabric}"
}
}

if (p == project(":forge")) {
if (rootProject.hasProperty("rubidium")) {
modImplementation "curse.maven:rubidium-574856:${rootProject.rubidium}"
if (rootProject.hasProperty("bmb")) {
modRuntimeOnly "curse.maven:better-mods-button-541584:${rootProject.bmb}"
}
if (rootProject.hasProperty("smoothboot_forge")) {
modImplementation "curse.maven:smooth-boot-reloaded-633412:${rootProject.smoothboot_forge}"
}
if (rootProject.hasProperty("starlight_forge")) {
modImplementation "curse.maven:starlight-forge-526854:${rootProject.starlight_forge}"
modRuntimeOnly "curse.maven:smooth-boot-reloaded-633412:${rootProject.smoothboot_forge}"
}
if (rootProject.hasProperty("catalogue")) {
modRuntimeOnly "curse.maven:catalogue-459701:${rootProject.catalogue}"
}
if (rootProject.hasProperty("ferritecore")) {
modRuntimeOnly "curse.maven:ferritecore-429235:${rootProject.ferritecore}"
}
}
}

Expand Down Expand Up @@ -196,6 +187,11 @@ allprojects {
java {
withSourcesJar()
}

machete {
// disable machete locally for faster builds
enabled = System.getenv("GITHUB_RUN_NUMBER") != null
}
}

def getBuildNumber() {
Expand Down
6 changes: 3 additions & 3 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# No need to edit this file since it's generated by the build script
# If you need to change versions then edit "mc_versions" in gradle.properties

PRE_CURRENT_MC_1_19_2=
MC_1_19_2=
POST_MC_1_19_2=
POST_CURRENT_MC_1_19_2=
PRE_MC_1_20_1=
PRE_CURRENT_MC_1_20_1=
MC_1_20_1=
POST_CURRENT_MC_1_20_1=
2 changes: 1 addition & 1 deletion common/src/main/resources/createunlimited.accesswidener
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
accessWidener v2 named
# Do not edit this file. It is automatically generated by the build script. Edit 1_19_2.createunlimited.aw instead!
# Do not edit this file. It is automatically generated by the build script. Edit 1_20_1.createunlimited.aw instead!
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}+${rootProject.minecraft_version}"
runtimeOnly 'org.joml:joml:1.10.4' // Don't know why fabric api needs this

modImplementation "com.terraformersmc:modmenu:${rootProject.modmenu_version}"
modImplementation "com.terraformersmc:modmenu:${rootProject.modmenu}"

modImplementation("com.simibubi.create:create-fabric-${rootProject.minecraft_version}:${rootProject.create_fabric_version}+mc${rootProject.minecraft_version}")

Expand Down
5 changes: 1 addition & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.daemon=false
org.gradle.parallel=true
org.gradle.caching=true

mcVer=1.19.2
mcVer=1.20.1
mc_versions=1.19.2, 1.20.1

enabled_platforms=fabric, forge
Expand All @@ -15,8 +15,5 @@ archives_base_name=createunlimited
mod_version=0.5.0
license=GPL-3.0



default_mc_version=1.19.2
mixin_extras=0.1.1
manifold_version=2023.1.10

0 comments on commit d5a5264

Please sign in to comment.