fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Quartz Tools and Quartz Knife Recipes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-30 15:33:53 +02:00
parent c0a4762ffc
commit 529d03fa9e
49 changed files with 329 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/crafting/EncodedPatternModelLoader.java
+2 -2
View File
@@ -5,7 +5,7 @@ import com.google.gson.JsonObject;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Identifier;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.JsonHelper;
import net.minecraftforge.client.model.IModelLoader;
/**
@@ -23,7 +23,7 @@ public class EncodedPatternModelLoader implements IModelLoader<EncodedPatternMod
@Override
public EncodedPatternModel read(JsonDeserializationContext deserializationContext, JsonObject modelContents) {
modelContents.remove("loader"); // Avoid recursion
Identifier baseModel = new Identifier(JSONUtils.getString(modelContents, "baseModel"));
Identifier baseModel = new Identifier(JsonHelper.getString(modelContents, "baseModel"));
return new EncodedPatternModel(baseModel);
}
src/main/java/appeng/client/render/model/UVLModelLoader.java
+2 -2
View File
@@ -56,7 +56,7 @@ import net.minecraft.client.render.model.ItemTransformVec3f;
import net.minecraft.client.util.SpriteIdentifier;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.math.Direction;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.JsonHelper;
import net.minecraftforge.client.model.IModelBuilder;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.IModelLoader;
@@ -109,7 +109,7 @@ public class UVLModelLoader implements IModelLoader<UVLModelLoader.UVLModelWrapp
return null;
}
object = object.get("uvlightmap").getAsJsonObject();
return new ImmutablePair<>(JSONUtils.getFloat(object, "sky", 0), JSONUtils.getFloat(object, "block", 0));
return new ImmutablePair<>(JsonHelper.getFloat(object, "sky", 0), JsonHelper.getFloat(object, "block", 0));
}
}