Skip to content

Commit

Permalink
3.2
Browse files Browse the repository at this point in the history
Add support for :
MineCells
NaturesSpirit
RegionsUnexplored 0.5.x (0.4.1 still supported)
  • Loading branch information
xanthian committed Sep 17, 2023
1 parent 457791c commit 4d05f00
Show file tree
Hide file tree
Showing 280 changed files with 4,284 additions and 302 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: Artifacts
path: build/libs/
path: build/libs/
126 changes: 71 additions & 55 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,54 @@ version = project.mod_version
group = project.maven_group

repositories {
maven { url 'https://jitpack.io' } // Required for Dawn API
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
maven { url 'https://maven.minecraftforge.net/' } // Required for TerraBlender
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
maven { url "https://maven.minecraftforge.net/" } // Required for TerraBlender
maven { url "https://maven.resourcefulbees.com/repository/maven-public/" } // Required for Ad Astra
maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // Completecomfig for RegionsUnexplored
maven { url "https://maven.isxander.dev/releases" }
maven { url "https://cursemaven.com/" }
maven { url "https://api.modrinth.com/maven" }
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://raw.githubusercontent.com/Fuzss/modresources/main/maven/"} // Forge Config Api
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' }
}
loom {
accessWidenerPath = file("src/main/resources/variantbarrels.accesswidener")

runs {
datagen {
inherit server
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
vmArg "-Dfabric-api.datagen.modid=variantbarrels"

runDir "build/datagen"
}
}
}
sourceSets {
main {
resources {
srcDirs += [
'src/main/generated'
]
}
}
}

configurations.all {
resolutionStrategy {
force("net.fabricmc:fabric-loader:$loader_version")
}
}

