Skip to content

Commit

Permalink
Update minigame to Minecraft 1.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
haykam821 committed Feb 12, 2024
1 parent a21618d commit 1ad87fe
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 39 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ mod_version = 1.0.0
org.gradle.jvmargs = -Xmx1G

# Versions
minecraft_version = 1.20.2
yarn_mappings = 1.20.2+build.4
minecraft_version = 1.20.4
yarn_mappings = 1.20.4+build.3
loader_version = 0.15.6
fabric_version = 0.91.6+1.20.2
fabric_version = 0.96.0+1.20.4

plasmid_version = 0.5.102-SNAPSHOT+1.20.2
plasmid_version = 0.5.102-SNAPSHOT+1.20.4
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
import net.minecraft.world.gen.chunk.NoiseChunkGenerator;
import net.minecraft.world.gen.chunk.VerticalBlockSample;
import net.minecraft.world.gen.noise.NoiseConfig;
import xyz.nucleoid.fantasy.util.ChunkGeneratorSettingsProvider;
import xyz.nucleoid.plasmid.game.world.generator.GameChunkGenerator;

public final class BeaconBreakersChunkGenerator extends GameChunkGenerator {
public final class BeaconBreakersChunkGenerator extends GameChunkGenerator implements ChunkGeneratorSettingsProvider {
private static final BlockState BARRIER = Blocks.BARRIER.getDefaultState();

private final BeaconBreakersMapConfig mapConfig;
Expand All @@ -38,6 +39,7 @@ public BeaconBreakersChunkGenerator(MinecraftServer server, BeaconBreakersMapCon
this.chunkGenerator = mapConfig.getChunkGenerator();
}

@Override
public ChunkGeneratorSettings getSettings() {
if (this.chunkGenerator instanceof NoiseChunkGenerator noiseChunkGenerator) {
return noiseChunkGenerator.getSettings().value();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void removePlayer() {
this.uuid = this.player.getUuid();

this.name = this.player.getDisplayName();
this.sidebarName = this.player.getEntityName();
this.sidebarName = this.player.getNameForScoreboard();

this.player = null;
}
Expand Down Expand Up @@ -102,7 +102,7 @@ public Text getName() {
}

private String getSidebarName() {
return this.player == null ? this.sidebarName : this.player.getEntityName();
return this.player == null ? this.sidebarName : this.player.getNameForScoreboard();
}

public ServerPlayerEntity getPlayer() {
Expand Down

This file was deleted.

5 changes: 2 additions & 3 deletions src/main/resources/beaconbreakers.mixin.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"required": true,
"package": "io.github.haykam821.beaconbreakers.mixin",
"compatibilityLevel": "JAVA_8",
"compatibilityLevel": "JAVA_17",
"mixins": [
"BlockItemMixin",
"ThreadedAnvilChunkStorageMixin"
"BlockItemMixin"
],
"injectors": {
"defaultRequire": 1
Expand Down

0 comments on commit 1ad87fe

Please sign in to comment.