MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

TagLoader fixes

Browse source
This commit is contained in:
Frank Bauer 2021-07-07 13:32:17 +02:00
parent 558b1db714
commit c7b49be379
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/ru/bclib/mixin/common/TagLoaderMixin.java
View file

@ -1,23 +1,23 @@
package ru.bclib.mixin.common; package ru.bclib.mixin.common;
import net.minecraft.resources.ResourceLocation; import java.util.Map;
import net.minecraft.tags.Tag;
import net.minecraft.tags.TagLoader; import net.minecraft.resources.ResourceLocation;
import org.spongepowered.asm.mixin.Mixin; import net.minecraft.tags.Tag;
import org.spongepowered.asm.mixin.Shadow; import net.minecraft.tags.TagLoader;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.Shadow;
import ru.bclib.util.TagHelper; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import java.util.Map; import ru.bclib.util.TagHelper;
@Mixin(TagLoader.class) @Mixin(TagLoader.class)
public class TagLoaderMixin { public class TagLoaderMixin {
@Shadow @Shadow
private String directory; private String directory;
@ModifyArg(method = "loadAndBuild", at = @At(value = "INVOKE", target = "Lnet/minecraft/tags/TagLoader;build(Ljava/util/Map;)Lnet/minecraft/tags/TagCollection;")) @ModifyArg(method = "loadAndBuild", at = @At(value = "INVOKE", target = "Lnet/minecraft/tags/TagLoader;build(Ljava/util/Map;)Lnet/minecraft/tags/TagCollection;"))
public Map<ResourceLocation, Tag.Builder> be_modifyTags(Map<ResourceLocation, Tag.Builder> tagsMap) { public Map<ResourceLocation, Tag.Builder> be_modifyTags(Map<ResourceLocation, Tag.Builder> tagsMap) {
return TagHelper.apply(directory, tagsMap); return TagHelper.apply(directory, tagsMap);
} }
} }

6
src/main/java/ru/bclib/util/TagHelper.java
View file

@ -58,11 +58,11 @@ public class TagHelper {
return builder; return builder;
} }
public static Map<ResourceLocation, Tag.Builder> apply(String entry, Map<ResourceLocation, Tag.Builder> tagsMap) { public static Map<ResourceLocation, Tag.Builder> apply(String directory, Map<ResourceLocation, Tag.Builder> tagsMap) {
Map<ResourceLocation, Set<ResourceLocation>> endTags = null; Map<ResourceLocation, Set<ResourceLocation>> endTags = null;
if (entry.equals("block")) { if ("tags/blocks".equals(directory)) {
endTags = TAGS_BLOCK; endTags = TAGS_BLOCK;
} else if (entry.equals("item")) { } else if ("tags/items".equals(directory)) {
endTags = TAGS_ITEM; endTags = TAGS_ITEM;
} }
if (endTags != null) { if (endTags != null) {