Skip to content

Commit

Permalink
Update to 1.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Patbox committed Mar 4, 2024
1 parent 742e2f3 commit ef7b06c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "fabric-loom" version "1.3-SNAPSHOT"
id "fabric-loom" version "1.5.+"
id 'maven-publish'
}

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
9 changes: 4 additions & 5 deletions src/main/java/fr/hugman/build_rush/build/BuildUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

Expand Down Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/hugman/build_rush/game/state/BRActive.java
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,15 @@ public void enable(List<Plot> plots) {
}

this.songManager.addPlayers(this.space.getPlayers());
this.songManager.setVolume((byte) 80);
this.songManager.setPlaying(true);
}

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);
}
Expand Down

0 comments on commit ef7b06c

Please sign in to comment.