1.20.1

1.3.8 Fix missing vanilla recipes & advancements Removed RU Cherry & Sculkwood
xanthian · Feb 24, 2024 · 21b8df5 · 21b8df5
1 parent e3de56f
commit 21b8df5
Show file tree

Hide file tree

Showing 164 changed files with 10,585 additions and 12,107 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.4-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -32,13 +32,13 @@ repositories {
     maven { url "https://maven.jamieswhiteshirt.com/libs-release" }
     maven { url "https://maven.parchmentmc.org" }
     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")
-    //    }
-    //}
+     //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 {
@@ -71,7 +71,6 @@ configurations.all {
         force("net.fabricmc:fabric-loader:$loader_version")
     }
 }
-
 dependencies {
     implementation 'org.jetbrains:annotations:24.0.0'
 
@@ -103,6 +102,7 @@ dependencies {
     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 }
     modApi("com.github.Virtuoel:KanosConfig:0.4.1")
@@ -111,8 +111,8 @@ dependencies {
     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" )
+    modRuntimeOnly("maven.modrinth:jG8Q2YwT:rsoZ2Iqo") { transitive false }
+    //modRuntimeOnly("party.lemons:taniwha-fabric:1.20.0-5.4.9" )
 
     // Blockus
     modRuntimeOnly("curse.maven:blockus-312289:4745041") { transitive false }
@@ -142,16 +142,16 @@ dependencies {
 
     // MineCells
     modRuntimeOnly("curse.maven:minecells-618790:4745169") { transitive false }
-    modApi("io.wispforest:owo-lib:0.11.2+1.20")
+    modApi("io.wispforest:owo-lib:0.11.2-pre.11+1.20")
     modApi("dev.draylar.omega-config:omega-config-base:1.4.0+1.20.1")
 
-    // Natures Spirit 1.2
-    modRuntimeOnly("maven.modrinth:WBvnqHfV:M6a2Rl4r")
+    // Natures Spirit 1.3
+    modImplementation("maven.modrinth:WBvnqHfV:wLpIDkQv")
 
     // Promenade
-    modRuntimeOnly("curse.maven:promenade-399648:4794732") { transitive false }
+    modRuntimeOnly("curse.maven:promenade-399648:4611967") { transitive false }
     modApi("com.github.DawnTeamMC:DawnAPI:5.0.0")
-    modApi("com.terraformersmc:biolith:1.0.0-alpha.9")
+    modApi("com.terraformersmc:biolith:1.0.0-alpha.7")
 
     // Regions Unexplored 0.5
     modRuntimeOnly("curse.maven:regions_unexplored-659110:4721079")
@@ -169,6 +169,12 @@ dependencies {
     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' }
+
+    // VariantBookshelves
+    modRuntimeOnly "curse.maven:variant-bookshelves-fabric-653372:5011784"
+
+    // Mixin Extras
+    include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:0.2.0")))
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ loader_version=0.14.25
 #Fabric api
 fabric_version=0.91.0+1.20.1
 # Mod Properties
-mod_version=1.3.6
+mod_version=1.3.8
 maven_group=net.xanthian
 archives_base_name=variantchiseledbookshelves
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/mappings/mappings-fix.tiny b/mappings/mappings-fix.tiny
@@ -4,4 +4,6 @@ c	earth/terrarium/botarium/common/fluid/impl/SimpleFluidContainer	earth/terrariu
 c	party/lemons/biomemakeover/entity/ai/MountedCrossbowAttackGoal	party/lemons/biomemakeover/entity/ai/MountedCrossbowAttackGoal
 	m	()Z	canStart	canStart$fixConflict
 c	party/lemons/biomemakeover/entity/GhostEntity	party/lemons/biomemakeover/entity/GhostEntity
-	m	()V	chooseRandomAngerTime	chooseRandomAngerTime$fixConflict
+	m	()V	chooseRandomAngerTime	chooseRandomAngerTime$fixConflict
+c	samebutdifferent/ecologics/entity/Squirrel	samebutdifferent/ecologics/entity/Squirrel
+	m	()Z	isClimbing	isClimbing$fixConflict