diff --git a/build.gradle b/build.gradle index 5ffa04a..89b228b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.3-SNAPSHOT" + id "fabric-loom" version "1.5.+" id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index df38916..76c4570 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,13 +8,13 @@ archives_base_name=build_rush # Fabric Properties # check these on https://fabricmc.net/develop/ -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.10 -loader_version=0.14.21 -fabric_version=0.86.1+1.20.1 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.1 +loader_version=0.15.6 +fabric_version=0.91.1+1.20.4 # check this on https://nucleoid.xyz/use/ -plasmid_version=0.5.101-SNAPSHOT+1.20.1 +plasmid_version=0.5.102-SNAPSHOT+1.20.4 # check this on https://modrinth.com/mod/nota/changelog nota_version=0.1.0+1.19.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59bc51a..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/fr/hugman/build_rush/build/BuildUtil.java b/src/main/java/fr/hugman/build_rush/build/BuildUtil.java index bfd389b..3a7ef9f 100644 --- a/src/main/java/fr/hugman/build_rush/build/BuildUtil.java +++ b/src/main/java/fr/hugman/build_rush/build/BuildUtil.java @@ -6,17 +6,16 @@ import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.enums.BedPart; +import net.minecraft.block.enums.BlockFace; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.block.enums.SlabType; -import net.minecraft.block.enums.WallMountLocation; import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.item.SkullItem; +import net.minecraft.item.PlayerHeadItem; import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.tag.BlockTags; -import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -34,7 +33,7 @@ public static boolean areEqual(BlockState sourceState, @Nullable NbtCompound sou if(sourceBlock != targetBlock) return false; if(sourceBlock instanceof ButtonBlock) { - if(sourceState.get(ButtonBlock.FACE) == WallMountLocation.WALL) { + if(sourceState.get(ButtonBlock.FACE) == BlockFace.WALL) { return sourceState.get(ButtonBlock.FACING) == targetState.get(ButtonBlock.FACING); } @@ -185,7 +184,7 @@ public static int getBuildComplexity(CachedBlocks build) { public static void addBlockEntityNbt(ItemStack stack, BlockEntity blockEntity) { NbtCompound nbtCompound = blockEntity.createNbtWithIdentifyingData(); BlockItem.setBlockEntityNbt(stack, blockEntity.getType(), nbtCompound); - if (stack.getItem() instanceof SkullItem && nbtCompound.contains("SkullOwner")) { + if (stack.getItem() instanceof PlayerHeadItem && nbtCompound.contains("SkullOwner")) { NbtCompound nbtCompound2 = nbtCompound.getCompound("SkullOwner"); NbtCompound nbtCompound3 = stack.getOrCreateNbt(); nbtCompound3.put("SkullOwner", nbtCompound2); diff --git a/src/main/java/fr/hugman/build_rush/game/state/BRActive.java b/src/main/java/fr/hugman/build_rush/game/state/BRActive.java index b7fa339..e2d4390 100644 --- a/src/main/java/fr/hugman/build_rush/game/state/BRActive.java +++ b/src/main/java/fr/hugman/build_rush/game/state/BRActive.java @@ -272,6 +272,7 @@ public void enable(List plots) { } this.songManager.addPlayers(this.space.getPlayers()); + this.songManager.setVolume((byte) 80); this.songManager.setPlaying(true); } @@ -279,7 +280,7 @@ public void tick() { this.tick++; if (this.isClosing()) { var progress = (float) (this.closeTick - this.tick) / this.closeTicks; - this.songManager.setVolume((byte) (progress * 100)); + this.songManager.setVolume((byte) (progress * 80)); if (this.tick >= this.closeTick) { this.space.close(GameCloseReason.FINISHED); }