Skip to content

Commit 3308962

Browse files
DrexHDDrexHD
committed
Update to 26.2
1 parent 1126b49 commit 3308962

8 files changed

Lines changed: 16 additions & 17 deletions

File tree

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎libs.versions.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[versions]
2-
minecraft = "26.1"
3-
fabric-loader = "0.18.4"
2+
minecraft = "26.2-rc-2"
3+
fabric-loader = "0.19.3"
44

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

77
# Kotlin
88
kotlin = "2.3.10"
99
# Also modrinth version in gradle.properties
1010
fabric-kotlin = "1.13.9+kotlin.2.3.10"
1111

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

1515
exposed = "1.0.0-rc-2"
1616
sqlite-jdbc = "3.50.3.0"
@@ -43,5 +43,5 @@ detekt-formatting = { module = "dev.detekt:detekt-rules-ktlint-wrapper", version
4343
[plugins]
4444
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
4545
detekt = { id = "dev.detekt", version.ref = "detekt" }
46-
loom = { id = "net.fabricmc.fabric-loom", version = "1.15.+" }
46+
loom = { id = "net.fabricmc.fabric-loom", version = "1.17.+" }
4747
git_hooks = { id = "com.github.jakemarsden.git-hooks", version = "0.0.2" }

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/PointedDripstoneBlockMixin.java renamed to src/main/java/com/github/quiltservertools/ledger/mixin/blocks/SpeleothemBlockMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.github.quiltservertools.ledger.callbacks.BlockBreakCallback;
44
import com.github.quiltservertools.ledger.utility.Sources;
5+
import net.minecraft.world.level.block.SpeleothemBlock;
56
import net.minecraft.world.level.block.state.BlockState;
6-
import net.minecraft.world.level.block.PointedDripstoneBlock;
77
import net.minecraft.server.level.ServerLevel;
88
import net.minecraft.core.BlockPos;
99
import net.minecraft.util.RandomSource;
@@ -12,8 +12,8 @@
1212
import org.spongepowered.asm.mixin.injection.Inject;
1313
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1414

15-
@Mixin(PointedDripstoneBlock.class)
16-
public abstract class PointedDripstoneBlockMixin {
15+
@Mixin(SpeleothemBlock.class)
16+
public abstract class SpeleothemBlockMixin {
1717

1818
@Inject(method = "tick", at = @At(value = "INVOKE",
1919
target = "Lnet/minecraft/server/level/ServerLevel;destroyBlock(Lnet/minecraft/core/BlockPos;Z)Z"))

‎src/main/java/com/github/quiltservertools/ledger/mixin/entities/EvokerEntityWololoGoalMixin.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.spongepowered.asm.mixin.injection.At;
1515
import org.spongepowered.asm.mixin.injection.Inject;
1616
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
17-
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
1817

1918
@Mixin(Evoker.EvokerWololoSpellGoal.class)
2019
public abstract class EvokerEntityWololoGoalMixin {
@@ -31,7 +30,7 @@ public void legerLogOldEntity(CallbackInfo ci, @Local Sheep sheepEntity) {
3130
@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))
3231
public void ledgerEvokerDyeSheep(CallbackInfo ci, @Local Sheep sheepEntity) {
3332
if (oldEntityTags != null) {
34-
EntityModifyCallback.EVENT.invoker().modify(sheepEntity.level(), sheepEntity.blockPosition(), oldEntityTags, sheepEntity, Items.RED_DYE.getDefaultInstance(), null, Sources.DYE);
33+
EntityModifyCallback.EVENT.invoker().modify(sheepEntity.level(), sheepEntity.blockPosition(), oldEntityTags, sheepEntity, Items.DYE.red().getDefaultInstance(), null, Sources.DYE);
3534
}
3635
}
3736
}

‎src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemDropActionType.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import net.minecraft.network.chat.HoverEvent
1414
import net.minecraft.server.MinecraftServer
1515
import net.minecraft.util.ProblemReporter
1616
import net.minecraft.world.entity.Entity
17-
import net.minecraft.world.entity.EntityType
17+
import net.minecraft.world.entity.EntityTypes
1818
import net.minecraft.world.entity.item.ItemEntity
1919
import net.minecraft.world.item.ItemStackTemplate
2020
import net.minecraft.world.level.storage.TagValueInput
@@ -70,7 +70,7 @@ open class ItemDropActionType : AbstractActionType() {
7070
val entity = world.getEntity(optionalUUID.get())
7171

7272
if (entity == null) {
73-
val entity = ItemEntity(EntityType.ITEM, world)
73+
val entity = ItemEntity(EntityTypes.ITEM, world)
7474
ProblemReporter.ScopedCollector({ "ledger:restore:item-drop@$pos" }, LOGGER).use {
7575
val readView = TagValueInput.create(it, world.registryAccess(), newEntity)
7676
entity.load(readView)

‎src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemPickUpActionType.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import net.minecraft.network.chat.HoverEvent
1414
import net.minecraft.server.MinecraftServer
1515
import net.minecraft.util.ProblemReporter
1616
import net.minecraft.world.entity.Entity
17-
import net.minecraft.world.entity.EntityType
17+
import net.minecraft.world.entity.EntityTypes
1818
import net.minecraft.world.entity.item.ItemEntity
1919
import net.minecraft.world.item.ItemStackTemplate
2020
import net.minecraft.world.level.storage.TagValueInput
@@ -54,7 +54,7 @@ open class ItemPickUpActionType : AbstractActionType() {
5454
val entity = world.getEntity(optionalUUID.get())
5555

5656
if (entity == null) {
57-
val entity = ItemEntity(EntityType.ITEM, world)
57+
val entity = ItemEntity(EntityTypes.ITEM, world)
5858
ProblemReporter.ScopedCollector({ "ledger:rollback:item-pick-up@$pos" }, LOGGER).use {
5959
val readView = TagValueInput.create(it, world.registryAccess(), oldEntity)
6060
entity.load(readView)

‎src/main/resources/fabric.mod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"depends": {
2929
"fabricloader": ">=0.18.4",
3030
"fabric-language-kotlin": ">=${fabricKotlin}",
31-
"minecraft": ">=${minecraft}",
31+
"minecraft": "~26.2-",
3232
"fabric-api": ">=${fabricApi}"
3333
},
3434
"breaks": {

‎src/main/resources/ledger.mixins.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"blocks.LeverBlockMixin",
6161
"blocks.LiquidBlockMixin",
6262
"blocks.NoteBlockMixin",
63-
"blocks.PointedDripstoneBlockMixin",
63+
"blocks.SpeleothemBlockMixin",
6464
"blocks.RepeaterBlockMixin",
6565
"blocks.RootedDirtBlockMixin",
6666
"blocks.ScaffoldingBlockMixin",

0 commit comments

Comments
 (0)