aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorYang Xizhi <60341015+GlodBlock@users.noreply.github.com>2022-08-23 14:16:49 +0800
committerGitHub <noreply@github.com>2022-08-23 08:16:49 +0200
commitb85193cab549da134ae0e0a3c6157959eb5ba9d3 (patch)
treebd9c5787de8134ec5c392f0b1c627780b7744364 /src/main
parent61bf7cd2215e844aff5f18837499cf0d40bc2a41 (diff)
downloadGT5-Unofficial-b85193cab549da134ae0e0a3c6157959eb5ba9d3.tar.gz
GT5-Unofficial-b85193cab549da134ae0e0a3c6157959eb5ba9d3.tar.bz2
GT5-Unofficial-b85193cab549da134ae0e0a3c6157959eb5ba9d3.zip
use consistent molten texture as gt5 (#295)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java2
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.pngbin2928 -> 1558 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta48
3 files changed, 45 insertions, 5 deletions
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 73fa919731..fe190fa107 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -202,7 +202,7 @@ public class FluidUtils {
}
public static Fluid addGTFluid(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) {
- return addGTFluid("molten."+aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell);
+ return addGTFluid("molten."+aName, "molten.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell);
}
public static Fluid addGTFluidNonMolten(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) {
diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png
index 7c5ffd0c77..ee40545a46 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta
index b8533e5109..7ceb363941 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta
+++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta
@@ -1,5 +1,45 @@
-{
- "animation":{
- "frametime":4
- }
+{
+ "animation": {
+ "frametime": 2,
+ "frames": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 18,
+ 17,
+ 16,
+ 15,
+ 14,
+ 13,
+ 12,
+ 11,
+ 10,
+ 9,
+ 8,
+ 7,
+ 6,
+ 5,
+ 4,
+ 3,
+ 2,
+ 1
+ ]
+ }
} \ No newline at end of file