mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-11-10 12:33:57 +01:00
Merge branch 'mc1.18/dev' into mc1.19/dev
This commit is contained in:
commit
61cb5cc112
@ -24,6 +24,7 @@ import com.google.gson.JsonObject;
|
||||
import com.simibubi.create.Create;
|
||||
import com.simibubi.create.foundation.ponder.PonderScene;
|
||||
import com.tterrag.registrate.AbstractRegistrate;
|
||||
import com.tterrag.registrate.providers.ProviderType;
|
||||
|
||||
import net.minecraft.data.CachedOutput;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
@ -31,7 +32,7 @@ import net.minecraft.data.DataProvider;
|
||||
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)
|
||||
public class LangMerger implements DataProvider {
|
||||
|
@ -3,9 +3,10 @@ package com.simibubi.create.foundation.data;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.simibubi.create.foundation.utility.FilesHelper;
|
||||
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)
|
||||
public interface LangPartial {
|
||||
|
Loading…
Reference in New Issue
Block a user