diff --git a/src/main/java/ru/bclib/complexmaterials/entry/RecipeEntry.java b/src/main/java/ru/bclib/complexmaterials/entry/RecipeEntry.java index d91a7ca8..d3c08420 100644 --- a/src/main/java/ru/bclib/complexmaterials/entry/RecipeEntry.java +++ b/src/main/java/ru/bclib/complexmaterials/entry/RecipeEntry.java @@ -3,7 +3,7 @@ package ru.bclib.complexmaterials.entry; import net.minecraft.resources.ResourceLocation; import ru.bclib.complexmaterials.ComplexMaterial; import ru.bclib.config.PathConfig; -import ru.bclib.util.TriConsumer; +import ru.bclib.interfaces.TriConsumer; public class RecipeEntry extends ComplexMaterialEntry { final TriConsumer initFunction; diff --git a/src/main/java/ru/bclib/gui/gridlayout/GridCell.java b/src/main/java/ru/bclib/gui/gridlayout/GridCell.java index f3912879..6e99bbea 100644 --- a/src/main/java/ru/bclib/gui/gridlayout/GridCell.java +++ b/src/main/java/ru/bclib/gui/gridlayout/GridCell.java @@ -3,7 +3,7 @@ package ru.bclib.gui.gridlayout; import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import ru.bclib.util.TriConsumer; +import ru.bclib.interfaces.TriConsumer; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/ru/bclib/gui/gridlayout/GridLayout.java b/src/main/java/ru/bclib/gui/gridlayout/GridLayout.java index a44cf0f0..4a2b50d1 100644 --- a/src/main/java/ru/bclib/gui/gridlayout/GridLayout.java +++ b/src/main/java/ru/bclib/gui/gridlayout/GridLayout.java @@ -6,7 +6,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.AbstractWidget; import ru.bclib.gui.gridlayout.GridLayout.GridValueType; import ru.bclib.util.Pair; -import ru.bclib.util.TriConsumer; +import ru.bclib.interfaces.TriConsumer; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/ru/bclib/util/TriConsumer.java b/src/main/java/ru/bclib/interfaces/TriConsumer.java similarity index 76% rename from src/main/java/ru/bclib/util/TriConsumer.java rename to src/main/java/ru/bclib/interfaces/TriConsumer.java index 6e5ac17c..dab5678f 100644 --- a/src/main/java/ru/bclib/util/TriConsumer.java +++ b/src/main/java/ru/bclib/interfaces/TriConsumer.java @@ -1,4 +1,4 @@ -package ru.bclib.util; +package ru.bclib.interfaces; @FunctionalInterface public interface TriConsumer { diff --git a/src/main/java/ru/bclib/util/TranslationHelper.java b/src/main/java/ru/bclib/util/TranslationHelper.java index bb1b5735..d85a07ba 100644 --- a/src/main/java/ru/bclib/util/TranslationHelper.java +++ b/src/main/java/ru/bclib/util/TranslationHelper.java @@ -30,7 +30,7 @@ public class TranslationHelper { Gson gson = new Gson(); InputStream inputStream = TranslationHelper.class.getResourceAsStream("/assets/" + modID + "/lang/" + languageCode + ".json"); - JsonObject translation = gson.fromJson(new InputStreamReader(inputStream), JsonObject.class); + JsonObject translation = inputStream == null ? new JsonObject() : gson.fromJson(new InputStreamReader(inputStream), JsonObject.class); Registry.BLOCK.forEach(block -> { if (Registry.BLOCK.getKey(block).getNamespace().equals(modID)) {