R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.18' into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-04-25 21:21:58 -04:00
commit 932b401aa9
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/embeddedt/modernfix/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java
View File

@ -1,6 +1,5 @@
package org.embeddedt.modernfix.mixin.perf.patchouli_deduplicate_books; package org.embeddedt.modernfix.mixin.perf.patchouli_deduplicate_books;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraftforge.fml.util.ObfuscationReflectionHelper; import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
@ -21,7 +20,6 @@ import vazkii.patchouli.common.book.Book;
import vazkii.patchouli.common.book.BookRegistry; import vazkii.patchouli.common.book.BookRegistry;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Mixin(ClientBookRegistry.class) @Mixin(ClientBookRegistry.class)
@ -46,16 +44,9 @@ public class ClientBookRegistryMixin {
for (TemplateComponent component : components) { for (TemplateComponent component : components) {
if (component instanceof ComponentItemStack) { if (component instanceof ComponentItemStack) {
ItemStack[] items = (ItemStack[]) itemsField.get(component); ItemStack[] items = (ItemStack[]) itemsField.get(component);
for (ItemStack item : items) { for(int i = 0; i < items.length; i++) {
if (item.getItem() == Items.AIR) { if(items[i] != null && items[i].getItem() == Items.AIR) {
// remove any NBT items[i] = ItemStack.EMPTY;
CompoundTag tag = item.getTag();
if (tag != null) {
numItemsCleared++;
List<String> keys = new ArrayList<>(tag.getAllKeys());
for (String key : keys)
item.removeTagKey(key);
}
} }
} }
} }