Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 7 additions & 8 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 12 additions & 22 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
minecraft = "26.1"
fabric-loader = "0.18.4"
minecraft = "26.2-rc-2"
fabric-loader = "0.19.3"

fabric-api = "0.144.1+26.1"
fabric-api = "0.152.1+26.2"

# Kotlin
kotlin = "2.3.10"
# Also modrinth version in gradle.properties
fabric-kotlin = "1.13.9+kotlin.2.3.10"

fabric-permissions = "0.7.0"
translations = "3.0.0+26.1-pre-3"
translations = "3.1.0+26.2"

exposed = "1.0.0-rc-2"
sqlite-jdbc = "3.50.3.0"
Expand Down Expand Up @@ -43,5 +43,5 @@ detekt-formatting = { module = "dev.detekt:detekt-rules-ktlint-wrapper", version
[plugins]
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
detekt = { id = "dev.detekt", version.ref = "detekt" }
loom = { id = "net.fabricmc.fabric-loom", version = "1.15.+" }
loom = { id = "net.fabricmc.fabric-loom", version = "1.17.+" }
git_hooks = { id = "com.github.jakemarsden.git-hooks", version = "0.0.2" }
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.github.quiltservertools.ledger.callbacks.BlockBreakCallback;
import com.github.quiltservertools.ledger.utility.Sources;
import net.minecraft.world.level.block.SpeleothemBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.PointedDripstoneBlock;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.util.RandomSource;
Expand All @@ -12,8 +12,8 @@
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(PointedDripstoneBlock.class)
public abstract class PointedDripstoneBlockMixin {
@Mixin(SpeleothemBlock.class)
public abstract class SpeleothemBlockMixin {

@Inject(method = "tick", at = @At(value = "INVOKE",
target = "Lnet/minecraft/server/level/ServerLevel;destroyBlock(Lnet/minecraft/core/BlockPos;Z)Z"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

@Mixin(Evoker.EvokerWololoSpellGoal.class)
public abstract class EvokerEntityWololoGoalMixin {
Expand All @@ -31,7 +30,7 @@ public void legerLogOldEntity(CallbackInfo ci, @Local Sheep sheepEntity) {
@Inject(method = "performSpellCasting", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/animal/sheep/Sheep;setColor(Lnet/minecraft/world/item/DyeColor;)V", shift = At.Shift.AFTER))
public void ledgerEvokerDyeSheep(CallbackInfo ci, @Local Sheep sheepEntity) {
if (oldEntityTags != null) {
EntityModifyCallback.EVENT.invoker().modify(sheepEntity.level(), sheepEntity.blockPosition(), oldEntityTags, sheepEntity, Items.RED_DYE.getDefaultInstance(), null, Sources.DYE);
EntityModifyCallback.EVENT.invoker().modify(sheepEntity.level(), sheepEntity.blockPosition(), oldEntityTags, sheepEntity, Items.DYE.red().getDefaultInstance(), null, Sources.DYE);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import net.minecraft.network.chat.HoverEvent
import net.minecraft.server.MinecraftServer
import net.minecraft.util.ProblemReporter
import net.minecraft.world.entity.Entity
import net.minecraft.world.entity.EntityType
import net.minecraft.world.entity.EntityTypes
import net.minecraft.world.entity.item.ItemEntity
import net.minecraft.world.item.ItemStackTemplate
import net.minecraft.world.level.storage.TagValueInput
Expand Down Expand Up @@ -70,7 +70,7 @@ open class ItemDropActionType : AbstractActionType() {
val entity = world.getEntity(optionalUUID.get())

if (entity == null) {
val entity = ItemEntity(EntityType.ITEM, world)
val entity = ItemEntity(EntityTypes.ITEM, world)
ProblemReporter.ScopedCollector({ "ledger:restore:item-drop@$pos" }, LOGGER).use {
val readView = TagValueInput.create(it, world.registryAccess(), newEntity)
entity.load(readView)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import net.minecraft.network.chat.HoverEvent
import net.minecraft.server.MinecraftServer
import net.minecraft.util.ProblemReporter
import net.minecraft.world.entity.Entity
import net.minecraft.world.entity.EntityType
import net.minecraft.world.entity.EntityTypes
import net.minecraft.world.entity.item.ItemEntity
import net.minecraft.world.item.ItemStackTemplate
import net.minecraft.world.level.storage.TagValueInput
Expand Down Expand Up @@ -54,7 +54,7 @@ open class ItemPickUpActionType : AbstractActionType() {
val entity = world.getEntity(optionalUUID.get())

if (entity == null) {
val entity = ItemEntity(EntityType.ITEM, world)
val entity = ItemEntity(EntityTypes.ITEM, world)
ProblemReporter.ScopedCollector({ "ledger:rollback:item-pick-up@$pos" }, LOGGER).use {
val readView = TagValueInput.create(it, world.registryAccess(), oldEntity)
entity.load(readView)
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"depends": {
"fabricloader": ">=0.18.4",
"fabric-language-kotlin": ">=${fabricKotlin}",
"minecraft": ">=${minecraft}",
"minecraft": "~26.2-",
"fabric-api": ">=${fabricApi}"
},
"breaks": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/ledger.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"blocks.LeverBlockMixin",
"blocks.LiquidBlockMixin",
"blocks.NoteBlockMixin",
"blocks.PointedDripstoneBlockMixin",
"blocks.SpeleothemBlockMixin",
"blocks.RepeaterBlockMixin",
"blocks.RootedDirtBlockMixin",
"blocks.ScaffoldingBlockMixin",
Expand Down
Loading