Skip to content

feat: mc-snapshot-5 + more convenient dependencies system #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bleudev merged 5 commits into from
Jul 23, 2026
Merged

feat: mc-snapshot-5 + more convenient dependencies system #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c6564c
feat: Implement new versions system from Mod Menu Command (fixes #108)
bleudev Jul 16, 2026
1add0f9
feat: Start rewrite to snapshot 4
bleudev Jul 16, 2026
0d729f9
feat: Snapshot 5
bleudev Jul 23, 2026
db6ccfc
chore: changelog
bleudev Jul 23, 2026
2bea6f3
chore: readme
bleudev Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions 26.1.2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,36 @@ repositories {

dependencies {
// To change the versions see the gradle.properties file
minecraft("com.mojang:minecraft:${project.property("minecraft_version")}")
minecraft("com.mojang:minecraft:${project.property("mc_version")}")
implementation("net.fabricmc:fabric-loader:${project.property("loader_version")}")
implementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}")

implementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}")
implementation("maven.modrinth:modmenu:${project.property("modmenu_version")}")
implementation("maven.modrinth:yacl:${project.property("yacl_version")}")
implementation("maven.modrinth:modmenu:${project.property("modmenu_version")}")

implementation("org.quiltmc.parsers:gson:0.3.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
}

tasks.processResources {
inputs.property("version", project.version)
inputs.property("minecraft_version", project.property("minecraft_version"))
inputs.property("min_mc_version", project.property("min_mc_version"))
inputs.property("max_exc_version", project.property("max_exc_version"))
inputs.property("loader_version", project.property("loader_version"))
inputs.property("fabric_version", project.property("fabric_version"))
inputs.property("modmenu_version", project.property("modmenu_version"))
inputs.property("yacl_version", project.property("yacl_version"))
inputs.property("modmenu_version", project.property("modmenu_version"))
filteringCharset = "UTF-8"

filesMatching("fabric.mod.json") {
expand("version" to project.version,
"minecraft_version" to project.property("minecraft_version")!!,
"min_mc_version" to project.property("min_mc_version")!!,
"max_exc_version" to project.property("max_exc_version")!!,
"loader_version" to project.property("loader_version")!!,
"fabric_version" to project.property("fabric_version")!!,
"modmenu_version" to project.property("modmenu_version")!!,
"yacl_version" to project.property("yacl_version")!!,
"modmenu_version" to project.property("modmenu_version")!!,
"kotlin_loader_version" to project.property("kotlin_loader_version")!!)
}
}
Expand Down
6 changes: 3 additions & 3 deletions 26.1.2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ mod_version=
changelog=
readme=
# Dependencies
fabric_version=0.149.0+26.1.2
modmenu_version=18.0.0-beta.1
yacl_version=3.9.5+26.1-fabric
fabric_version=
yacl_version=
modmenu_version=
2 changes: 1 addition & 1 deletion 26.1.2/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"fabricloader": ">=${loader_version}",
"fabric-language-kotlin": ">=${kotlin_loader_version}",
"fabric-api": ">=${fabric_version}",
"minecraft": ">=${minecraft_version} <${max_exc_version}",
"minecraft": ">=${min_mc_version} <${max_exc_version}",
"yet_another_config_lib_v3": ">=${yacl_version}"
}
}
12 changes: 6 additions & 6 deletions 26.2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,36 @@ repositories {

dependencies {
// To change the versions see the gradle.properties file
minecraft("com.mojang:minecraft:${project.property("minecraft_version")}")
minecraft("com.mojang:minecraft:${project.property("mc_version")}")
implementation("net.fabricmc:fabric-loader:${project.property("loader_version")}")
implementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}")

implementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}")
implementation("maven.modrinth:modmenu:${project.property("modmenu_version")}")
implementation("maven.modrinth:yacl:${project.property("yacl_version")}")
implementation("maven.modrinth:modmenu:${project.property("modmenu_version")}")

implementation("org.quiltmc.parsers:gson:0.3.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
}

