Skip to content

Commit

Permalink
1.20.1
Browse files Browse the repository at this point in the history
1.3.5

Support for Blockus, Botania, Cinderscapes, Desolation
Added support for NaturesSpirit new Planks
Added support for missing RegionsUnexplored planks
Updated datagen
Added better load conditions on recipes and loot tables
Updated gradle
  • Loading branch information
xanthian committed Dec 9, 2023
1 parent 783805e commit 86819fa
Show file tree
Hide file tree
Showing 692 changed files with 31,798 additions and 12,825 deletions.
157 changes: 117 additions & 40 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,44 +1,121 @@
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
# User-specific stuff
.idea/
secret/
secrets/

*.iml
*.ipr
*.iws

# IntelliJ
out/
!**/src/main/**/out/
!**/src/test/**/out/

### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/

### Mac OS ###
# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

# General
.DS_Store
/src/main/generated/.cache/
/.idea/
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

.gradle
build/

# Ignore Gradle GUI config
gradle-app.setting

# Cache of project
.gradletasknamecache

**/build/

# Common working directory
run/

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
/.idea/runConfigurations/
112 changes: 71 additions & 41 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ base {
archivesName = project.archives_base_name
}

//def apikeyPropertiesFile = rootProject.file("secrets/secrets.properties");
def apikeyProperties = new Properties()
//apikeyProperties.load(new FileInputStream(apikeyPropertiesFile))
repositories {
mavenCentral()
maven { url "https://maven.terraformersmc.com/" } // Required for Mod Menu and Terraform APIs
maven { url "https://maven.shedaniel.me/" } // Required for Cloth Config
maven { url "https://maven.ryanliptak.com/" } // Required for AppleSkin
Expand All @@ -20,13 +24,21 @@ repositories {
maven { url "https://maven.isxander.dev/releases" }
maven { url "https://cursemaven.com/" }
maven { url "https://api.modrinth.com/maven" }
maven { url 'https://maven.wispforest.io' } // owolib for MineCells
maven { url 'https://maven.draylar.dev/releases' } // omegaconfig for MineCells
maven { url "https://maven.kyrptonaught.dev" }
maven { url "https://maven.wispforest.io" } // owolib for MineCells
maven { url "https://maven.draylar.dev/releases" } // omegaconfig for MineCells
maven { url "https://maven.ladysnake.org/releases" } // Trinkets for Bewitchment
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url "https://maven.jamieswhiteshirt.com/libs-release" }
maven { url "https://maven.parchmentmc.org" }
maven { url 'https://jitpack.io' }
maven { url "https://jitpack.io" }
//maven {
// url = uri("https://maven.pkg.github.com/Lemonszz/taniwha")
// credentials {
// username = apikeyProperties['gpr.user'] ?: System.getenv("USERNAME")
// password = apikeyProperties['gpr.key'] ?: System.getenv("TOKEN")
// }
//}
}

