Regenerate patches with relative headers. This should lower conflicts in future PRs.

Convert Forge to use Official mappings.
Mojang released their obfuscation mappings but we have not used them up until now due to wanting to get their license to be more explicitly permissive.
It is clear that their intent is to allow us to use their names for developing mods like this.
See the full wording, and our interpretation here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
This commit is contained in:
LexManos committed 2021-03-09 14:21:48 -08:00
1 parent 802298d99d
commit a95b968c13
832 files changed
+4464 -4373

No files matched your search

@@ -108,20 +108,20 @@ public class ExistingFileHelper {
public ExistingFileHelper(Collection<Path> existingPacks, Set<String> existingMods, boolean enable) {
this.clientResources = new SimpleReloadableResourceManager(ResourcePackType.CLIENT_RESOURCES);
this.serverData = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
this.clientResources.addResourcePack(new VanillaPack("minecraft", "realms"));
this.serverData.addResourcePack(new VanillaPack("minecraft"));
this.clientResources.add(new VanillaPack("minecraft", "realms"));
this.serverData.add(new VanillaPack("minecraft"));
for (Path existing : existingPacks) {
File file = existing.toFile();
IResourcePack pack = file.isDirectory() ? new FolderPack(file) : new FilePack(file);
this.clientResources.addResourcePack(pack);
this.serverData.addResourcePack(pack);
this.clientResources.add(pack);
this.serverData.add(pack);
}
for (String existingMod : existingMods) {
ModFileInfo modFileInfo = ModList.get().getModFileById(existingMod);
if (modFileInfo != null) {
IResourcePack pack = new ModFileResourcePack(modFileInfo.getFile());
this.clientResources.addResourcePack(pack);
this.serverData.addResourcePack(pack);
this.clientResources.add(pack);
this.serverData.add(pack);
}
}
this.enable = enable;
@@ -44,55 +44,55 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
@SuppressWarnings("unchecked")
@Override
public void registerTags()
public void addTags()
{
getOrCreateBuilder(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN);
getOrCreateBuilder(CHESTS_ENDER).add(Blocks.ENDER_CHEST);
getOrCreateBuilder(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST);
getOrCreateBuilder(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST);
getOrCreateBuilder(COBBLESTONE).add(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE, Blocks.MOSSY_COBBLESTONE);
getOrCreateBuilder(DIRT).add(Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.MYCELIUM);
getOrCreateBuilder(END_STONES).add(Blocks.END_STONE);
getOrCreateBuilder(ENDERMAN_PLACE_ON_BLACKLIST);
getOrCreateBuilder(FENCE_GATES).addTags(FENCE_GATES_WOODEN);
getOrCreateBuilder(FENCE_GATES_WOODEN).add(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE);
getOrCreateBuilder(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN);
getOrCreateBuilder(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE);
getOrCreateBuilder(FENCES_WOODEN).add(Blocks.OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE, Blocks.CRIMSON_FENCE, Blocks.WARPED_FENCE);
getOrCreateBuilder(GLASS).addTags(GLASS_COLORLESS, STAINED_GLASS);
getOrCreateBuilder(GLASS_COLORLESS).add(Blocks.GLASS);
addColored(getOrCreateBuilder(STAINED_GLASS)::add, GLASS, "{color}_stained_glass");
getOrCreateBuilder(GLASS_PANES).addTags(GLASS_PANES_COLORLESS, STAINED_GLASS_PANES);
getOrCreateBuilder(GLASS_PANES_COLORLESS).add(Blocks.GLASS_PANE);
addColored(getOrCreateBuilder(STAINED_GLASS_PANES)::add, GLASS_PANES, "{color}_stained_glass_pane");
getOrCreateBuilder(GRAVEL).add(Blocks.GRAVEL);
getOrCreateBuilder(NETHERRACK).add(Blocks.NETHERRACK);
getOrCreateBuilder(OBSIDIAN).add(Blocks.OBSIDIAN);
getOrCreateBuilder(ORES).addTags(ORES_COAL, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_REDSTONE, ORES_QUARTZ, ORES_NETHERITE_SCRAP);
getOrCreateBuilder(ORES_COAL).add(Blocks.COAL_ORE);
getOrCreateBuilder(ORES_DIAMOND).add(Blocks.DIAMOND_ORE);
getOrCreateBuilder(ORES_EMERALD).add(Blocks.EMERALD_ORE);
getOrCreateBuilder(ORES_GOLD).addTag(BlockTags.GOLD_ORES);
getOrCreateBuilder(ORES_IRON).add(Blocks.IRON_ORE);
getOrCreateBuilder(ORES_LAPIS).add(Blocks.LAPIS_ORE);
getOrCreateBuilder(ORES_QUARTZ).add(Blocks.NETHER_QUARTZ_ORE);
getOrCreateBuilder(ORES_REDSTONE).add(Blocks.REDSTONE_ORE);
getOrCreateBuilder(ORES_NETHERITE_SCRAP).add(Blocks.ANCIENT_DEBRIS);
getOrCreateBuilder(SAND).addTags(SAND_COLORLESS, SAND_RED);
getOrCreateBuilder(SAND_COLORLESS).add(Blocks.SAND);
getOrCreateBuilder(SAND_RED).add(Blocks.RED_SAND);
getOrCreateBuilder(SANDSTONE).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE);
getOrCreateBuilder(STONE).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.INFESTED_STONE, Blocks.STONE, Blocks.POLISHED_ANDESITE, Blocks.POLISHED_DIORITE, Blocks.POLISHED_GRANITE);
getOrCreateBuilder(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_REDSTONE, STORAGE_BLOCKS_NETHERITE);
getOrCreateBuilder(STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_DIAMOND).add(Blocks.DIAMOND_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_EMERALD).add(Blocks.EMERALD_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_GOLD).add(Blocks.GOLD_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_IRON).add(Blocks.IRON_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_LAPIS).add(Blocks.LAPIS_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_QUARTZ).add(Blocks.QUARTZ_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK);
getOrCreateBuilder(STORAGE_BLOCKS_NETHERITE).add(Blocks.NETHERITE_BLOCK);
tag(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN);
tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST);
tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST);
tag(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST);
tag(COBBLESTONE).add(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE, Blocks.MOSSY_COBBLESTONE);
tag(DIRT).add(Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.MYCELIUM);
tag(END_STONES).add(Blocks.END_STONE);
tag(ENDERMAN_PLACE_ON_BLACKLIST);
tag(FENCE_GATES).addTags(FENCE_GATES_WOODEN);
tag(FENCE_GATES_WOODEN).add(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE);
tag(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN);
tag(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE);
tag(FENCES_WOODEN).add(Blocks.OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE, Blocks.CRIMSON_FENCE, Blocks.WARPED_FENCE);
tag(GLASS).addTags(GLASS_COLORLESS, STAINED_GLASS);
tag(GLASS_COLORLESS).add(Blocks.GLASS);
addColored(tag(STAINED_GLASS)::add, GLASS, "{color}_stained_glass");
tag(GLASS_PANES).addTags(GLASS_PANES_COLORLESS, STAINED_GLASS_PANES);
tag(GLASS_PANES_COLORLESS).add(Blocks.GLASS_PANE);
addColored(tag(STAINED_GLASS_PANES)::add, GLASS_PANES, "{color}_stained_glass_pane");
tag(GRAVEL).add(Blocks.GRAVEL);
tag(NETHERRACK).add(Blocks.NETHERRACK);
tag(OBSIDIAN).add(Blocks.OBSIDIAN);
tag(ORES).addTags(ORES_COAL, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_REDSTONE, ORES_QUARTZ, ORES_NETHERITE_SCRAP);
tag(ORES_COAL).add(Blocks.COAL_ORE);
tag(ORES_DIAMOND).add(Blocks.DIAMOND_ORE);
tag(ORES_EMERALD).add(Blocks.EMERALD_ORE);
tag(ORES_GOLD).addTag(BlockTags.GOLD_ORES);
tag(ORES_IRON).add(Blocks.IRON_ORE);
tag(ORES_LAPIS).add(Blocks.LAPIS_ORE);
tag(ORES_QUARTZ).add(Blocks.NETHER_QUARTZ_ORE);
tag(ORES_REDSTONE).add(Blocks.REDSTONE_ORE);
tag(ORES_NETHERITE_SCRAP).add(Blocks.ANCIENT_DEBRIS);
tag(SAND).addTags(SAND_COLORLESS, SAND_RED);
tag(SAND_COLORLESS).add(Blocks.SAND);
tag(SAND_RED).add(Blocks.RED_SAND);
tag(SANDSTONE).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE);
tag(STONE).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.INFESTED_STONE, Blocks.STONE, Blocks.POLISHED_ANDESITE, Blocks.POLISHED_DIORITE, Blocks.POLISHED_GRANITE);
tag(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_REDSTONE, STORAGE_BLOCKS_NETHERITE);
tag(STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK);
tag(STORAGE_BLOCKS_DIAMOND).add(Blocks.DIAMOND_BLOCK);
tag(STORAGE_BLOCKS_EMERALD).add(Blocks.EMERALD_BLOCK);
tag(STORAGE_BLOCKS_GOLD).add(Blocks.GOLD_BLOCK);
tag(STORAGE_BLOCKS_IRON).add(Blocks.IRON_BLOCK);
tag(STORAGE_BLOCKS_LAPIS).add(Blocks.LAPIS_BLOCK);
tag(STORAGE_BLOCKS_QUARTZ).add(Blocks.QUARTZ_BLOCK);
tag(STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK);
tag(STORAGE_BLOCKS_NETHERITE).add(Blocks.NETHERITE_BLOCK);
}
private void addColored(Consumer<Block> consumer, ITag.INamedTag<Block> group, String pattern)
@@ -100,12 +100,12 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
String prefix = group.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values())
{
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getTranslationKey()));
ITag.INamedTag<Block> tag = getForgeTag(prefix + color.getTranslationKey());
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getName()));
ITag.INamedTag<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());
getOrCreateBuilder(tag).add(block);
tag(tag).add(block);
consumer.accept(block);
}
}
@@ -33,9 +33,9 @@ public class ForgeFluidTagsProvider extends FluidTagsProvider
}
@Override
public void registerTags()
public void addTags()
{
getOrCreateBuilder(MILK).addOptional(ForgeMod.MILK.getId()).addOptional(ForgeMod.FLOWING_MILK.getId());
tag(MILK).addOptional(ForgeMod.MILK.getId()).addOptional(ForgeMod.FLOWING_MILK.getId());
}
@Override
@@ -43,61 +43,61 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
@SuppressWarnings("unchecked")
@Override
public void registerTags()
public void addTags()
{
getOrCreateBuilder(Tags.Items.BONES).add(Items.BONE);
getOrCreateBuilder(Tags.Items.BOOKSHELVES).add(Items.BOOKSHELF);
tag(Tags.Items.BONES).add(Items.BONE);
tag(Tags.Items.BOOKSHELVES).add(Items.BOOKSHELF);
copy(Tags.Blocks.CHESTS, Tags.Items.CHESTS);
copy(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER);
copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED);
copy(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN);
copy(Tags.Blocks.COBBLESTONE, Tags.Items.COBBLESTONE);
getOrCreateBuilder(Tags.Items.CROPS).addTags(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT);
getOrCreateBuilder(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT);
getOrCreateBuilder(Tags.Items.CROPS_CARROT).add(Items.CARROT);
getOrCreateBuilder(Tags.Items.CROPS_NETHER_WART).add(Items.NETHER_WART);
getOrCreateBuilder(Tags.Items.CROPS_POTATO).add(Items.POTATO);
getOrCreateBuilder(Tags.Items.CROPS_WHEAT).add(Items.WHEAT);
getOrCreateBuilder(Tags.Items.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE);
getOrCreateBuilder(Tags.Items.DUSTS_GLOWSTONE).add(Items.GLOWSTONE_DUST);
getOrCreateBuilder(Tags.Items.DUSTS_PRISMARINE).add(Items.PRISMARINE_SHARD);
getOrCreateBuilder(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE);
addColored(getOrCreateBuilder(Tags.Items.DYES)::addTags, Tags.Items.DYES, "{color}_dye");
getOrCreateBuilder(Tags.Items.EGGS).add(Items.EGG);
tag(Tags.Items.CROPS).addTags(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT);
tag(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT);
tag(Tags.Items.CROPS_CARROT).add(Items.CARROT);
tag(Tags.Items.CROPS_NETHER_WART).add(Items.NETHER_WART);
tag(Tags.Items.CROPS_POTATO).add(Items.POTATO);
tag(Tags.Items.CROPS_WHEAT).add(Items.WHEAT);
tag(Tags.Items.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE);
tag(Tags.Items.DUSTS_GLOWSTONE).add(Items.GLOWSTONE_DUST);
tag(Tags.Items.DUSTS_PRISMARINE).add(Items.PRISMARINE_SHARD);
tag(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE);
addColored(tag(Tags.Items.DYES)::addTags, Tags.Items.DYES, "{color}_dye");
tag(Tags.Items.EGGS).add(Items.EGG);
copy(Tags.Blocks.END_STONES, Tags.Items.END_STONES);
getOrCreateBuilder(Tags.Items.ENDER_PEARLS).add(Items.ENDER_PEARL);
getOrCreateBuilder(Tags.Items.FEATHERS).add(Items.FEATHER);
tag(Tags.Items.ENDER_PEARLS).add(Items.ENDER_PEARL);
tag(Tags.Items.FEATHERS).add(Items.FEATHER);
copy(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES);
copy(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN);
copy(Tags.Blocks.FENCES, Tags.Items.FENCES);
copy(Tags.Blocks.FENCES_NETHER_BRICK, Tags.Items.FENCES_NETHER_BRICK);
copy(Tags.Blocks.FENCES_WOODEN, Tags.Items.FENCES_WOODEN);
getOrCreateBuilder(Tags.Items.GEMS).addTags(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ);
getOrCreateBuilder(Tags.Items.GEMS_DIAMOND).add(Items.DIAMOND);
getOrCreateBuilder(Tags.Items.GEMS_EMERALD).add(Items.EMERALD);
getOrCreateBuilder(Tags.Items.GEMS_LAPIS).add(Items.LAPIS_LAZULI);
getOrCreateBuilder(Tags.Items.GEMS_PRISMARINE).add(Items.PRISMARINE_CRYSTALS);
getOrCreateBuilder(Tags.Items.GEMS_QUARTZ).add(Items.QUARTZ);
tag(Tags.Items.GEMS).addTags(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ);
tag(Tags.Items.GEMS_DIAMOND).add(Items.DIAMOND);
tag(Tags.Items.GEMS_EMERALD).add(Items.EMERALD);
tag(Tags.Items.GEMS_LAPIS).add(Items.LAPIS_LAZULI);
tag(Tags.Items.GEMS_PRISMARINE).add(Items.PRISMARINE_CRYSTALS);
tag(Tags.Items.GEMS_QUARTZ).add(Items.QUARTZ);
copy(Tags.Blocks.GLASS, Tags.Items.GLASS);
func_240521_a_Colored(Tags.Blocks.GLASS, Tags.Items.GLASS);
copy(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES);
func_240521_a_Colored(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES);
copy(Tags.Blocks.GRAVEL, Tags.Items.GRAVEL);
getOrCreateBuilder(Tags.Items.GUNPOWDER).add(Items.GUNPOWDER);
getOrCreateBuilder(Tags.Items.HEADS).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD);
getOrCreateBuilder(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_NETHER_BRICK, Tags.Items.INGOTS_NETHERITE);
getOrCreateBuilder(Tags.Items.INGOTS_BRICK).add(Items.BRICK);
getOrCreateBuilder(Tags.Items.INGOTS_GOLD).add(Items.GOLD_INGOT);
getOrCreateBuilder(Tags.Items.INGOTS_IRON).add(Items.IRON_INGOT);
getOrCreateBuilder(Tags.Items.INGOTS_NETHERITE).add(Items.NETHERITE_INGOT);
getOrCreateBuilder(Tags.Items.INGOTS_NETHER_BRICK).add(Items.NETHER_BRICK);
getOrCreateBuilder(Tags.Items.LEATHER).add(Items.LEATHER);
getOrCreateBuilder(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM);
getOrCreateBuilder(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR);
tag(Tags.Items.GUNPOWDER).add(Items.GUNPOWDER);
tag(Tags.Items.HEADS).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD);
tag(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_NETHER_BRICK, Tags.Items.INGOTS_NETHERITE);
tag(Tags.Items.INGOTS_BRICK).add(Items.BRICK);
tag(Tags.Items.INGOTS_GOLD).add(Items.GOLD_INGOT);
tag(Tags.Items.INGOTS_IRON).add(Items.IRON_INGOT);
tag(Tags.Items.INGOTS_NETHERITE).add(Items.NETHERITE_INGOT);
tag(Tags.Items.INGOTS_NETHER_BRICK).add(Items.NETHER_BRICK);
tag(Tags.Items.LEATHER).add(Items.LEATHER);
tag(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM);
tag(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR);
copy(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK);
getOrCreateBuilder(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD);
getOrCreateBuilder(Tags.Items.NUGGETS_IRON).add(Items.IRON_NUGGET);
getOrCreateBuilder(Tags.Items.NUGGETS_GOLD).add(Items.GOLD_NUGGET);
tag(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD);
tag(Tags.Items.NUGGETS_IRON).add(Items.IRON_NUGGET);
tag(Tags.Items.NUGGETS_GOLD).add(Items.GOLD_NUGGET);
copy(Tags.Blocks.OBSIDIAN, Tags.Items.OBSIDIAN);
copy(Tags.Blocks.ORES, Tags.Items.ORES);
copy(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL);
@@ -109,20 +109,20 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
copy(Tags.Blocks.ORES_QUARTZ, Tags.Items.ORES_QUARTZ);
copy(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE);
copy(Tags.Blocks.ORES_NETHERITE_SCRAP, Tags.Items.ORES_NETHERITE_SCRAP);
getOrCreateBuilder(Tags.Items.RODS).addTags(Tags.Items.RODS_BLAZE, Tags.Items.RODS_WOODEN);
getOrCreateBuilder(Tags.Items.RODS_BLAZE).add(Items.BLAZE_ROD);
getOrCreateBuilder(Tags.Items.RODS_WOODEN).add(Items.STICK);
tag(Tags.Items.RODS).addTags(Tags.Items.RODS_BLAZE, Tags.Items.RODS_WOODEN);
tag(Tags.Items.RODS_BLAZE).add(Items.BLAZE_ROD);
tag(Tags.Items.RODS_WOODEN).add(Items.STICK);
copy(Tags.Blocks.SAND, Tags.Items.SAND);
copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS);
copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED);
copy(Tags.Blocks.SANDSTONE, Tags.Items.SANDSTONE);
getOrCreateBuilder(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT);
getOrCreateBuilder(Tags.Items.SEEDS_BEETROOT).add(Items.BEETROOT_SEEDS);
getOrCreateBuilder(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS);
getOrCreateBuilder(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS);
getOrCreateBuilder(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS);
getOrCreateBuilder(Tags.Items.SHEARS).add(Items.SHEARS);
getOrCreateBuilder(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL);
tag(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT);
tag(Tags.Items.SEEDS_BEETROOT).add(Items.BEETROOT_SEEDS);
tag(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS);
tag(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS);
tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS);
tag(Tags.Items.SHEARS).add(Items.SHEARS);
tag(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL);
copy(Tags.Blocks.STAINED_GLASS, Tags.Items.STAINED_GLASS);
copy(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES);
copy(Tags.Blocks.STONE, Tags.Items.STONE);
@@ -136,7 +136,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ);
copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE);
copy(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE);
getOrCreateBuilder(Tags.Items.STRING).add(Items.STRING);
tag(Tags.Items.STRING).add(Items.STRING);
}
private void addColored(Consumer<ITag.INamedTag<Item>> consumer, ITag.INamedTag<Item> group, String pattern)
@@ -144,12 +144,12 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
String prefix = group.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values())
{
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getTranslationKey()));
ITag.INamedTag<Item> tag = getForgeItemTag(prefix + color.getTranslationKey());
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getName()));
ITag.INamedTag<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());
getOrCreateBuilder(tag).add(item);
tag(tag).add(item);
consumer.accept(tag);
}
}
@@ -160,8 +160,8 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
String itemPre = itemGroup.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values())
{
ITag.INamedTag<Block> from = getForgeBlockTag(blockPre + color.getTranslationKey());
ITag.INamedTag<Item> to = getForgeItemTag(itemPre + color.getTranslationKey());
ITag.INamedTag<Block> from = getForgeBlockTag(blockPre + color.getName());
ITag.INamedTag<Item> to = getForgeItemTag(itemPre + color.getName());
copy(from, to);
}
copy(getForgeBlockTag(blockPre + "colorless"), getForgeItemTag(itemPre + "colorless"));
@@ -73,11 +73,11 @@ public class ForgeLootTableProvider extends LootTableProvider {
}
private boolean findAndReplaceInLootTableBuilder(LootTable.Builder builder, Item from, ITag.INamedTag<Item> to) {
List<LootPool> lootPools = ObfuscationReflectionHelper.getPrivateValue(LootTable.Builder.class, builder, "field_216041_a");
List<LootPool> lootPools = ObfuscationReflectionHelper.getPrivateValue(LootTable.Builder.class, builder, "pools");
boolean found = false;
if (lootPools == null) {
throw new IllegalStateException(LootTable.Builder.class.getName() + " is missing field field_216041_a");
throw new IllegalStateException(LootTable.Builder.class.getName() + " is missing field pools");
}
for (LootPool lootPool : lootPools) {
@@ -90,12 +90,12 @@ public class ForgeLootTableProvider extends LootTableProvider {
}
private boolean findAndReplaceInLootPool(LootPool lootPool, Item from, ITag.INamedTag<Item> to) {
List<LootEntry> lootEntries = ObfuscationReflectionHelper.getPrivateValue(LootPool.class, lootPool, "field_186453_a");
List<ILootCondition> lootConditions = ObfuscationReflectionHelper.getPrivateValue(LootPool.class, lootPool, "field_186454_b");
List<LootEntry> lootEntries = ObfuscationReflectionHelper.getPrivateValue(LootPool.class, lootPool, "entries");
List<ILootCondition> lootConditions = ObfuscationReflectionHelper.getPrivateValue(LootPool.class, lootPool, "conditions");
boolean found = false;
if (lootEntries == null) {
throw new IllegalStateException(LootPool.class.getName() + " is missing field field_186453_a");
throw new IllegalStateException(LootPool.class.getName() + " is missing field entries");
}
for (LootEntry lootEntry : lootEntries) {
@@ -107,19 +107,19 @@ public class ForgeLootTableProvider extends LootTableProvider {
}
if (lootConditions == null) {
throw new IllegalStateException(LootPool.class.getName() + " is missing field field_186454_b");
throw new IllegalStateException(LootPool.class.getName() + " is missing field conditions");
}
for (int i = 0; i < lootConditions.size(); i++) {
ILootCondition lootCondition = lootConditions.get(i);
if (lootCondition instanceof MatchTool && checkMatchTool((MatchTool) lootCondition, from)) {
lootConditions.set(i, MatchTool.builder(ItemPredicate.Builder.create().tag(to)).build());
lootConditions.set(i, MatchTool.toolMatches(ItemPredicate.Builder.item().of(to)).build());
found = true;
} else if (lootCondition instanceof Inverted) {
ILootCondition invLootCondition = ObfuscationReflectionHelper.getPrivateValue(Inverted.class, (Inverted) lootCondition, "field_215981_a");
ILootCondition invLootCondition = ObfuscationReflectionHelper.getPrivateValue(Inverted.class, (Inverted) lootCondition, "term");
if (invLootCondition instanceof MatchTool && checkMatchTool((MatchTool) invLootCondition, from)) {
lootConditions.set(i, Inverted.builder(MatchTool.builder(ItemPredicate.Builder.create().tag(to))).build());
lootConditions.set(i, Inverted.invert(MatchTool.toolMatches(ItemPredicate.Builder.item().of(to))).build());
found = true;
} else if (invLootCondition instanceof Alternative && findAndReplaceInAlternative((Alternative) invLootCondition, from, to)) {
found = true;
@@ -131,11 +131,11 @@ public class ForgeLootTableProvider extends LootTableProvider {
}
private boolean findAndReplaceInParentedLootEntry(ParentedLootEntry entry, Item from, ITag.INamedTag<Item> to) {
LootEntry[] lootEntries = ObfuscationReflectionHelper.getPrivateValue(ParentedLootEntry.class, entry, "field_216147_c");
LootEntry[] lootEntries = ObfuscationReflectionHelper.getPrivateValue(ParentedLootEntry.class, entry, "children");
boolean found = false;
if (lootEntries == null) {
throw new IllegalStateException(ParentedLootEntry.class.getName() + " is missing field field_216147_c");
throw new IllegalStateException(ParentedLootEntry.class.getName() + " is missing field children");
}
for (LootEntry lootEntry : lootEntries) {
@@ -148,18 +148,18 @@ public class ForgeLootTableProvider extends LootTableProvider {
}
private boolean findAndReplaceInLootEntry(LootEntry entry, Item from, ITag.INamedTag<Item> to) {
ILootCondition[] lootConditions = ObfuscationReflectionHelper.getPrivateValue(LootEntry.class, entry, "field_216144_d");
ILootCondition[] lootConditions = ObfuscationReflectionHelper.getPrivateValue(LootEntry.class, entry, "conditions");
boolean found = false;
if (lootConditions == null) {
throw new IllegalStateException(LootEntry.class.getName() + " is missing field field_216144_d");
throw new IllegalStateException(LootEntry.class.getName() + " is missing field conditions");
}
for (int i = 0; i < lootConditions.length; i++) {
if (lootConditions[i] instanceof Alternative && findAndReplaceInAlternative((Alternative) lootConditions[i], from, to)) {
found = true;
} else if (lootConditions[i] instanceof MatchTool && checkMatchTool((MatchTool) lootConditions[i], from)) {
lootConditions[i] = MatchTool.builder(ItemPredicate.Builder.create().tag(to)).build();
lootConditions[i] = MatchTool.toolMatches(ItemPredicate.Builder.item().of(to)).build();
found = true;
}
}
@@ -168,16 +168,16 @@ public class ForgeLootTableProvider extends LootTableProvider {
}
private boolean findAndReplaceInAlternative(Alternative alternative, Item from, ITag.INamedTag<Item> to) {
ILootCondition[] lootConditions = ObfuscationReflectionHelper.getPrivateValue(Alternative.class, alternative, "field_215962_a");
ILootCondition[] lootConditions = ObfuscationReflectionHelper.getPrivateValue(Alternative.class, alternative, "terms");
boolean found = false;
if (lootConditions == null) {
throw new IllegalStateException(Alternative.class.getName() + " is missing field field_215962_a");
throw new IllegalStateException(Alternative.class.getName() + " is missing field terms");
}
for (int i = 0; i < lootConditions.length; i++) {
if (lootConditions[i] instanceof MatchTool && checkMatchTool((MatchTool) lootConditions[i], from)) {
lootConditions[i] = MatchTool.builder(ItemPredicate.Builder.create().tag(to)).build();
lootConditions[i] = MatchTool.toolMatches(ItemPredicate.Builder.item().of(to)).build();
found = true;
}
}
@@ -186,8 +186,8 @@ public class ForgeLootTableProvider extends LootTableProvider {
}
private boolean checkMatchTool(MatchTool lootCondition, Item expected) {
ItemPredicate predicate = ObfuscationReflectionHelper.getPrivateValue(MatchTool.class, lootCondition, "field_216014_a");
Item item = ObfuscationReflectionHelper.getPrivateValue(ItemPredicate.class, predicate, "field_192496_b");
ItemPredicate predicate = ObfuscationReflectionHelper.getPrivateValue(MatchTool.class, lootCondition, "predicate");
Item item = ObfuscationReflectionHelper.getPrivateValue(ItemPredicate.class, predicate, "item");
return item != null && item.equals(expected);
}
}
@@ -71,7 +71,7 @@ public class ForgeRecipeProvider extends RecipeProvider
}
@Override
protected void registerRecipes(Consumer<IFinishedRecipe> consumer)
protected void buildShapelessRecipes(Consumer<IFinishedRecipe> consumer)
{
replace(Items.STICK, Tags.Items.RODS_WOODEN);
replace(Items.GOLD_INGOT, Tags.Items.INGOTS_GOLD);
@@ -94,7 +94,7 @@ public class ForgeRecipeProvider extends RecipeProvider
exclude(Blocks.COBBLESTONE_SLAB);
exclude(Blocks.COBBLESTONE_WALL);
super.registerRecipes(vanilla -> {
super.buildShapelessRecipes(vanilla -> {
IFinishedRecipe modified = enhance(vanilla);
if (modified != null)
consumer.accept(modified);
@@ -102,7 +102,7 @@ public class ForgeRecipeProvider extends RecipeProvider
}
@Override
protected void saveRecipeAdvancement(DirectoryCache cache, JsonObject advancementJson, Path pathIn) {
protected void saveAdvancement(DirectoryCache cache, JsonObject advancementJson, Path pathIn) {
//NOOP - We dont replace any of the advancement things yet...
}
@@ -121,7 +121,7 @@ public class ForgeRecipeProvider extends RecipeProvider
boolean modified = false;
for (int x = 0; x < ingredients.size(); x++)
{
Ingredient ing = enhance(vanilla.getID(), ingredients.get(x));
Ingredient ing = enhance(vanilla.getId(), ingredients.get(x));
if (ing != null)
{
ingredients.set(x, ing);
@@ -137,7 +137,7 @@ public class ForgeRecipeProvider extends RecipeProvider
boolean modified = false;
for (Character x : ingredients.keySet())
{
Ingredient ing = enhance(vanilla.getID(), ingredients.get(x));
Ingredient ing = enhance(vanilla.getId(), ingredients.get(x));
if (ing != null)
{
ingredients.put(x, ing);
@@ -159,7 +159,7 @@ public class ForgeRecipeProvider extends RecipeProvider
{
if (entry instanceof SingleItemList)
{
ItemStack stack = entry.getStacks().stream().findFirst().orElse(ItemStack.EMPTY);
ItemStack stack = entry.getItems().stream().findFirst().orElse(ItemStack.EMPTY);
ITag<Item> replacement = replacements.get(stack.getItem());
if (replacement != null)
{
@@ -172,7 +172,7 @@ public class ForgeRecipeProvider extends RecipeProvider
else
items.add(entry);
}
return modified ? Ingredient.fromItemListStream(items.stream()) : null;
return modified ? Ingredient.fromValues(items.stream()) : null;
}
@SuppressWarnings("unchecked")
@@ -68,7 +68,7 @@ public abstract class ForgeRegistryTagsProvider<T extends IForgeRegistryEntry<T>
}
@Override
protected Path makePath(ResourceLocation id)
protected Path getPath(ResourceLocation id)
{
return generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/" + folder + "/" + id.getPath() + ".json");
}
@@ -73,7 +73,7 @@ public abstract class GlobalLootModifierProvider implements IDataProvider
protected abstract void start();
@Override
public void act(DirectoryCache cache) throws IOException
public void run(DirectoryCache cache) throws IOException
{
start();
@@ -61,7 +61,7 @@ public abstract class LanguageProvider implements IDataProvider {
protected abstract void addTranslations();
@Override
public void act(DirectoryCache cache) throws IOException {
public void run(DirectoryCache cache) throws IOException {
addTranslations();
if (!data.isEmpty())
save(cache, data, this.gen.getOutputFolder().resolve("assets/" + modid + "/lang/" + locale + ".json"));
@@ -75,8 +75,8 @@ public abstract class LanguageProvider implements IDataProvider {
private void save(DirectoryCache cache, Object object, Path target) throws IOException {
String data = GSON.toJson(object);
data = JavaUnicodeEscaper.outsideOf(0, 0x7f).translate(data); // Escape unicode after the fact so that it's not double escaped by GSON
String hash = IDataProvider.HASH_FUNCTION.hashUnencodedChars(data).toString();
if (!Objects.equals(cache.getPreviousHash(target), hash) || !Files.exists(target)) {
String hash = IDataProvider.SHA1.hashUnencodedChars(data).toString();
if (!Objects.equals(cache.getHash(target), hash) || !Files.exists(target)) {
Files.createDirectories(target.getParent());
try (BufferedWriter bufferedwriter = Files.newBufferedWriter(target)) {
@@ -84,7 +84,7 @@ public abstract class LanguageProvider implements IDataProvider {
}
}
cache.recordHash(target, hash);
cache.putNew(target, hash);
}
public void addBlock(Supplier<? extends Block> key, String name) {
@@ -92,7 +92,7 @@ public abstract class LanguageProvider implements IDataProvider {
}
public void add(Block key, String name) {
add(key.getTranslationKey(), name);
add(key.getDescriptionId(), name);
}
public void addItem(Supplier<? extends Item> key, String name) {
@@ -100,7 +100,7 @@ public abstract class LanguageProvider implements IDataProvider {
}
public void add(Item key, String name) {
add(key.getTranslationKey(), name);
add(key.getDescriptionId(), name);
}
public void addItemStack(Supplier<ItemStack> key, String name) {
@@ -108,7 +108,7 @@ public abstract class LanguageProvider implements IDataProvider {
}
public void add(ItemStack key, String name) {
add(key.getTranslationKey(), name);
add(key.getDescriptionId(), name);
}
public void addEnchantment(Supplier<? extends Enchantment> key, String name) {
@@ -116,7 +116,7 @@ public abstract class LanguageProvider implements IDataProvider {
}
public void add(Enchantment key, String name) {
add(key.getName(), name);
add(key.getDescriptionId(), name);
}
/*
@@ -134,7 +134,7 @@ public abstract class LanguageProvider implements IDataProvider {
}
public void add(Effect key, String name) {
add(key.getName(), name);
add(key.getDescriptionId(), name);
}
public void addEntityType(Supplier<? extends EntityType<?>> key, String name) {
@@ -142,7 +142,7 @@ public abstract class LanguageProvider implements IDataProvider {
}
public void add(EntityType<?> key, String name) {
add(key.getTranslationKey(), name);
add(key.getDescriptionId(), name);
}
public void add(String key, String value) {