Revert "[1.20.2] Add an event to register custom sprite source types (n…

…eoforged#77)"

This reverts commit 2f87365.

src/main/java/net/neoforged/neoforge/client/ClientHooks.java

@@ -5,8 +5,6 @@
 
 package net.neoforged.neoforge.client;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableMap;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.platform.Window;
@@ -76,7 +74,6 @@
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.client.renderer.texture.TextureAtlas;
-import net.minecraft.client.renderer.texture.atlas.SpriteSourceType;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.Material;
@@ -148,7 +145,6 @@
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent;
 import net.neoforged.neoforge.client.event.RegisterShadersEvent;
-import net.neoforged.neoforge.client.event.RegisterSpriteSourceTypesEvent;
 import net.neoforged.neoforge.client.event.RenderArmEvent;
 import net.neoforged.neoforge.client.event.RenderBlockScreenEffectEvent;
 import net.neoforged.neoforge.client.event.RenderHandEvent;
@@ -1037,17 +1033,6 @@ public static void onCreativeModeTabBuildContents(CreativeModeTab tab, ResourceK
             output.accept(entry.getKey(), entry.getValue());
     }
 
-    private static final BiMap<ResourceLocation, SpriteSourceType> SPRITE_SOURCE_TYPES_MAP = HashBiMap.create();
-
-    public static BiMap<ResourceLocation, SpriteSourceType> makeSpriteSourceTypesMap() {
-        return SPRITE_SOURCE_TYPES_MAP;
-    }
-
-    @ApiStatus.Internal
-    public static void registerSpriteSourceTypes() {
-        ModLoader.get().postEvent(new RegisterSpriteSourceTypesEvent(SPRITE_SOURCE_TYPES_MAP));
-    }
-
     // Make sure the below method is only ever called once (by forge).
     private static boolean initializedClientHooks = false;
 
@@ -1060,7 +1045,6 @@ public static void initClientHooks(Minecraft mc, ReloadableResourceManager resou
         initializedClientHooks = true;
 
         GameTestHooks.registerGametests();
-        registerSpriteSourceTypes();
         ModLoader.get().postEvent(new RegisterClientReloadListenersEvent(resourceManager));
         ModLoader.get().postEvent(new EntityRenderersEvent.RegisterLayerDefinitions());
         ModLoader.get().postEvent(new EntityRenderersEvent.RegisterRenderers());

src/main/java/net/neoforged/neoforge/data/loading/DatagenModLoader.java

@@ -16,7 +16,6 @@
 import net.minecraft.server.Bootstrap;
 import net.neoforged.fml.ModLoader;
 import net.neoforged.fml.ModWorkManager;
-import net.neoforged.neoforge.client.ClientHooks;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 import org.apache.logging.log4j.LogManager;
@@ -48,9 +47,6 @@ public static void begin(final Set<String> mods, final Path path, final Collecti
             // If we aren't generating data for forge, automatically add forge as an existing so mods can access forge's data
             existingMods.add("neoforge");
         }
-        if (clientGenerators) {
-            ClientHooks.registerSpriteSourceTypes();
-        }
         existingFileHelper = new ExistingFileHelper(existingPacks, existingMods, structureValidator, assetIndex, assetsDir);
         ModLoader.get().runEventGenerator(mc -> new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p -> dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()),
                 dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));

src/main/resources/META-INF/accesstransformer.cfg

@@ -176,13 +176,6 @@ public net.minecraft.client.renderer.entity.LivingEntityRenderer addLayer(Lnet/m
 public net.minecraft.client.renderer.texture.SpriteContents byMipLevel # byMipLevel
 default net.minecraft.client.renderer.texture.SpriteContents animatedTexture # animatedTexture
 default net.minecraft.client.renderer.texture.SpriteContents getFrameCount()I # getFrameCount
-public net.minecraft.client.renderer.texture.atlas.sources.PalettedPermutations <init>(Ljava/util/List;Lnet/minecraft/resources/ResourceLocation;Ljava/util/Map;)V # constructor
-public net.minecraft.client.renderer.texture.atlas.sources.PalettedPermutations$PalettedSpriteSupplier
-public net.minecraft.client.renderer.texture.atlas.sources.PalettedPermutations$PalettedSpriteSupplier <init>(Lnet/minecraft/client/renderer/texture/atlas/sources/LazyLoadedImage;Ljava/util/function/Supplier;Lnet/minecraft/resources/ResourceLocation;)V # constructor
-public net.minecraft.client.renderer.texture.atlas.sources.Unstitcher$Region
-public net.minecraft.client.renderer.texture.atlas.sources.Unstitcher$Region <init>(Lnet/minecraft/resources/ResourceLocation;DDDD)V # constructor
-public net.minecraft.client.renderer.texture.atlas.sources.Unstitcher$RegionInstance
-public net.minecraft.client.renderer.texture.atlas.sources.Unstitcher$RegionInstance <init>(Lnet/minecraft/client/renderer/texture/atlas/sources/LazyLoadedImage;Lnet/minecraft/client/renderer/texture/atlas/sources/Unstitcher$Region;DD)V # constructor
 public net.minecraft.client.resources.ClientPackSource createVanillaPackSource(Ljava/nio/file/Path;)Lnet/minecraft/server/packs/VanillaPackResources; # createVanillaPackSource
 protected net.minecraft.client.resources.TextureAtlasHolder textureAtlas # textureAtlas
 protected net.minecraft.client.resources.model.ModelBakery loadBlockModel(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/block/model/BlockModel; # loadBlockModel
@@ -517,4 +510,4 @@ public net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType <
 protected net.minecraft.world.level.portal.PortalForcer level # level
 public net.minecraft.world.level.storage.LevelResource <init>(Ljava/lang/String;)V # constructor
 private-f net.minecraft.world.level.storage.loot.LootPool rolls # rolls
-private-f net.minecraft.world.level.storage.loot.LootPool bonusRolls # bonusRolls
+private-f net.minecraft.world.level.storage.loot.LootPool bonusRolls # bonusRolls