loom {
Expand Down Expand Up @@ -64,81 +76,99 @@ dependencies {
implementation 'org.jetbrains:annotations:24.0.0'

minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
mappings loom.layered {
mappings file("mappings/mappings-fix.tiny")
mappings("net.fabricmc:yarn:${project.yarn_mappings}:v2")
}
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

// Ad Astra - (issues with Botania - cursed Arch crap)
//modRuntimeOnly("curse.maven:adastra-635042:4643678") {transitive false}
//modApi ("curse.maven:botarium-704113:4672474")
//modApi ("com.teamresourceful.resourcefullib:resourcefullib-fabric-1.20.1:2.1.3")
//modApi ("curse.maven:resourcefulconfig-714059:4576456")
// Ad Astra
modRuntimeOnly("maven.modrinth:3ufwT9JF:QzjRLT8e")
modRuntimeOnly("maven.modrinth:2u6LRnMa:9yTYvTAh") //botarium
modApi("maven.modrinth:G1hIVOrD:5coQdKPg") //resourcefullib
modApi("maven.modrinth:M1953qlQ:nVDWZ9N7") //resourcefulconfig

// Beach Party (Lets Do)
modRuntimeOnly("curse.maven:beachparty-858691:4696068") {transitive false}
modRuntimeOnly("curse.maven:beachparty-858691:4696068") { transitive false }

// BetterArcheology
modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") {transitive false}
modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") { transitive false }

// Bewitchment
modRuntimeOnly("curse.maven:bewitchment-394915:4673611") {transitive false}
modRuntimeOnly("curse.maven:bewitchment-394915:4673611") { transitive false }
modApi("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
modApi("maven.modrinth:impersonate:2.10.0")
modApi("maven.modrinth:midnightlib:1.4.1-fabric")
modApi("io.github.ladysnake:PlayerAbilityLib:1.8.0")
modApi("com.jamieswhiteshirt:reach-entity-attributes:2.4.0")
modApi("com.github.emilyploszaj:step-height-entity-attribute:v1.2.0")
modApi("com.terraformersmc.terraform-api:terraform-wood-api-v1:7.0.1")
modRuntimeOnly ("vazkii.patchouli:Patchouli:1.20.1-80-FABRIC")
modRuntimeOnly("com.github.Virtuoel:Pehkui:3.7.6") {transitive false}
modRuntimeOnly("vazkii.patchouli:Patchouli:1.20.1-80-FABRIC")
modRuntimeOnly("com.github.Virtuoel:Pehkui:3.7.6") { transitive false }
modApi("com.github.Virtuoel:KanosConfig:0.4.1")
modRuntimeOnly("curse.maven:trinkets-341284:4657534") {transitive false}
modApi ("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1")
modApi ("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1")
modRuntimeOnly("curse.maven:trinkets-341284:4657534") { transitive false }
modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1")
modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1")

// BiomeMakeover
modRuntimeOnly("maven.modrinth:jG8Q2YwT:rsoZ2Iqo")
//modApi("party.lemons:taniwha-fabric:1.20.0-5.4.9" )

// Blockus
modRuntimeOnly("curse.maven:blockus-312289:4745041") { transitive false }

// Botania
modRuntimeOnly("vazkii.botania:Botania-xplat:1.20.1-441")

// Deeper & Darker - (some sht about CustomPortalBlocks)
//modRuntimeOnly("curse.maven:deeperdarker-659011:4715721") {transitive false}
// Cinderscapes
modRuntimeOnly "com.terraformersmc:cinderscapes:4.0.9"
modRuntimeOnly "com.terraformersmc:cinderscapes-client:4.0.9"
modRuntimeOnly "com.terraformersmc:cinderscapes-common:4.0.9"
modRuntimeOnly "com.terraformersmc:cinderscapes-worldgen:4.0.9"
modApi("maven.modrinth:mOgUt4GM:lEkperf6") // ModMenu 7.2.2

// Deeper & Darker
modRuntimeOnly("maven.modrinth:fnAffV0n:jb78cjt3") { transitive false }
modApi("net.kyrptonaught:customportalapi:0.0.1-beta64-1.20")

// Desolation
modRuntimeOnly("maven.modrinth:oML3dQBb:rW5RXUV5") { transitive false }
modRuntimeOnly("maven.modrinth:8BmcQJ2H:oPgOSBzN") { transitive false } // Geckolib

// Eldritch End
modRuntimeOnly("curse.maven:eldritch_end-877553:4846136") { transitive false }
modApi("curse.maven:azure_lib-817423:4829197")
modApi("curse.maven:necronomicon-586157:4834773")

// MineCells
modRuntimeOnly("curse.maven:minecells-618790:4745169") {transitive false}
modApi("io.wispforest:owo-lib:0.11.2-pre.11+1.20")
modRuntimeOnly("curse.maven:minecells-618790:4745169") { transitive false }
modApi("io.wispforest:owo-lib:0.11.2+1.20")
modApi("dev.draylar.omega-config:omega-config-base:1.4.0+1.20.1")

// Natures Spirit - (terrablender mess)
//modRuntimeOnly ("maven.modrinth:natures-spirit:1.0")
//modRuntimeOnly("curse.maven:naturesspirit-907816:4733817") {transitive false}
//modRuntimeOnly("com.github.Team-Hibiscus:NatureSpirit:v2")
// Natures Spirit 1.2
modRuntimeOnly("maven.modrinth:WBvnqHfV:M6a2Rl4r")

// Promenade
modRuntimeOnly("curse.maven:promenade-399648:4611967") {transitive false}
modRuntimeOnly("curse.maven:promenade-399648:4794732") { transitive false }
modApi("com.github.DawnTeamMC:DawnAPI:5.0.0")
modApi("com.terraformersmc:biolith:1.0.0-alpha.7")
modApi("com.terraformersmc:biolith:1.0.0-alpha.9")

// Regions Unexplored
// Regions Unexplored 0.5
modRuntimeOnly("curse.maven:regions_unexplored-659110:4721079")
modApi("com.github.glitchfiend:TerraBlender-fabric:1.20.1-3.0.0.169")
//modApi ("curse.maven:terrablender-565956:4573002")
modApi ("com.github.Lortseam.completeconfig:base:2.5.0")
modApi("com.github.Lortseam.completeconfig:base:2.5.0")

// Snifferplus - (Datagen issues - ResourceKey[minecraft:worldgen/biome / snifferplus:timeless_grotto)
//modRuntimeOnly("curse.maven:hellionssiffer-871962:4591532")
// Snifferplus
//modRuntimeOnly("maven.modrinth:BVgHoKxg:DLjYM0KE")

// Tech Reborn
modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.3") {transitive false }
modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.3") { transitive false }
modRuntimeOnly("RebornCore:RebornCore-1.20:5.8.3")

// Vinery
modRuntimeOnly("curse.maven:vinery-704465:4643442") {transitive false}
modRuntimeOnly ("maven.modrinth:do-api:1.2.4-fabric") {transitive false}
modApi( "curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }

// Mixin Extras
include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:0.2.0-beta.8")))
modRuntimeOnly("curse.maven:vinery-704465:4643442") { transitive false }
modRuntimeOnly("maven.modrinth:do-api:1.2.4-fabric") { transitive false }
modApi("curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
}

processResources {
Expand All @@ -165,7 +195,7 @@ java {

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
rename { "${it}_${project.archivesBaseName}" }
}
}

Expand Down
11 changes: 4 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true

# Fabric Properties
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.14.24

loader_version=0.14.25
#Fabric api
fabric_version=0.90.7+1.20.1

fabric_version=0.91.0+1.20.1
# Mod Properties
mod_version=1.3.1
mod_version=1.3.5
maven_group=net.xanthian
archives_base_name=variantchiseledbookshelves

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
1 change: 1 addition & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 86819fa

Please sign in to comment.