Skip to content

Commit 1f2f86c

Browse files
committed
feat(minecraft): update to 26.3-snapshot-8
See: https://minecraft.wiki/w/Java_Edition_26.3_Snapshot_8
1 parent a7166ca commit 1f2f86c

12 files changed

Lines changed: 34 additions & 40 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
1111
mixins.sponge.entityactivation.json,mixins.sponge.exploit.json,mixins.sponge.inventory.json,mixins.sponge.movementcheck.json,\
1212
mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json,mixins.sponge.test.json
1313

14-
minecraftVersion=26.3-snapshot-7
14+
minecraftVersion=26.3-snapshot-8
1515
recommendedVersion=0-SNAPSHOT
1616

1717
org.gradle.dependency.verification.console=verbose

src/accessors/java/org/spongepowered/common/accessor/world/level/levelgen/NoiseRouterDataAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import net.minecraft.core.HolderGetter;
2828
import net.minecraft.resources.ResourceKey;
2929
import net.minecraft.world.level.levelgen.Aquifer;
30-
import net.minecraft.world.level.levelgen.DensityFunction;
3130
import net.minecraft.world.level.levelgen.NoiseRouterData;
3231
import net.minecraft.world.level.levelgen.OreVeinifier;
3332
import net.minecraft.world.level.levelgen.OverworldFunctionSet;
33+
import net.minecraft.world.level.levelgen.densityfunction.DensityFunction;
3434
import net.minecraft.world.level.levelgen.synth.NormalNoise;
3535
import org.spongepowered.asm.mixin.Mixin;
3636
import org.spongepowered.asm.mixin.gen.Invoker;

src/main/java/org/spongepowered/common/entity/living/human/HumanEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import net.minecraft.world.entity.LivingEntity;
6161
import net.minecraft.world.entity.Mob;
6262
import net.minecraft.world.entity.PathfinderMob;
63+
import net.minecraft.world.entity.UpdateInterval;
6364
import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
6465
import net.minecraft.world.entity.ai.attributes.Attributes;
6566
import net.minecraft.world.entity.ai.goal.FloatGoal;
@@ -408,7 +409,7 @@ private void respawnOnClient() {
408409
this.pushPackets(new ClientboundRemoveEntitiesPacket(this.getId()), this.createPlayerListPacket(EnumSet.allOf(ClientboundPlayerInfoUpdatePacket.Action.class)));
409410
this.pushPackets(this.getAddEntityPacket(new ServerEntity(
410411
(ServerLevel) this.level(),
411-
this, 1, true, NoOpSynchronizer.INSTANCE
412+
this, UpdateInterval.periodic(1), true, NoOpSynchronizer.INSTANCE
412413
)));
413414
}
414415

src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseGeneratorConfigBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import net.minecraft.core.registries.Registries;
2929
import net.minecraft.world.level.biome.OverworldBiomeBuilder;
3030
import net.minecraft.world.level.levelgen.Aquifer;
31-
import net.minecraft.world.level.levelgen.DensityFunction;
3231
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
3332
import net.minecraft.world.level.levelgen.NoiseRouterData;
3433
import net.minecraft.world.level.levelgen.NoiseSettings;
3534
import net.minecraft.world.level.levelgen.OreVeinifier;
35+
import net.minecraft.world.level.levelgen.densityfunction.DensityFunction;
3636
import net.minecraft.world.level.levelgen.synth.NormalNoise;
3737
import org.spongepowered.api.block.BlockState;
3838
import org.spongepowered.api.block.BlockTypes;

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/biome/BiomeSourceMixin_API.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
*/
2525
package org.spongepowered.common.mixin.api.minecraft.world.level.biome;
2626

27-
import net.minecraft.world.level.biome.BiomeManager;
27+
import net.minecraft.world.level.biome.BiomeResolver;
2828
import net.minecraft.world.level.biome.BiomeSource;
29-
import net.minecraft.world.level.biome.Climate;
3029
import org.spongepowered.api.world.biome.Biome;
3130
import org.spongepowered.asm.mixin.Mixin;
3231
import org.spongepowered.asm.mixin.Shadow;
@@ -35,11 +34,10 @@
3534
import java.util.Set;
3635

