Skip to content

Commit

Permalink
eh
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhysdh540
rhysdh540 committed Sep 3, 2024
1 parent 2853fd1 commit 1008c3d
Show file tree
Hide file tree
Showing 244 changed files with 5,518 additions and 133 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ tasks.compileJava {
}

sourceSets.main {
resources.srcDir("src/generated/resources")
resources.srcDir(rootProject.file("src/generated-${"minecraft_version"()}/resources"))
}

configurations.configureEach {
Expand Down Expand Up @@ -144,7 +144,7 @@ loom {

name = "Minecraft Data"
vmArg("-Dfabric-api.datagen")
vmArg("-Dfabric-api.datagen.output-dir=${rootProject.file("src/generated-${"minecraft_version"}/resources")}")
vmArg("-Dfabric-api.datagen.output-dir=${rootProject.file("src/generated-${"minecraft_version"()}/resources")}")
vmArg("-Dfabric-api.datagen.modid=interiors")
vmArg("-Dporting_lib.datagen.existing_resources=${rootProject.file("src/main/resources")}")

Expand Down
11 changes: 0 additions & 11 deletions build.properties
View file

This file was deleted.

34 changes: 5 additions & 29 deletions buildSrc/src/main/kotlin/Manifold.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.gradle.api.Project
import java.util.Properties

object Manifold {
Expand All @@ -11,36 +10,13 @@ object Manifold {
throw IllegalArgumentException("Current version must be one of the provided versions")
}

val properties = mutableListOf<String>()
val sorted = mcVersions.sorted()

val currentIndex = sorted.indexOf(current)

for(i in sorted.indices) {
val mcVer = sorted[i].replace(".", "_")

if(currentIndex < i) {
properties.add("PRE_MC_${mcVer}")
}
if(currentIndex <= i) {
properties.add("PRE_CURRENT_MC_${mcVer}")
}
if(currentIndex > i) {
properties.add("POST_MC_${mcVer}")
}
if(currentIndex >= i) {
properties.add("POST_CURRENT_MC_${mcVer}")
}
if(currentIndex == i) {
properties.add("MC_${mcVer}")
}
}
compilerArgs?.addAll(listOf(
"-AMC=${current.replace(".", "0")}",
"-A${loader.name}"
))

return Properties().apply {
properties.forEach { prop ->
setProperty(prop, "")
compilerArgs?.add("-A$prop")
}
setProperty("MC", current)
setProperty(loader.name, "")
}
}
Expand Down
33 changes: 33 additions & 0 deletions ...urces/data/interiors/advancements/recipes/building_blocks/crafting/chair/black_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_seat": {
"conditions": {
"items": [
{
"tag": "create:seats"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/black_chair"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_seat",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/black_chair"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions ...ors/advancements/recipes/building_blocks/crafting/chair/black_chair_from_floor_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_floor_chair": {
"conditions": {
"items": [
{
"tag": "interiors:floor_chairs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/black_chair_from_floor_chair"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_floor_chair",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/black_chair_from_floor_chair"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions ...ors/advancements/recipes/building_blocks/crafting/chair/black_chair_from_other_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_chair": {
"conditions": {
"items": [
{
"tag": "interiors:chairs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/black_chair_from_other_chair"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_chair",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/black_chair_from_other_chair"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions .../interiors/advancements/recipes/building_blocks/crafting/chair/black_chair_from_seat.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_seat": {
"conditions": {
"items": [
{
"tag": "create:seats"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/black_chair_from_seat"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_seat",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/black_chair_from_seat"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions ...ources/data/interiors/advancements/recipes/building_blocks/crafting/chair/blue_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_seat": {
"conditions": {
"items": [
{
"tag": "create:seats"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/blue_chair"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_seat",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/blue_chair"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions ...iors/advancements/recipes/building_blocks/crafting/chair/blue_chair_from_floor_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_floor_chair": {
"conditions": {
"items": [
{
"tag": "interiors:floor_chairs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/blue_chair_from_floor_chair"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_floor_chair",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/blue_chair_from_floor_chair"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions ...iors/advancements/recipes/building_blocks/crafting/chair/blue_chair_from_other_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_chair": {
"conditions": {
"items": [
{
"tag": "interiors:chairs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/blue_chair_from_other_chair"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_chair",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/blue_chair_from_other_chair"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions ...a/interiors/advancements/recipes/building_blocks/crafting/chair/blue_chair_from_seat.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_seat": {
"conditions": {
"items": [
{
"tag": "create:seats"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/blue_chair_from_seat"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_seat",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/blue_chair_from_seat"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions ...urces/data/interiors/advancements/recipes/building_blocks/crafting/chair/brown_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_seat": {
"conditions": {
"items": [
{
"tag": "create:seats"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "interiors:crafting/chair/brown_chair"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_seat",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"interiors:crafting/chair/brown_chair"
]
},
"sends_telemetry_event": false
}
Loading

0 comments on commit 1008c3d

Please sign in to comment.