tasks.processResources {
inputs.property("version", project.version)
inputs.property("minecraft_version", project.property("minecraft_version"))
inputs.property("min_mc_version", project.property("min_mc_version"))
inputs.property("max_exc_version", project.property("max_exc_version"))
inputs.property("loader_version", project.property("loader_version"))
inputs.property("fabric_version", project.property("fabric_version"))
inputs.property("modmenu_version", project.property("modmenu_version"))
inputs.property("yacl_version", project.property("yacl_version"))
inputs.property("modmenu_version", project.property("modmenu_version"))
filteringCharset = "UTF-8"

filesMatching("fabric.mod.json") {
expand("version" to project.version,
"minecraft_version" to project.property("minecraft_version")!!,
"min_mc_version" to project.property("min_mc_version")!!,
"max_exc_version" to project.property("max_exc_version")!!,
"loader_version" to project.property("loader_version")!!,
"fabric_version" to project.property("fabric_version")!!,
"modmenu_version" to project.property("modmenu_version")!!,
"yacl_version" to project.property("yacl_version")!!,
"modmenu_version" to project.property("modmenu_version")!!,
"kotlin_loader_version" to project.property("kotlin_loader_version")!!)
}
}
Expand Down
6 changes: 3 additions & 3 deletions 26.2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ mod_version=
changelog=
readme=
# Dependencies
fabric_version=0.154.0+26.2
modmenu_version=20.0.0-beta.4
yacl_version=3.9.5+26.2-fabric
fabric_version=
yacl_version=
modmenu_version=
2 changes: 1 addition & 1 deletion 26.2/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"fabricloader": ">=${loader_version}",
"fabric-language-kotlin": ">=${kotlin_loader_version}",
"fabric-api": ">=${fabric_version}",
"minecraft": ">=${minecraft_version} <${max_exc_version}",
"minecraft": ">=${min_mc_version} <${max_exc_version}",
"yet_another_config_lib_v3": ">=${yacl_version}"
}
}
12 changes: 6 additions & 6 deletions 26.3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,36 @@ repositories {

dependencies {
// To change the versions see the gradle.properties file
minecraft("com.mojang:minecraft:${project.property("minecraft_version")}")
minecraft("com.mojang:minecraft:${project.property("mc_version")}")
implementation("net.fabricmc:fabric-loader:${project.property("loader_version")}")
implementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}")

implementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}")
implementation("maven.modrinth:modmenu:${project.property("modmenu_version")}")
implementation("maven.modrinth:yacl:${project.property("yacl_version")}")
implementation("maven.modrinth:modmenu:${project.property("modmenu_version")}")

implementation("org.quiltmc.parsers:gson:0.3.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
}

tasks.processResources {
inputs.property("version", project.version)
inputs.property("minecraft_version", project.property("minecraft_version"))
inputs.property("min_mc_version", project.property("min_mc_version"))
inputs.property("max_exc_version", project.property("max_exc_version"))
inputs.property("loader_version", project.property("loader_version"))
inputs.property("fabric_version", project.property("fabric_version"))
inputs.property("modmenu_version", project.property("modmenu_version"))
inputs.property("yacl_version", project.property("yacl_version"))
inputs.property("modmenu_version", project.property("modmenu_version"))
filteringCharset = "UTF-8"

filesMatching("fabric.mod.json") {
expand("version" to project.version,
"minecraft_version" to project.property("minecraft_version")!!,
"min_mc_version" to project.property("min_mc_version")!!,
"max_exc_version" to project.property("max_exc_version")!!,
"loader_version" to project.property("loader_version")!!,
"fabric_version" to project.property("fabric_version")!!,
"modmenu_version" to project.property("modmenu_version")!!,
"yacl_version" to project.property("yacl_version")!!,
"modmenu_version" to project.property("modmenu_version")!!,
"kotlin_loader_version" to project.property("kotlin_loader_version")!!)
}
}
Expand Down
6 changes: 3 additions & 3 deletions 26.3/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ mod_version=
changelog=
readme=
# Dependencies
fabric_version=0.154.3+26.3
modmenu_version=20.0.0
yacl_version=3.9.5+26.3-fabric
fabric_version=
yacl_version=
modmenu_version=
3 changes: 1 addition & 2 deletions 26.3/src/main/java/com/bleudev/nine_lifes/mixin/client/GameRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.mojang.blaze3d.resource.CrossFrameResourcePool;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.ItemInHandRenderer;
Expand Down Expand Up @@ -32,7 +31,7 @@ private void initCustomShadersRenderer(Minecraft minecraft, ItemInHandRenderer i
}

@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;blitEntityOutline()V", shift = At.Shift.AFTER))
private void renderAdditionalShader(DeltaTracker deltaTracker, boolean advanceGameTime, CallbackInfo ci) {
private void renderAdditionalShader(CallbackInfo ci) {
nineLifesPostRenderer.render();
}
}
9 changes: 5 additions & 4 deletions .../main/kotlin/com/bleudev/nine_lifes/custom/advancements/criterion/AdvancementCriterion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.advancements.Advancement
import net.minecraft.advancements.AdvancementHolder
import net.minecraft.advancements.predicates.ContextAwarePredicate
import net.minecraft.advancements.triggers.Criterion
import net.minecraft.advancements.triggers.SimpleCriterionTrigger
import net.minecraft.core.Holder
import net.minecraft.resources.Identifier
import net.minecraft.server.level.ServerPlayer
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
import java.util.*

