From e81b0d8685b251d47ba243ec5510a5d44970d1f0 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Thu, 21 Sep 2023 10:08:21 -0700 Subject: [PATCH] Actually remove attachToRegistrateProvider Addons do not need it because it only attached Create's LangMerger and not an arbitrary LangMerger. --- .../create/foundation/data/LangMerger.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/main/java/com/simibubi/create/foundation/data/LangMerger.java b/src/main/java/com/simibubi/create/foundation/data/LangMerger.java index 16a357628..8cdb56bb0 100644 --- a/src/main/java/com/simibubi/create/foundation/data/LangMerger.java +++ b/src/main/java/com/simibubi/create/foundation/data/LangMerger.java @@ -28,12 +28,10 @@ import com.tterrag.registrate.providers.ProviderType; import net.minecraft.Util; import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; -import net.minecraftforge.fml.util.ObfuscationReflectionHelper; /** * @deprecated Use {@link AbstractRegistrate#addRawLang} or {@link AbstractRegistrate#addDataGenerator} with {@link ProviderType#LANG} instead. @@ -66,18 +64,6 @@ public class LangMerger implements DataProvider { populateLangIgnore(); } - public static void attachToRegistrateProvider(DataGenerator gen, PackOutput output) { - Map providers = - ObfuscationReflectionHelper.getPrivateValue(DataGenerator.class, gen, "providersToRun"); - Entry entryToReplace = null; - for (Entry entry : providers.entrySet()) - if (entry.getValue() instanceof RegistrateDataProvider rdp) - entryToReplace = entry; - if (entryToReplace != null) - providers.put(entryToReplace.getKey(), new ChainedDataProvider(entryToReplace.getValue(), - new LangMerger(output, Create.ID, Create.NAME, AllLangPartials.values()))); - } - protected void populateLangIgnore() { // Key prefixes added here will NOT be transferred to lang templates langIgnore.add("create.ponder.debug_"); // Ponder debug scene text