Skip to content

Commit

Permalink
Merge pull request #602 from Wall-ev/1.18.2
Browse files Browse the repository at this point in the history 
Sync 1.18.2
  • Loading branch information
@TartaricAcid
TartaricAcid authored Nov 3, 2024
2 parents 08a92fe + 00889c9 commit b219340
Show file tree
Hide file tree
Showing 582 changed files with 27,942 additions and 4,822 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ test

# Files from Forge MDK
forge*changelog.txt
/src/generated/resources/.cache/

# vscode
.vscode
26 changes: 19 additions & 7 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ minecraft {
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
mods {
touhoulittlemaid {
touhou_little_maid {
source sourceSets.main
}
}
Expand All @@ -52,7 +52,7 @@ minecraft {
workingDirectory project.file('run/client_b')
args '--username', 'tartaric_acid'
mods {
touhoulittlemaid {
touhou_little_maid {
source sourceSets.main
}
}
Expand All @@ -63,11 +63,11 @@ minecraft {
workingDirectory project.file('run/server')
property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug'
property 'forge.enabledGameTestNamespaces', 'touhoulittlemaid'
property 'forge.enabledGameTestNamespaces', 'touhou_little_maid'
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
mods {
touhoulittlemaid {
touhou_little_maid {
source sourceSets.main
}
}
Expand All @@ -79,9 +79,9 @@ minecraft {
property 'forge.logging.console.level', 'debug'
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
args '--mod', 'touhoulittlemaid', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
args '--mod', 'touhou_little_maid', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
mods {
touhoulittlemaid {
touhou_little_maid {
source sourceSets.main
}
}
Expand All @@ -106,6 +106,11 @@ repositories {
name = "Progwml6 Maven"
url = "https://dvs1.progwml6.com/files/maven/"
}
maven {
// location of a maven mirror for JEI files, as a fallback
name = "ModMaven"
url = "https://modmaven.dev"
}
maven {
// location of a maven mirror for JEI files, as a fallback
name = "Mod Maven"
Expand Down Expand Up @@ -169,11 +174,18 @@ dependencies {
runtimeOnly fg.deobf("curse.maven:bookshelf-228525:${bookshelf_id}")
runtimeOnly fg.deobf("curse.maven:enchantment-descriptions-250419:${enchantment_descriptions_id}")

implementation fg.deobf('curse.maven:timeless-and-classics-zero-1028108:5529108-sources-5529188')
implementation fg.deobf('curse.maven:timeless-and-classics-zero-1028108:5722012')

implementation fg.deobf("maven.modrinth:simple-hats:1.18.2-0.3.2-forge")
implementation fg.deobf("maven.modrinth:curios:1.18.2-5.0.9.2-forge")

implementation fg.deobf("curse.maven:aquaculture-60028:4501726")

runtimeOnly fg.deobf("maven.modrinth:better-advancements:0.1.2.125-forge")

runtimeOnly fg.deobf("maven.modrinth:embeddium:0.3.18+mc1.18.2")
runtimeOnly fg.deobf('maven.modrinth:oculus:1.18.2-1.6.4')

annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
mod_version=1.1.12-hotfix2
mod_version=1.1.13
forge_version=1.18.2-40.2.0
jei_version=9.7.0.194
patchouli_version=1.18.2-67
Expand Down
37 changes: 37 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/build_altar.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"parent": "touhou_little_maid:base/craft_gohei",
"display": {
"icon": {
"item": "minecraft:red_wool"
},
"title": {
"translate": "advancements.touhou_little_maid.base.build_altar.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.build_altar.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"rewards": {
"loot": [
"touhou_little_maid:advancement/power_point"
]
},
"criteria": {
"maid_event": {
"trigger": "touhou_little_maid:maid/tamed_maid",
"conditions": {
"event": "build_altar"
}
}
},
"requirements": [
[
"maid_event"
]
]
}
32 changes: 32 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/change_chair_model.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "touhou_little_maid:base/craft_chair",
"display": {
"icon": {
"item": "touhou_little_maid:change_chair_model"
},
"title": {
"translate": "advancements.touhou_little_maid.base.change_chair_model.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.change_chair_model.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"criteria": {
"maid_event": {
"trigger": "touhou_little_maid:maid/tamed_maid",
"conditions": {
"event": "change_chair_model"
}
}
},
"requirements": [
[
"maid_event"
]
]
}
32 changes: 32 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_model.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "touhou_little_maid:base/spawn_maid",
"display": {
"icon": {
"item": "touhou_little_maid:change_maid_model"
},
"title": {
"translate": "advancements.touhou_little_maid.base.change_maid_model.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.change_maid_model.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"criteria": {
"maid_event": {
"trigger": "touhou_little_maid:maid/tamed_maid",
"conditions": {
"event": "change_maid_model"
}
}
},
"requirements": [
[
"maid_event"
]
]
}
32 changes: 32 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/change_maid_sound.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "touhou_little_maid:base/spawn_maid",
"display": {
"icon": {
"item": "minecraft:jukebox"
},
"title": {
"translate": "advancements.touhou_little_maid.base.change_maid_sound.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.change_maid_sound.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"criteria": {
"maid_event": {
"trigger": "touhou_little_maid:maid/tamed_maid",
"conditions": {
"event": "change_maid_sound"
}
}
},
"requirements": [
[
"maid_event"
]
]
}
32 changes: 32 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/craft_chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "touhou_little_maid:base/craft_gohei",
"display": {
"icon": {
"item": "touhou_little_maid:chair"
},
"title": {
"translate": "advancements.touhou_little_maid.base.craft_chair.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.craft_chair.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"criteria": {
"craft_chair": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "touhou_little_maid:chair"
}
}
},
"requirements": [
[
"craft_chair"
]
]
}
42 changes: 42 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/craft_gohei.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"display": {
"icon": {
"item": "touhou_little_maid:hakurei_gohei",
"nbt": "{Damage:0}"
},
"title": {
"translate": "advancements.touhou_little_maid.base.craft_gohei.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.craft_gohei.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"rewards": {
"experience": 50
},
"criteria": {
"craft_hakurei_gohei": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "touhou_little_maid:hakurei_gohei"
}
},
"craft_sanae_gohei": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "touhou_little_maid:sanae_gohei"
}
}
},
"requirements": [
[
"craft_hakurei_gohei",
"craft_sanae_gohei"
]
]
}
40 changes: 40 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/kill_maid_fairy.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parent": "touhou_little_maid:base/build_altar",
"display": {
"icon": {
"item": "touhou_little_maid:fairy_spawn_egg"
},
"title": {
"translate": "advancements.touhou_little_maid.base.kill_maid_fairy.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.kill_maid_fairy.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"criteria": {
"killed_entity": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": [
{
"condition": "minecraft:entity_properties",
"predicate": {
"type": "touhou_little_maid:fairy"
},
"entity": "this"
}
]
}
}
},
"requirements": [
[
"killed_entity"
]
]
}
32 changes: 32 additions & 0 deletions src/generated/resources/data/touhou_little_maid/advancements/base/pickup_power_point.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "touhou_little_maid:base/build_altar",
"display": {
"icon": {
"item": "touhou_little_maid:power_point"
},
"title": {
"translate": "advancements.touhou_little_maid.base.pickup_power_point.title"
},
"description": {
"translate": "advancements.touhou_little_maid.base.pickup_power_point.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false,
"background": "touhou_little_maid:textures/advancements/backgrounds/stone.png"
},
"criteria": {
"maid_event": {
"trigger": "touhou_little_maid:maid/tamed_maid",
"conditions": {
"event": "pickup_power_point"
}
}
},
"requirements": [
[
"maid_event"
]
]
}
Loading

0 comments on commit b219340

Please sign in to comment.