class AdvancementCriterion : SimpleCriterionTrigger<AdvancementCriterion.TriggerInstance> {
Expand All @@ -20,12 +21,12 @@ class AdvancementCriterion : SimpleCriterionTrigger<AdvancementCriterion.Trigger

fun require(advancement: AdvancementHolder): Criterion<TriggerInstance> = createCriterion(TriggerInstance(Optional.empty(), advancement))

data class TriggerInstance(val playerPredicate: Optional<ContextAwarePredicate>, val holder: AdvancementHolder): SimpleInstance {
override fun player(): Optional<ContextAwarePredicate> = playerPredicate
data class TriggerInstance(val playerPredicate: Optional<Holder<LootItemCondition>>, val holder: AdvancementHolder): SimpleInstance {
override fun player(): Optional<Holder<LootItemCondition>> = playerPredicate

companion object {
val CODEC: Codec<TriggerInstance> = RecordCodecBuilder.create { it.group(
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
LootItemCondition.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
RecordCodecBuilder.create { it2 -> it2.group(
Identifier.CODEC.fieldOf("id").forGetter(AdvancementHolder::id),
Advancement.CODEC.fieldOf("value").forGetter(AdvancementHolder::value)
Expand Down
9 changes: 5 additions & 4 deletions ...c/main/kotlin/com/bleudev/nine_lifes/custom/advancements/criterion/AlmostDeadCriterion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package com.bleudev.nine_lifes.custom.advancements.criterion
import com.bleudev.nine_lifes.util.lifes
import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.advancements.predicates.ContextAwarePredicate
import net.minecraft.advancements.triggers.Criterion
import net.minecraft.advancements.triggers.SimpleCriterionTrigger
import net.minecraft.core.Holder
import net.minecraft.server.level.ServerPlayer
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
import java.util.*

class AlmostDeadCriterion : SimpleCriterionTrigger<AlmostDeadCriterion.TriggerInstance> {
Expand All @@ -18,14 +19,14 @@ class AlmostDeadCriterion : SimpleCriterionTrigger<AlmostDeadCriterion.TriggerIn

fun require(lifes: Int, health: Float): Criterion<TriggerInstance> = createCriterion(TriggerInstance(Optional.empty(), lifes, health))

data class TriggerInstance(val playerPredicate: Optional<ContextAwarePredicate>, val lifes: Int, val maxHealth: Float): SimpleInstance {
override fun player(): Optional<ContextAwarePredicate> = playerPredicate
data class TriggerInstance(val playerPredicate: Optional<Holder<LootItemCondition>>, val lifes: Int, val maxHealth: Float): SimpleInstance {
override fun player(): Optional<Holder<LootItemCondition>> = playerPredicate

fun requirementsMet(lifes: Int, health: Float): Boolean = (lifes == this@TriggerInstance.lifes) && (health <= maxHealth)

companion object {
val CODEC: Codec<TriggerInstance> = RecordCodecBuilder.create { it.group(
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
LootItemCondition.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
Codec.INT.fieldOf("lifes").forGetter(TriggerInstance::lifes),
Codec.FLOAT.fieldOf("maxHealth").forGetter(TriggerInstance::maxHealth),
).apply(it, ::TriggerInstance) }
Expand Down
9 changes: 5 additions & 4 deletions ...otlin/com/bleudev/nine_lifes/custom/advancements/criterion/BedSleepingProblemCriterion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package com.bleudev.nine_lifes.custom.advancements.criterion

import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.advancements.predicates.ContextAwarePredicate
import net.minecraft.advancements.triggers.Criterion
import net.minecraft.advancements.triggers.SimpleCriterionTrigger
import net.minecraft.core.Holder
import net.minecraft.network.chat.contents.TranslatableContents
import net.minecraft.server.level.ServerPlayer
import net.minecraft.world.entity.player.Player
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
import java.util.*

class BedSleepingProblemCriterion : SimpleCriterionTrigger<BedSleepingProblemCriterion.TriggerInstance> {
Expand All @@ -20,14 +21,14 @@ class BedSleepingProblemCriterion : SimpleCriterionTrigger<BedSleepingProblemCri
fun require(vararg problems: Player.BedSleepingProblem): Criterion<TriggerInstance> = createCriterion(
TriggerInstance(Optional.empty(), problems.mapNotNull{(it.message?.contents as? TranslatableContents)?.key}))

data class TriggerInstance(val playerPredicate: Optional<ContextAwarePredicate>, val problems: List<String>): SimpleInstance {
override fun player(): Optional<ContextAwarePredicate> = playerPredicate
data class TriggerInstance(val playerPredicate: Optional<Holder<LootItemCondition>>, val problems: List<String>): SimpleInstance {
override fun player(): Optional<Holder<LootItemCondition>> = playerPredicate

fun requirementsMet(problem: Player.BedSleepingProblem): Boolean = (problem.message?.contents as? TranslatableContents)?.key in problems

companion object {
val CODEC: Codec<TriggerInstance> = RecordCodecBuilder.create { it.group(
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
LootItemCondition.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
Codec.list(Codec.STRING).fieldOf("problems").forGetter(TriggerInstance::problems)
).apply(it, ::TriggerInstance) }
}
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/kotlin/com/bleudev/nine_lifes/custom/advancements/criterion/ChargeItemCriterion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package com.bleudev.nine_lifes.custom.advancements.criterion

import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.advancements.predicates.ContextAwarePredicate
import net.minecraft.advancements.triggers.Criterion
import net.minecraft.advancements.triggers.SimpleCriterionTrigger
import net.minecraft.core.Holder
import net.minecraft.server.level.ServerPlayer
import net.minecraft.world.item.Item
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
import java.util.*

class ChargeItemCriterion : SimpleCriterionTrigger<ChargeItemCriterion.TriggerInstance> {
Expand All @@ -20,15 +20,15 @@ class ChargeItemCriterion : SimpleCriterionTrigger<ChargeItemCriterion.TriggerIn
fun require(item: Holder<Item>, distance: Double): Criterion<TriggerInstance> = createCriterion(TriggerInstance(Optional.empty(), item, distance))
fun require(item: Item, distance: Double) = require(item.builtInRegistryHolder(), distance)

data class TriggerInstance(val playerPredicate: Optional<ContextAwarePredicate>, val item: Holder<Item>, val distance: Double): SimpleInstance {
override fun player(): Optional<ContextAwarePredicate> = playerPredicate
data class TriggerInstance(val playerPredicate: Optional<Holder<LootItemCondition>>, val item: Holder<Item>, val distance: Double): SimpleInstance {
override fun player(): Optional<Holder<LootItemCondition>> = playerPredicate

fun requirementsMet(chargedItem: Item, distance: Double): Boolean =
(item.value() == chargedItem) && (distance <= this.distance)

companion object {
val CODEC: Codec<TriggerInstance> = RecordCodecBuilder.create { it.group(
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
LootItemCondition.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
Item.CODEC.fieldOf("item").forGetter(TriggerInstance::item),
Codec.DOUBLE.fieldOf("distance").forGetter(TriggerInstance::distance),
).apply(it, ::TriggerInstance) }
Expand Down
9 changes: 5 additions & 4 deletions .../main/kotlin/com/bleudev/nine_lifes/custom/advancements/criterion/LifesChangeCriterion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package com.bleudev.nine_lifes.custom.advancements.criterion

import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.advancements.predicates.ContextAwarePredicate
import net.minecraft.advancements.triggers.Criterion
import net.minecraft.advancements.triggers.SimpleCriterionTrigger
import net.minecraft.core.Holder
import net.minecraft.server.level.ServerPlayer
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
import java.util.*
import kotlin.math.abs

Expand All @@ -18,14 +19,14 @@ class LifesChangeCriterion : SimpleCriterionTrigger<LifesChangeCriterion.Trigger

fun require(minDelta: Int, charged: Boolean): Criterion<TriggerInstance> = createCriterion(TriggerInstance(Optional.empty(), minDelta, charged))

data class TriggerInstance(val playerPredicate: Optional<ContextAwarePredicate>, val minDelta: Int, val charged: Boolean): SimpleInstance {
override fun player(): Optional<ContextAwarePredicate> = playerPredicate
data class TriggerInstance(val playerPredicate: Optional<Holder<LootItemCondition>>, val minDelta: Int, val charged: Boolean): SimpleInstance {
override fun player(): Optional<Holder<LootItemCondition>> = playerPredicate

fun requirementsMet(delta: Int, charged: Boolean): Boolean = (charged == this.charged) && (abs(delta) >= abs(minDelta)) && ((delta >= 0 && minDelta >= 0) || (delta <= 0 && minDelta <= 0))

companion object {
val CODEC: Codec<TriggerInstance> = RecordCodecBuilder.create { it.group(
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
LootItemCondition.CODEC.optionalFieldOf("player").forGetter(TriggerInstance::player),
Codec.INT.fieldOf("minDelta").forGetter(TriggerInstance::minDelta),
Codec.BOOL.fieldOf("charged").forGetter(TriggerInstance::charged),
).apply(it, ::TriggerInstance) }
Expand Down
Loading