MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Null pointer translation fix

Browse source
This commit is contained in:
paulevsGitch 2021-11-02 15:25:08 +03:00
parent 8eba063b40
commit 3efa71b08a
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/bclib/complexmaterials/entry/RecipeEntry.java
View file

@ -3,7 +3,7 @@ package ru.bclib.complexmaterials.entry;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import ru.bclib.complexmaterials.ComplexMaterial; import ru.bclib.complexmaterials.ComplexMaterial;
import ru.bclib.config.PathConfig; import ru.bclib.config.PathConfig;
import ru.bclib.util.TriConsumer; import ru.bclib.interfaces.TriConsumer;
public class RecipeEntry extends ComplexMaterialEntry { public class RecipeEntry extends ComplexMaterialEntry {
final TriConsumer<ComplexMaterial, PathConfig, ResourceLocation> initFunction; final TriConsumer<ComplexMaterial, PathConfig, ResourceLocation> initFunction;

2
src/main/java/ru/bclib/gui/gridlayout/GridCell.java
View file

@ -3,7 +3,7 @@ package ru.bclib.gui.gridlayout;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import ru.bclib.util.TriConsumer; import ru.bclib.interfaces.TriConsumer;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;

2
src/main/java/ru/bclib/gui/gridlayout/GridLayout.java
View file

@ -6,7 +6,7 @@ import net.fabricmc.api.Environment;
import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.AbstractWidget;
import ru.bclib.gui.gridlayout.GridLayout.GridValueType; import ru.bclib.gui.gridlayout.GridLayout.GridValueType;
import ru.bclib.util.Pair; import ru.bclib.util.Pair;
import ru.bclib.util.TriConsumer; import ru.bclib.interfaces.TriConsumer;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;

2
src/main/java/ru/bclib/util/TriConsumer.java → src/main/java/ru/bclib/interfaces/TriConsumer.java
View file

@ -1,4 +1,4 @@
package ru.bclib.util; package ru.bclib.interfaces;
@FunctionalInterface @FunctionalInterface
public interface TriConsumer<A, B, C> { public interface TriConsumer<A, B, C> {

2
src/main/java/ru/bclib/util/TranslationHelper.java
View file

@ -30,7 +30,7 @@ public class TranslationHelper {
Gson gson = new Gson(); Gson gson = new Gson();
InputStream inputStream = TranslationHelper.class.getResourceAsStream("/assets/" + modID + "/lang/" + languageCode + ".json"); 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 -> { Registry.BLOCK.forEach(block -> {
if (Registry.BLOCK.getKey(block).getNamespace().equals(modID)) { if (Registry.BLOCK.getKey(block).getNamespace().equals(modID)) {