Skip to content

Commit

Permalink
fix patches for 24w03a, closes #22
Browse files Browse the repository at this point in the history
  • Loading branch information
MiniDigger committed Apr 23, 2024
1 parent dab6183 commit 74a820e
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
+ return DataFixUtils.orElse(this.getTag(key), List.of());
}

HolderSet.Named<T> getOrCreateTag(TagKey<T> key);
default Optional<Holder<T>> getRandomElementOf(TagKey<T> tagKey, RandomSource randomSource) {

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/net/minecraft/network/codec/StreamCodec.java
+++ b/net/minecraft/network/codec/StreamCodec.java
@@ -171,7 +_,7 @@
}

default <S extends B> StreamCodec<S, V> cast() {
- return this;
+ return (StreamCodec<S, V>) this;
}

@FunctionalInterface
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+++ b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
@@ -36,7 +_,7 @@

private <T extends CustomPacketPayload> void writeCap(B friendlyByteBuf, CustomPacketPayload.Type<T> type, CustomPacketPayload customPacketPayload) {
friendlyByteBuf.writeResourceLocation(type.id());
- StreamCodec<B, T> streamCodec = this.findCodec(type.id);
+ StreamCodec<B, T> streamCodec = (StreamCodec<B, T>) this.findCodec(type.id);
streamCodec.encode(friendlyByteBuf, (T)customPacketPayload);
}

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java
+++ b/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java
@@ -8,7 +_,7 @@
@@ -14,7 +_,7 @@
);

public record ClientboundUpdateEnabledFeaturesPacket(Set<ResourceLocation> features) implements Packet<ClientConfigurationPacketListener> {
public ClientboundUpdateEnabledFeaturesPacket(FriendlyByteBuf buffer) {
private ClientboundUpdateEnabledFeaturesPacket(FriendlyByteBuf buffer) {
- this(buffer.readCollection(HashSet::new, FriendlyByteBuf::readResourceLocation));
+ this(buffer.<ResourceLocation, Set<ResourceLocation>>readCollection(HashSet::new, FriendlyByteBuf::readResourceLocation));
}

@Override
private void write(FriendlyByteBuf buffer) {
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/net/minecraft/network/syncher/EntityDataSerializer.java
+++ b/net/minecraft/network/syncher/EntityDataSerializer.java
@@ -13,7 +_,7 @@
T copy(T value);

static <T> EntityDataSerializer<T> forValueType(StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec) {
- return () -> streamCodec;
+ return (ForValueType<T>) () -> streamCodec;
}

public interface ForValueType<T> extends EntityDataSerializer<T> {
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -796,7 +_,7 @@
@@ -787,7 +_,7 @@
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -1553,7 +_,7 @@
@@ -1554,7 +_,7 @@

return map.object2IntEntrySet()
.stream()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/util/datafix/DataFixers.java
+++ b/net/minecraft/util/datafix/DataFixers.java
@@ -1016,7 +_,7 @@
@@ -1017,7 +_,7 @@
Schema schema161 = builder.addSchema(3086, SAME_NAMESPACED);
builder.addFixer(
new EntityVariantFix(
Expand All @@ -9,7 +9,7 @@
map5.defaultReturnValue("minecraft:tabby");
map5.put(0, "minecraft:tabby");
map5.put(1, "minecraft:black");
@@ -1053,7 +_,7 @@
@@ -1054,7 +_,7 @@
Schema schema162 = builder.addSchema(3087, SAME_NAMESPACED);
builder.addFixer(
new EntityVariantFix(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/SpawnPlacements.java
+++ b/net/minecraft/world/entity/SpawnPlacements.java
@@ -67,7 +_,7 @@
@@ -68,7 +_,7 @@
EntityType<T> entityType, ServerLevelAccessor serverLevel, MobSpawnType spawnType, BlockPos pos, RandomSource random
) {
SpawnPlacements.Data data = DATA_BY_TYPE.get(entityType);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/GameRules.java
+++ b/net/minecraft/world/level/GameRules.java
@@ -241,8 +_,8 @@
@@ -250,8 +_,8 @@
}

private static <T extends GameRules.Value<T>> void callVisitorCap(GameRules.GameRuleTypeVisitor visitor, GameRules.Key<?> key, GameRules.Type<?> type) {
Expand Down

0 comments on commit 74a820e

Please sign in to comment.