forked from neoforged/NeoForge
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Unify tag namespace and conventions between Neoforge and Fabric for 1…
….20.5 MC neoforged#135 FabricMC/fabric#3310
- Loading branch information
1 parent
e9e465c
commit 87f815d
Showing
1,865 changed files
with
17,499 additions
and
15,003 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
patches/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
patches/com/mojang/realmsclient/RealmsAvailability.java.patch
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
patches/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
patches/net/minecraft/advancements/AdvancementRewards.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 0 additions & 52 deletions
52
patches/net/minecraft/advancements/critereon/EntityPredicate.java.patch
This file was deleted.
Oops, something went wrong.
14 changes: 14 additions & 0 deletions
14
patches/net/minecraft/advancements/critereon/ItemEnchantmentsPredicate.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- a/net/minecraft/advancements/critereon/ItemEnchantmentsPredicate.java | ||
+++ b/net/minecraft/advancements/critereon/ItemEnchantmentsPredicate.java | ||
@@ -23,6 +_,11 @@ | ||
return this.enchantments; | ||
} | ||
|
||
+ @Override // NEO: use getAllEnchantments for enchantments | ||
+ public boolean matches(ItemStack p_333958_) { | ||
+ return matches(p_333958_, p_333958_.getAllEnchantments()); | ||
+ } | ||
+ | ||
public boolean matches(ItemStack p_333811_, ItemEnchantments p_334059_) { | ||
for (EnchantmentPredicate enchantmentpredicate : this.enchantments) { | ||
if (!enchantmentpredicate.containedIn(p_334059_)) { |
Oops, something went wrong.