Skip to content

Commit f3dcd23

Browse files
committed
Update to 1.21.5
1 parent a484843 commit f3dcd23

9 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Cache
11-
uses: actions/cache@v2
11+
uses: actions/cache@v4
1212
with:
1313
path: |
1414
~/.gradle/loom-cache
@@ -19,7 +19,7 @@ jobs:
1919
gradle-
2020
2121
- name: Checkout
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2323
- name: Set up JDK
2424
uses: actions/setup-java@v1
2525
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515

1616
- name: Checkout repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Set up JDK 21
2020
uses: actions/setup-java@v1

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "fabric-loom" version "1.8.+"
2+
id "fabric-loom" version "1.10.+"
33
id 'maven-publish'
44
}
55

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ archives_base_name=build_rush
88

99
# Fabric Properties
1010
# check these on https://fabricmc.net/develop/
11-
minecraft_version=1.21.4
12-
yarn_mappings=1.21.4+build.2
13-
loader_version=0.16.9
14-
fabric_version=0.112.2+1.21.4
11+
minecraft_version=1.21.5
12+
yarn_mappings=1.21.5+build.1
13+
loader_version=0.16.13
14+
fabric_version=0.119.0+1.21.5
1515

1616
# check this on https://nucleoid.xyz/use/
17-
plasmid_version=0.6.3-SNAPSHOT+1.21.4
17+
plasmid_version=0.6.4+1.21.5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/fr/hugman/build_rush/build/BuildItemCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import net.minecraft.block.enums.SlabType;
1111
import net.minecraft.component.DataComponentTypes;
1212
import net.minecraft.component.type.PotionContentsComponent;
13-
import net.minecraft.component.type.UnbreakableComponent;
1413
import net.minecraft.fluid.Fluids;
1514
import net.minecraft.item.*;
1615
import net.minecraft.nbt.NbtCompound;
@@ -20,6 +19,7 @@
2019
import net.minecraft.state.property.IntProperty;
2120
import net.minecraft.state.property.Properties;
2221
import net.minecraft.state.property.Property;
22+
import net.minecraft.util.Unit;
2323
import net.minecraft.util.math.BlockPos;
2424
import org.jetbrains.annotations.Nullable;
2525

@@ -226,7 +226,7 @@ private static void setCount(ItemStack stack, BlockState state, IntProperty prop
226226
}
227227

228228
private static void setUnbreakable(ItemStack stack) {
229-
stack.set(DataComponentTypes.UNBREAKABLE, new UnbreakableComponent(false));
229+
stack.set(DataComponentTypes.UNBREAKABLE, Unit.INSTANCE);
230230
}
231231

232232
public static void addBlockEntityNbt(ServerWorld world, ItemStack stack, BlockEntity blockEntity) {

src/main/java/fr/hugman/build_rush/game/state/BRActive.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ public void give(PlayerEntity player, ItemStack stack, @Nullable BuildItemCollec
458458
}
459459

460460
if (giveToHand) {
461-
var slot = player.getInventory().selectedSlot;
461+
var slot = player.getInventory().getSelectedSlot();
462462
var oldStack = player.getInventory().getStack(slot);
463463
if (oldStack.isEmpty()) {
464464
player.getInventory().setStack(slot, stack.copy());

src/main/java/fr/hugman/build_rush/mixin/AbstractBlockStateMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ private void onUse(World world, PlayerEntity player, BlockHitResult hit, Callbac
2828
if (result == ActionResult.FAIL) {
2929
// notify the client that this action did not go through
3030
var stack = player.getMainHandStack();
31-
((ServerPlayerEntity)player).networkHandler.sendPacket(new ScreenHandlerSlotUpdateS2CPacket(0, 0, player.getInventory().selectedSlot, stack));
31+
((ServerPlayerEntity)player).networkHandler.sendPacket(new ScreenHandlerSlotUpdateS2CPacket(0, 0, player.getInventory().getSelectedSlot(), stack));
3232

3333
cir.setReturnValue(ActionResult.FAIL);
3434
}

src/main/java/fr/hugman/build_rush/mixin/ItemStackMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private void useOnBlock(ItemUsageContext context, CallbackInfoReturnable<ActionR
2727

2828
if (result == ActionResult.FAIL) {
2929
// notify the client that this action did not go through
30-
int slot = context.getHand() == Hand.MAIN_HAND ? player.getInventory().selectedSlot : 40;
30+
int slot = context.getHand() == Hand.MAIN_HAND ? player.getInventory().getSelectedSlot() : 40;
3131
var stack = context.getStack();
3232
((ServerPlayerEntity)player).networkHandler.sendPacket(new ScreenHandlerSlotUpdateS2CPacket(0, 0, slot, stack));
3333

0 commit comments

Comments
 (0)