Switch support for farmer's delight to farmer's delight refabricated

This commit is contained in:
Sollace 2024-03-31 16:47:40 +01:00
parent ec9a12bdf9
commit a81336ef88
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
3 changed files with 16 additions and 8 deletions

View file

@ -44,13 +44,15 @@ reckon {
repositories { repositories {
mavenLocal() mavenLocal()
flatDir { dirs 'lib' } flatDir { dirs 'lib' }
maven { name 'entity-reach-attributes'; url 'https://maven.jamieswhiteshirt.com/libs-release' } maven { name 'entity-reach-attributes'; url 'https://maven.jamieswhiteshirt.com/libs-release'; content { includeGroup "com.jamieswhiteshirt" } }
maven { name 'trinkets'; url 'https://maven.ladysnake.org/releases' } maven { name 'trinkets'; url 'https://maven.ladysnake.org/releases' }
maven { name 'mod-menu'; url 'https://maven.terraformersmc.com/' } maven { name 'mod-menu'; url 'https://maven.terraformersmc.com/' }
maven { name 'minelp-snapshot'; url 'https://repo.minelittlepony-mod.com/maven/snapshot' } maven { name 'minelp-snapshot'; url 'https://repo.minelittlepony-mod.com/maven/snapshot' }
maven { name 'minelp-releases'; url 'https://repo.minelittlepony-mod.com/maven/release' } maven { name 'minelp-releases'; url 'https://repo.minelittlepony-mod.com/maven/release' }
maven { name 'TerraformersMC'; url 'https://maven.terraformersmc.com/' } maven { name 'TerraformersMC'; url 'https://maven.terraformersmc.com/' }
maven { name 'Nodium'; url 'https://maven.cafeteria.dev/releases/' } maven { name 'Nodium'; url 'https://maven.cafeteria.dev/releases/' }
maven { name 'Greenhouse Maven For Farmers delight'; url 'https://maven.greenhouseteam.dev/releases/' }
maven { name 'Porting Lib For Farmers delight'; url = 'https://mvn.devos.one/releases/' }
maven { name 'Modrinth'; url 'https://api.modrinth.com/maven' } maven { name 'Modrinth'; url 'https://api.modrinth.com/maven' }
maven { name 'JitPack'; url 'https://jitpack.io'; content { includeGroup "com.github.Virtuoel" } } maven { name 'JitPack'; url 'https://jitpack.io'; content { includeGroup "com.github.Virtuoel" } }
} }
@ -84,7 +86,9 @@ dependencies {
modImplementation "me.luligabi:NoIndium:${project.nodium_version}" modImplementation "me.luligabi:NoIndium:${project.nodium_version}"
include "me.luligabi:NoIndium:${project.nodium_version}" include "me.luligabi:NoIndium:${project.nodium_version}"
modCompileOnly "maven.modrinth:farmers-delight-fabric:${project.farmers_delight_version}", { exclude group: "net.fabricmc.fabric-api" } modImplementation "vectorwing:FarmersDelight-Refabricated:${project.farmers_delight_version}", {
exclude group: "net.fabricmc"
}
if (project.use_pehkui == '1') { if (project.use_pehkui == '1') {
modCompileOnly "maven.modrinth:pehkui:${project.pehkui_version}", { exclude group: "net.fabricmc.fabric-api" } modCompileOnly "maven.modrinth:pehkui:${project.pehkui_version}", { exclude group: "net.fabricmc.fabric-api" }
modCompileOnly "com.github.Virtuoel:KanosConfig:0.4.1", { exclude group: "net.fabricmc.fabric-api" } modCompileOnly "com.github.Virtuoel:KanosConfig:0.4.1", { exclude group: "net.fabricmc.fabric-api" }
@ -103,6 +107,10 @@ dependencies {
} }
} }
remapJar {
addNestedDependencies = true
}
processResources { processResources {
inputs.property "version", project.version.toString() inputs.property "version", project.version.toString()

View file

@ -5,7 +5,7 @@ org.gradle.daemon=false
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20.1 minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10 yarn_mappings=1.20.1+build.10
loader_version=0.15.3 loader_version=0.15.7
fabric_version=0.91.0+1.20.1 fabric_version=0.91.0+1.20.1
# Mod Properties # Mod Properties
@ -22,8 +22,8 @@ org.gradle.daemon=false
# Dependencies # Dependencies
fabwork_version=1.2.0 fabwork_version=1.2.0
modmenu_version=7.0.0-beta.2 modmenu_version=7.0.0-beta.2
minelp_version=4.10.4+1.20.1 minelp_version=4.10.6+1.20.1
kirin_version=1.15.4+1.20 kirin_version=1.15.5-beta.1+1.20.1
reach_attributes_version=2.3.4 reach_attributes_version=2.3.4
trinkets_version=3.7.1 trinkets_version=3.7.1
terraformer_api_version=7.0.0-beta.1 terraformer_api_version=7.0.0-beta.1
@ -33,7 +33,7 @@ org.gradle.daemon=false
use_pehkui=0 use_pehkui=0
use_sodium=1 use_sodium=1
farmers_delight_version=1.4.3 farmers_delight_version=1.20.1-2.0.9
pehkui_version=3.7.8+1.14.4-1.20.1 pehkui_version=3.7.8+1.14.4-1.20.1
iris_version=1.6.17+1.20.1 iris_version=1.6.17+1.20.1
sodium_version=mc1.20.1-0.5.8 sodium_version=mc1.20.1-0.5.8

View file

@ -69,7 +69,7 @@ public interface UTreeGen {
.sapling(Unicopia.id("palm_sapling")).sapling((generator, settings) -> { .sapling(Unicopia.id("palm_sapling")).sapling((generator, settings) -> {
return new SaplingBlock(generator, settings) { return new SaplingBlock(generator, settings) {
@Override @Override
protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) { public boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
return floor.isIn(BlockTags.SAND); return floor.isIn(BlockTags.SAND);
} }
}; };