dependencies {
implementation 'org.jetbrains:annotations:24.0.0'

Expand All @@ -32,14 +67,14 @@ dependencies {
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 - https://legacy.curseforge.com/minecraft/mc-mods/ad-astra)
// 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")

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

// BetterArcheology
modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") {transitive false}
Expand All @@ -51,28 +86,40 @@ dependencies {
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:25dabcdad7")
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")
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"
modApi ("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1")
modApi ("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1")

// Deeper & Darker - (some sht about CustomPortalBlocks - https://legacy.curseforge.com/minecraft/mc-mods/deeperdarker)
// Deeper & Darker - (some sht about CustomPortalBlocks)
//modRuntimeOnly("curse.maven:deeperdarker-659011:4715721") {transitive false}

// MineCells
modRuntimeOnly("curse.maven:minecells-618790:4745169") {transitive false}
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 - (terrablender mess)
//modRuntimeOnly ("maven.modrinth:natures-spirit:1.0")
modRuntimeOnly("curse.maven:naturesspirit-907816:4733817") {transitive false}
//modRuntimeOnly("com.github.Team-Hibiscus:NatureSpirit:v2")

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

// Regions Unexplored
modRuntimeOnly("curse.maven:regions_unexplored-659110:4583966") {transitive false}
modApi "fuzs.forgeconfigapiport:forgeconfigapiport-fabric:8.0.0"
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")

// Snifferplus - (Datagen issues - ResourceKey[minecraft:worldgen/biome / snifferplus:timeless_grotto - https://legacy.curseforge.com/minecraft/mc-mods/hellions-sniffer)
// Snifferplus - (Datagen issues - ResourceKey[minecraft:worldgen/biome / snifferplus:timeless_grotto)
//modRuntimeOnly("curse.maven:hellionssiffer-871962:4591532")

// Tech Reborn
Expand All @@ -81,34 +128,10 @@ dependencies {

// Vinery
modRuntimeOnly("curse.maven:vinery-704465:4643442") {transitive false}
modRuntimeOnly "maven.modrinth:do-api:1.2.4-fabric"
modRuntimeOnly ("maven.modrinth:do-api:1.2.4-fabric") {transitive false}
modApi( "curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
}
loom {
accessWidenerPath = file("src/main/resources/variantbarrels.accesswidener")

runs {
// This adds a new gradle task that runs the datagen API: "gradlew runDatagen"
datagen {
inherit server
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
vmArg "-Dfabric-api.datagen.modid=variantbarrels"

runDir "build/datagen"
}
}
}
sourceSets {
main {
resources {
srcDirs += [
'src/main/generated'
]
}
}
}
processResources {
inputs.property "version", project.version

Expand All @@ -118,15 +141,13 @@ processResources {
}

tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17
}

java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

jar {
Expand All @@ -135,19 +156,14 @@ jar {
}
}

// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.

}
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true

# Fabric Properties
Expand All @@ -8,9 +8,9 @@ yarn_mappings=1.20.1+build.10
loader_version=0.14.22

#Fabric api
fabric_version=0.87.0+1.20.1
fabric_version=0.88.1+1.20.1

# Mod Properties
mod_version = 3.1
mod_version = 3.2
maven_group = xanthian
archives_base_name = variantbarrels
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"variants": {
"facing=down,open=false": {
"model": "variantbarrels:block/mc_putrid_barrel",
"x": 180
},
"facing=down,open=true": {
"model": "variantbarrels:block/mc_putrid_barrel_open",
"x": 180
},
"facing=east,open=false": {
"model": "variantbarrels:block/mc_putrid_barrel",
"x": 90,
"y": 90
},
"facing=east,open=true": {
"model": "variantbarrels:block/mc_putrid_barrel_open",
"x": 90,
"y": 90
},
"facing=north,open=false": {
"model": "variantbarrels:block/mc_putrid_barrel",
"x": 90
},
"facing=north,open=true": {
"model": "variantbarrels:block/mc_putrid_barrel_open",
"x": 90
},
"facing=south,open=false": {
"model": "variantbarrels:block/mc_putrid_barrel",
"x": 90,
"y": 180
},
"facing=south,open=true": {
"model": "variantbarrels:block/mc_putrid_barrel_open",
"x": 90,
"y": 180
},
"facing=up,open=false": {
"model": "variantbarrels:block/mc_putrid_barrel"
},
"facing=up,open=true": {
"model": "variantbarrels:block/mc_putrid_barrel_open"
},
"facing=west,open=false": {
"model": "variantbarrels:block/mc_putrid_barrel",
"x": 90,
"y": 270
},
"facing=west,open=true": {
"model": "variantbarrels:block/mc_putrid_barrel_open",
"x": 90,
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"variants": {
"facing=down,open=false": {
"model": "variantbarrels:block/ns_aspen_barrel",
"x": 180
},
"facing=down,open=true": {
"model": "variantbarrels:block/ns_aspen_barrel_open",
"x": 180
},
"facing=east,open=false": {
"model": "variantbarrels:block/ns_aspen_barrel",
"x": 90,
"y": 90
},
"facing=east,open=true": {
"model": "variantbarrels:block/ns_aspen_barrel_open",
"x": 90,
"y": 90
},
"facing=north,open=false": {
"model": "variantbarrels:block/ns_aspen_barrel",
"x": 90
},
"facing=north,open=true": {
"model": "variantbarrels:block/ns_aspen_barrel_open",
"x": 90
},
"facing=south,open=false": {
"model": "variantbarrels:block/ns_aspen_barrel",
"x": 90,
"y": 180
},
"facing=south,open=true": {
"model": "variantbarrels:block/ns_aspen_barrel_open",
"x": 90,
"y": 180
},
"facing=up,open=false": {
"model": "variantbarrels:block/ns_aspen_barrel"
},
"facing=up,open=true": {
"model": "variantbarrels:block/ns_aspen_barrel_open"
},
"facing=west,open=false": {
"model": "variantbarrels:block/ns_aspen_barrel",
"x": 90,
"y": 270
},
"facing=west,open=true": {
"model": "variantbarrels:block/ns_aspen_barrel_open",
"x": 90,
"y": 270
}
}
}
Loading

0 comments on commit 4d05f00

Please sign in to comment.