Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ versions/**/run
# Ignore all versions by default
versions/*
# Don't ignore the current version
!versions/1.20.4
!versions/23w51b
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

mache {
minecraftVersion = "1.20.4"
minecraftVersion = "23w51b"
repositories.register("sonatype snapshots") {
url.set("https://s01.oss.sonatype.org/content/repositories/snapshots/")
includeGroups.set(listOf("org.vineflower"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/core/Registry.java
+++ b/net/minecraft/core/Registry.java
@@ -150,7 +150,7 @@
@@ -152,7 +152,7 @@
Optional<HolderSet.Named<T>> getTag(TagKey<T> key);

default Iterable<Holder<T>> getTagOrEmpty(TagKey<T> key) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/core/registries/BuiltInRegistries.java
+++ b/net/minecraft/core/registries/BuiltInRegistries.java
@@ -305,7 +305,7 @@
@@ -303,7 +303,7 @@
Bootstrap.checkBootstrapCalled(() -> "registry " + key);
ResourceLocation resourceLocation = key.location();
LOADERS.put(resourceLocation, () -> bootstrap.run(registry));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/Sheep.java
+++ b/net/minecraft/world/entity/animal/Sheep.java
@@ -86,7 +86,7 @@
@@ -82,7 +82,7 @@
map.put(DyeColor.RED, Blocks.RED_WOOL);
map.put(DyeColor.BLACK, Blocks.BLACK_WOOL);
});
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/net/minecraft/world/item/alchemy/Potion.java
+++ b/net/minecraft/world/item/alchemy/Potion.java
@@ -4,6 +4,7 @@
import java.util.function.Function;
import javax.annotation.Nullable;
import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.Reference;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
@@ -16,7 +17,7 @@

public static Holder<Potion> byName(String string) {
ResourceLocation resourceLocation = ResourceLocation.tryParse(string);
- return resourceLocation == null ? Potions.EMPTY : BuiltInRegistries.POTION.getHolder(resourceLocation).map(Function.identity()).orElse(Potions.EMPTY);
+ return resourceLocation == null ? Potions.EMPTY : BuiltInRegistries.POTION.getHolder(resourceLocation).map(potionReference -> (Holder<Potion>)potionReference).orElse(Potions.EMPTY);
}

public Potion(MobEffectInstance... effects) {