Skip to content

Commit

Permalink
Update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@coehlrich
coehlrich committed Sep 11, 2024
1 parent b9fcb68 commit 6910e38
Show file tree
Hide file tree
Showing 19 changed files with 43 additions and 21 deletions.
2 changes: 1 addition & 1 deletion versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/Minecraft.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/Minecraft.java
+++ b/net/minecraft/client/Minecraft.java
@@ -2323,7 +2323,7 @@
@@ -2352,7 +2352,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
@@ -298,7 +298,7 @@
@@ -308,7 +308,7 @@
public Component describePreset() {
return Optional.ofNullable(this.preset)
.flatMap(Holder::unwrapKey)
Expand Down
2 changes: 1 addition & 1 deletion .../patches/client/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
+++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
@@ -157,7 +157,7 @@
@@ -158,7 +158,7 @@
record Data(LevelSettings levelSettings, WorldOptions options, Registry<LevelStem> existingDimensions) {
}

Expand Down
2 changes: 1 addition & 1 deletion versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/Minecraft.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/Minecraft.java
+++ b/net/minecraft/client/Minecraft.java
@@ -2326,7 +2326,7 @@
@@ -2355,7 +2355,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
2 changes: 1 addition & 1 deletion ...es/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
@@ -303,7 +303,7 @@
@@ -313,7 +313,7 @@
public Component describePreset() {
return Optional.ofNullable(this.preset)
.flatMap(Holder::unwrapKey)
Expand Down
2 changes: 1 addition & 1 deletion .../patches/joined/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
+++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
@@ -161,7 +161,7 @@
@@ -162,7 +162,7 @@
record Data(LevelSettings levelSettings, WorldOptions options, Registry<LevelStem> existingDimensions) {
}

Expand Down
11 changes: 11 additions & 0 deletions versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/TracingExecutor.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/net/minecraft/TracingExecutor.java
+++ b/net/minecraft/TracingExecutor.java
@@ -21,7 +21,7 @@
}
});
} else {
- return (Executor)(TracyClient.isAvailable() ? p_372837_ -> this.service.execute(() -> {
+ return (Executor)(TracyClient.isAvailable() ? (Executor) p_372837_ -> this.service.execute(() -> {
try (Zone zone = TracyClient.beginZone(p_372983_, SharedConstants.IS_RUNNING_IN_IDE)) {
p_372837_.run();
}
2 changes: 1 addition & 1 deletion versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/Util.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/Util.java
+++ b/net/minecraft/Util.java
@@ -576,7 +576,7 @@
@@ -559,7 +559,7 @@
public static <K extends Enum<K>, V> EnumMap<K, V> makeEnumMap(Class<K> p_371641_, Function<K, V> p_371671_) {
EnumMap<K, V> enummap = new EnumMap<>(p_371641_);

Expand Down
4 changes: 2 additions & 2 deletions ...24w37a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/advancements/critereon/EntitySubPredicates.java
+++ b/net/minecraft/advancements/critereon/EntitySubPredicates.java
@@ -176,7 +176,7 @@
@@ -183,7 +183,7 @@
this.getter = p_336167_;
this.codec = RecordCodecBuilder.mapCodec(
p_335436_ -> p_335436_.group(RegistryCodecs.homogeneousList(p_336141_).fieldOf("variant").forGetter(p_335992_ -> p_335992_.variants))
Expand All @@ -9,7 +9,7 @@
);
}

@@ -219,7 +219,7 @@
@@ -226,7 +226,7 @@
this.getter = p_333805_;
this.codec = RecordCodecBuilder.mapCodec(
p_333719_ -> p_333719_.group(p_333738_.fieldOf("variant").forGetter(p_333753_ -> p_333753_.variant))
Expand Down
2 changes: 1 addition & 1 deletion versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/commands/Commands.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
@@ -374,7 +374,7 @@
@@ -377,7 +377,7 @@
) {
for (CommandNode<CommandSourceStack> commandnode : p_82113_.getChildren()) {
if (commandnode.canUse(p_82115_)) {
Expand Down
2 changes: 1 addition & 1 deletion ...ns/snapshot/1.21/24w37a/patches/shared/net/minecraft/network/codec/StreamCodec.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/network/codec/StreamCodec.java
+++ b/net/minecraft/network/codec/StreamCodec.java
@@ -296,7 +296,7 @@
@@ -340,7 +340,7 @@
}

default <S extends B> StreamCodec<S, V> cast() {
Expand Down
4 changes: 2 additions & 2 deletions versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/MinecraftServer.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -872,7 +872,7 @@
@@ -883,7 +883,7 @@
}
}

- protected void doRunTask(TickTask p_129957_) {
+ public void doRunTask(TickTask p_129957_) {
this.getProfiler().incrementCounter("runTask");
Profiler.get().incrementCounter("runTask");
super.doRunTask(p_129957_);
}
2 changes: 1 addition & 1 deletion ...napshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/level/ServerChunkCache.java
+++ b/net/minecraft/server/level/ServerChunkCache.java
@@ -592,7 +592,7 @@
@@ -594,7 +594,7 @@
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ons/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch
View file
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
@@ -1597,7 +1597,7 @@
@@ -1588,7 +1588,7 @@

return object2intopenhashmap.object2IntEntrySet()
.stream()
Expand Down
2 changes: 1 addition & 1 deletion ...4w37a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
&& !this.server.isFlightAllowed()
&& !entity.isNoGravity()
@@ -791,7 +792,7 @@
if (itemstack.is(Items.WRITABLE_BOOK)) {
if (itemstack.has(DataComponents.WRITABLE_BOOK_CONTENT)) {
ItemStack itemstack1 = itemstack.transmuteCopy(Items.WRITTEN_BOOK);
itemstack1.remove(DataComponents.WRITABLE_BOOK_CONTENT);
- List<Filterable<Component>> list = p_215210_.stream().map(p_329965_ -> this.filterableFromOutgoing(p_329965_).map(Component::literal)).toList();
Expand Down
4 changes: 2 additions & 2 deletions ...ions/snapshot/1.21/24w37a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch
View file
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
@@ -1091,7 +1091,7 @@
@@ -1092,7 +1092,7 @@
Schema schema161 = p_14514_.addSchema(3086, SAME_NAMESPACED);
p_14514_.addFixer(
new EntityVariantFix(
Expand All @@ -9,7 +9,7 @@
p_216528_.defaultReturnValue("minecraft:tabby");
p_216528_.put(0, "minecraft:tabby");
p_216528_.put(1, "minecraft:black");
@@ -1131,7 +1131,7 @@
@@ -1132,7 +1132,7 @@
Schema schema162 = p_14514_.addSchema(3087, SAME_NAMESPACED);
p_14514_.addFixer(
new EntityVariantFix(
Expand Down
4 changes: 2 additions & 2 deletions versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/Entity.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -477,7 +477,7 @@
@@ -481,7 +481,7 @@

this.firstTick = false;
if (!this.level().isClientSide && this instanceof Leashable) {
- Leashable.tickLeash((Entity)((Leashable)this));
+ Leashable.tickLeash((Entity & Leashable)this);
}

this.level().getProfiler().pop();
profilerfiller.pop();
2 changes: 1 addition & 1 deletion ...1.21/24w37a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/projectile/AbstractArrow.java
+++ b/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -568,9 +568,9 @@
@@ -577,9 +577,9 @@
super.setOwner(p_36770_);

this.pickup = switch (p_36770_) {
Expand Down
11 changes: 11 additions & 0 deletions ...t/1.21/24w37a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/net/minecraft/world/level/block/state/StateHolder.java
+++ b/net/minecraft/world/level/block/state/StateHolder.java
@@ -133,7 +133,7 @@

for (Entry<Property<?>, Comparable<?>> entry : this.values.entrySet()) {
Property<?> property = entry.getKey();
- map.put(property, property.getPossibleValues().stream().map(p_372787_ -> p_61134_.get(this.makeNeighbourValues(property, p_372787_))).toArray());
+ map.put(property, (S[])property.getPossibleValues().stream().map(p_372787_ -> p_61134_.get(this.makeNeighbourValues(property, p_372787_))).toArray());
}

this.neighbours = map;

0 comments on commit 6910e38

Please sign in to comment.