mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-13 05:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mc1.18/dev' into mc1.19/dev

Browse Source
This commit is contained in:
PepperCode1 2023-09-21 09:22:09 -07:00
commit 61cb5cc112
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/simibubi/create/foundation/data/LangMerger.java
View File

@ -24,6 +24,7 @@ import com.google.gson.JsonObject;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.foundation.ponder.PonderScene; import com.simibubi.create.foundation.ponder.PonderScene;
import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.AbstractRegistrate;
import com.tterrag.registrate.providers.ProviderType;
import net.minecraft.data.CachedOutput; import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
@ -31,7 +32,7 @@ import net.minecraft.data.DataProvider;
import net.minecraft.util.GsonHelper; import net.minecraft.util.GsonHelper;
/** /**
* @deprecated Use {@link AbstractRegistrate#addRawLang} instead. * @deprecated Use {@link AbstractRegistrate#addRawLang} or {@link AbstractRegistrate#addDataGenerator} with {@link ProviderType#LANG} instead.
*/ */
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)
public class LangMerger implements DataProvider { public class LangMerger implements DataProvider {

3
src/main/java/com/simibubi/create/foundation/data/LangPartial.java
View File

@ -3,9 +3,10 @@ package com.simibubi.create.foundation.data;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.simibubi.create.foundation.utility.FilesHelper; import com.simibubi.create.foundation.utility.FilesHelper;
import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.AbstractRegistrate;
import com.tterrag.registrate.providers.ProviderType;
/** /**
* @deprecated Use {@link AbstractRegistrate#addRawLang} or, if absolutely necessary, {@link CreateRegistrate#addLangPostprocessor} instead. * @deprecated Use {@link AbstractRegistrate#addRawLang} or {@link AbstractRegistrate#addDataGenerator} with {@link ProviderType#LANG} instead.
*/ */
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)
public interface LangPartial { public interface LangPartial {