3736
@Mixin(BiomeSource.class)
38-
public abstract class BiomeSourceMixin_API implements org.spongepowered.api.world.biome.provider.BiomeProvider, BiomeManager.NoiseBiomeSource {
37+
public abstract class BiomeSourceMixin_API implements org.spongepowered.api.world.biome.provider.BiomeProvider, BiomeResolver {
3938

4039
// @formatter:off
4140
@Shadow public abstract Set<net.minecraft.world.level.biome.Biome> shadow$possibleBiomes();
42-
@Shadow public abstract Set<net.minecraft.world.level.biome.Biome> shadow$getBiomesWithin(int x, int y, int z, int size, Climate.Sampler sampler);
4341
// @formatter:on
4442

4543
@Override
@@ -52,10 +50,4 @@ public List<Biome> choices() {
5250
return (List<Biome>) (Object) this.shadow$possibleBiomes();
5351
}
5452

55-
/* TODO sampler is not available here?
56-
public Set<Biome> within(final int x, final int y, final int z, final int size) {
57-
final Climate.Sampler sampler = ((BiomeSourceBridge) (Object) this).bridge$chunkGenerator().climateSampler();
58-
return (Set<Biome>) (Object) this.shadow$getBiomesWithin(x, y, z, size, sampler);
59-
}
60-
*/
6153
}

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/DensityFunctionMixin_API.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
package org.spongepowered.common.mixin.api.minecraft.world.level.levelgen;
2626

2727
import net.minecraft.util.Interval;
28-
import net.minecraft.world.level.levelgen.DensityFunction;
29-
import net.minecraft.world.level.levelgen.DensityFunctions;
28+
import net.minecraft.world.level.levelgen.densityfunction.DensityFunction;
29+
import net.minecraft.world.level.levelgen.densityfunction.DensityFunctions;
3030
import org.spongepowered.api.data.persistence.DataContainer;
3131
import org.spongepowered.api.registry.RegistryHolder;
3232
import org.spongepowered.asm.mixin.Mixin;

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/NoiseRouterMixin_API.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
public abstract class NoiseRouterMixin_API implements org.spongepowered.api.world.generation.config.noise.NoiseRouter {
3535

3636
// @formatter:off
37-
@Shadow @Final private net.minecraft.world.level.levelgen.DensityFunction temperature;
38-
@Shadow @Final private net.minecraft.world.level.levelgen.DensityFunction vegetation;
39-
@Shadow @Final private net.minecraft.world.level.levelgen.DensityFunction continents;
40-
@Shadow @Final private net.minecraft.world.level.levelgen.DensityFunction erosion;
41-
@Shadow @Final private net.minecraft.world.level.levelgen.DensityFunction depth;
42-
@Shadow @Final private net.minecraft.world.level.levelgen.DensityFunction ridges;
43-
@Shadow @Final private net.minecraft.world.level.levelgen.DensityFunction finalDensity;
37+
@Shadow @Final private net.minecraft.world.level.levelgen.densityfunction.DensityFunction temperature;
38+
@Shadow @Final private net.minecraft.world.level.levelgen.densityfunction.DensityFunction vegetation;
39+
@Shadow @Final private net.minecraft.world.level.levelgen.densityfunction.DensityFunction continents;
40+
@Shadow @Final private net.minecraft.world.level.levelgen.densityfunction.DensityFunction erosion;
41+
@Shadow @Final private net.minecraft.world.level.levelgen.densityfunction.DensityFunction depth;
42+
@Shadow @Final private net.minecraft.world.level.levelgen.densityfunction.DensityFunction ridges;
43+
@Shadow @Final private net.minecraft.world.level.levelgen.densityfunction.DensityFunction finalDensity;
4444
// @formatter:on
4545

4646
@Override

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureMixin_API.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public boolean place(final ServerWorld world, final Vector3i pos) {
8484
level.dimension(),
8585
level.registryAccess(),
8686
chunkSource.getGenerator(),
87-
chunkSource.getGenerator().getBiomeSource(),
87+
level.uncachedBiomeResolver(),
8888
chunkSource.randomState(),
8989
level.getStructureManager(),
9090
level.getSeed(),

src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerEntityMixin.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import net.minecraft.server.level.ServerLevel;
3636
import net.minecraft.server.level.ServerPlayer;
3737
import net.minecraft.world.entity.Entity;
38+
import net.minecraft.world.entity.UpdateInterval;
3839
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
3940
import org.spongepowered.asm.mixin.Final;
4041
import org.spongepowered.asm.mixin.Mixin;
@@ -55,7 +56,6 @@
5556
import java.util.EnumSet;
5657
import java.util.List;
5758
import java.util.function.Consumer;
58-
import java.util.function.Predicate;
5959
import java.util.stream.Stream;
6060

6161
@Mixin(ServerEntity.class)
@@ -88,7 +88,7 @@ public abstract class ServerEntityMixin {
8888
*/
8989
@Inject(method = "<init>", at = @At("TAIL"))
9090
private void impl$wrapConsumer(
91-
final ServerLevel serverLevel, final Entity entity, final int trackingRange,
91+
final ServerLevel serverLevel, final Entity entity, final UpdateInterval trackingRange,
9292
final boolean trackMovementDeltas, final ServerEntity.Synchronizer broadcaster,
9393
final CallbackInfo ci) {
9494
this.synchronizer = new VanishedFilteringSynchronizer(broadcaster, new WeakReference<>(this.entity));
@@ -166,16 +166,16 @@ public abstract class ServerEntityMixin {
166166
}
167167

168168
@WrapOperation(method = "sendChanges",
169-
at = @At(value = "INVOKE",
170-
target = "Lnet/minecraft/server/level/ServerEntity$Synchronizer;sendToTrackingPlayersFiltered(Lnet/minecraft/network/protocol/Packet;Ljava/util/function/Predicate;)V"))
169+
at = @At(value = "INVOKE", ordinal = 0,
170+
target = "Lnet/minecraft/server/level/ServerEntity$Synchronizer;sendToTrackingPlayers(Lnet/minecraft/network/protocol/Packet;)V"))
171171
private void impl$sendSetPassengersToSelf(
172172
final ServerEntity.Synchronizer instance, final Packet<? super ClientGamePacketListener> packet,
173-
final Predicate<ServerPlayer> serverPlayerPredicate, final Operation<Void> original) {
173+
final Operation<Void> original) {
174174
// When passengers are removed from a player entity, the target
175175
// is the player itself, and we need to synchronize it to them.
176176
// In vanilla, it is not possible to ride player entities
177177
// so we never end up hitting this code path.
178-
original.call(instance, packet, serverPlayerPredicate);
178+
original.call(instance, packet);
179179
if (this.entity instanceof final ServerPlayer player) {
180180
player.connection.send(packet);
181181
}

0 commit comments

Comments
 (0)