Update to 1.18.2

Co-authored-by: sciwhiz12 <[email protected]>
Co-authored-by: Marc Hermans <[email protected]>
Co-authored-by: LexManos <[email protected]>
Co-authored-by: Curle <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
authored and LexManos committed 2022-03-01 14:16:46 -08:00
1 parent 34291c1fb2
commit 425eff39ff
234 files changed
+2175 -3226

No files matched your search

@@ -8,7 +8,9 @@ package net.minecraftforge.common.data;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import com.google.common.annotations.VisibleForTesting;
@@ -23,22 +25,19 @@ import net.minecraft.data.HashCache;
import net.minecraft.server.packs.FilePackResources;
import net.minecraft.server.packs.FolderPackResources;
import net.minecraft.server.packs.repository.ServerPacksSource;
import net.minecraft.server.packs.resources.MultiPackResourceManager;
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.server.packs.PackResources;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
import net.minecraft.server.packs.VanillaPackResources;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.generators.ModelBuilder;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.locating.IModFile;
import net.minecraftforge.resource.PathResourcePack;
import net.minecraftforge.resource.ResourcePackLoader;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
@@ -79,7 +78,7 @@ public class ExistingFileHelper {
public String getPrefix() { return prefix; }
}
private final SimpleReloadableResourceManager clientResources, serverData;
private final MultiPackResourceManager clientResources, serverData;
private final boolean enable;
private final Multimap<PackType, ResourceLocation> generated = HashMultimap.create();
@@ -97,29 +96,33 @@ public class ExistingFileHelper {
* @param assetsDir the directory in which to find vanilla assets and indexes
*/
public ExistingFileHelper(Collection<Path> existingPacks, final Set<String> existingMods, boolean enable, @Nullable final String assetIndex, @Nullable final File assetsDir) {
this.clientResources = new SimpleReloadableResourceManager(PackType.CLIENT_RESOURCES);
this.serverData = new SimpleReloadableResourceManager(PackType.SERVER_DATA);
List<PackResources> candidateClientResources = new ArrayList<>();
List<PackResources> candidateServerResources = new ArrayList<>();
this.clientResources.add(new VanillaPackResources(ClientPackSource.BUILT_IN, "minecraft", "realms"));
candidateClientResources.add(new VanillaPackResources(ClientPackSource.BUILT_IN, "minecraft", "realms"));
if (assetIndex != null && assetsDir != null)
{
this.clientResources.add(new DefaultClientPackResources(ClientPackSource.BUILT_IN, new AssetIndex(assetsDir, assetIndex)));
candidateClientResources.add(new DefaultClientPackResources(ClientPackSource.BUILT_IN, new AssetIndex(assetsDir, assetIndex)));
}
this.serverData.add(new VanillaPackResources(ServerPacksSource.BUILT_IN_METADATA, "minecraft"));
candidateServerResources.add(new VanillaPackResources(ServerPacksSource.BUILT_IN_METADATA, "minecraft"));
for (Path existing : existingPacks) {
File file = existing.toFile();
PackResources pack = file.isDirectory() ? new FolderPackResources(file) : new FilePackResources(file);
this.clientResources.add(pack);
this.serverData.add(pack);
candidateClientResources.add(pack);
candidateServerResources.add(pack);
}
for (String existingMod : existingMods) {
IModFileInfo modFileInfo = ModList.get().getModFileById(existingMod);
if (modFileInfo != null) {
PackResources pack = ResourcePackLoader.createPackForMod(modFileInfo);
this.clientResources.add(pack);
this.serverData.add(pack);
candidateClientResources.add(pack);
candidateServerResources.add(pack);
}
}
this.clientResources = new MultiPackResourceManager(PackType.CLIENT_RESOURCES, candidateClientResources);
this.serverData = new MultiPackResourceManager(PackType.SERVER_DATA, candidateServerResources);
this.enable = enable;
}
@@ -10,6 +10,7 @@ import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.Tag;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
@@ -103,13 +104,13 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider
tag(STORAGE_BLOCKS_NETHERITE).add(Blocks.NETHERITE_BLOCK);
}
private void addColored(Consumer<Block> consumer, Tag.Named<Block> group, String pattern)
private void addColored(Consumer<Block> consumer, TagKey<Block> group, String pattern)
{
String prefix = group.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values())
{
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getName()));
Tag.Named<Block> tag = getForgeTag(prefix + color.getName());
TagKey<Block> tag = getForgeTag(prefix + color.getName());
Block block = ForgeRegistries.BLOCKS.getValue(key);
if (block == null || block == Blocks.AIR)
throw new IllegalStateException("Unknown vanilla block: " + key.toString());
@@ -119,12 +120,12 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider
}
@SuppressWarnings("unchecked")
private Tag.Named<Block> getForgeTag(String name)
private TagKey<Block> getForgeTag(String name)
{
try
{
name = name.toUpperCase(Locale.ENGLISH);
return (Tag.Named<Block>)Tags.Blocks.class.getDeclaredField(name).get(null);
return (TagKey<Block>) Tags.Blocks.class.getDeclaredField(name).get(null);
}
catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e)
{
@@ -10,6 +10,7 @@ import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.data.tags.ItemTagsProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.Tag;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
@@ -155,13 +156,13 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider
tag(Tags.Items.STRING).add(Items.STRING);
}
private void addColored(Consumer<Tag.Named<Item>> consumer, Tag.Named<Item> group, String pattern)
private void addColored(Consumer<TagKey<Item>> consumer, TagKey<Item> group, String pattern)
{
String prefix = group.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values())
{
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getName()));
Tag.Named<Item> tag = getForgeItemTag(prefix + color.getName());
TagKey<Item> tag = getForgeItemTag(prefix + color.getName());
Item item = ForgeRegistries.ITEMS.getValue(key);
if (item == null || item == Items.AIR)
throw new IllegalStateException("Unknown vanilla item: " + key.toString());
@@ -170,26 +171,26 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider
}
}
private void copyColored(Tag.Named<Block> blockGroup, Tag.Named<Item> itemGroup)
private void copyColored(TagKey<Block> blockGroup, TagKey<Item> itemGroup)
{
String blockPre = blockGroup.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
String itemPre = itemGroup.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
String blockPre = blockGroup.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
String itemPre = itemGroup.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values())
{
Tag.Named<Block> from = getForgeBlockTag(blockPre + color.getName());
Tag.Named<Item> to = getForgeItemTag(itemPre + color.getName());
TagKey<Block> from = getForgeBlockTag(blockPre + color.getName());
TagKey<Item> to = getForgeItemTag(itemPre + color.getName());
copy(from, to);
}
copy(getForgeBlockTag(blockPre + "colorless"), getForgeItemTag(itemPre + "colorless"));
}
@SuppressWarnings("unchecked")
private Tag.Named<Block> getForgeBlockTag(String name)
private TagKey<Block> getForgeBlockTag(String name)
{
try
{
name = name.toUpperCase(Locale.ENGLISH);
return (Tag.Named<Block>)Tags.Blocks.class.getDeclaredField(name).get(null);
return (TagKey<Block>)Tags.Blocks.class.getDeclaredField(name).get(null);
}
catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e)
{
@@ -198,12 +199,12 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider
}
@SuppressWarnings("unchecked")
private Tag.Named<Item> getForgeItemTag(String name)
private TagKey<Item> getForgeItemTag(String name)
{
try
{
name = name.toUpperCase(Locale.ENGLISH);
return (Tag.Named<Item>)Tags.Items.class.getDeclaredField(name).get(null);
return (TagKey<Item>)Tags.Items.class.getDeclaredField(name).get(null);
}
catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e)
{
@@ -14,6 +14,7 @@ import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.Tag;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
@@ -32,7 +33,7 @@ import java.util.function.Consumer;
public final class ForgeRecipeProvider extends RecipeProvider
{
private Map<Item, Tag<Item>> replacements = new HashMap<>();
private Map<Item, TagKey<Item>> replacements = new HashMap<>();
private Set<ResourceLocation> excludes = new HashSet<>();
public ForgeRecipeProvider(DataGenerator generatorIn)
@@ -45,7 +46,7 @@ public final class ForgeRecipeProvider extends RecipeProvider
excludes.add(item.asItem().getRegistryName());
}
private void replace(ItemLike item, Tag<Item> tag)
private void replace(ItemLike item, TagKey<Item> tag)
{
replacements.put(item.asItem(), tag);
}
@@ -148,7 +149,7 @@ public final class ForgeRecipeProvider extends RecipeProvider
if (entry instanceof ItemValue)
{
ItemStack stack = entry.getItems().stream().findFirst().orElse(ItemStack.EMPTY);
Tag<Item> replacement = replacements.get(stack.getItem());
TagKey<Item> replacement = replacements.get(stack.getItem());
if (replacement != null)
{
items.add(new TagValue(replacement));
@@ -57,6 +57,7 @@ public abstract class ForgeRegistryTagsProvider<T extends IForgeRegistryEntry<T>
@Override
protected Path getPath(ResourceLocation id)
{
//TODO-PATCHING: Mojang has introduced logic here to determine where the tags go, we need to replicate that logic possibly.
return generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/" + folder + "/" + id.getPath() + ".json");
}
}