mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-14 16:26:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
PepperCode1 2023-09-21 09:24:30 -07:00
commit f8bd8d641d
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/simibubi/create/foundation/data/LangEntry.java
View file

@ -1,9 +1,10 @@
package com.simibubi.create.foundation.data; package com.simibubi.create.foundation.data;
import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.AbstractRegistrate;
import com.tterrag.registrate.providers.ProviderType;
/** /**
* @deprecated Use {@link AbstractRegistrate#addRawLang} instead. * @deprecated Use {@link AbstractRegistrate#addRawLang} or {@link AbstractRegistrate#addDataGenerator} with {@link ProviderType#LANG} instead.
*/ */
public class LangEntry { public class LangEntry {
static final String ENTRY_FORMAT = "\t\"%s\": %s,\n"; static final String ENTRY_FORMAT = "\t\"%s\": %s,\n";

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.Util; import net.minecraft.Util;
import net.minecraft.data.CachedOutput; import net.minecraft.data.CachedOutput;
@ -33,7 +34,7 @@ import net.minecraft.resources.ResourceLocation;
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 {