sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

rendering cleanup

Browse source
This commit is contained in:
Sen 2025-06-22 12:27:25 +02:00
parent 1d937b466d
commit 3ae27fc27f
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
48 changed files with 365 additions and 978 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/src/main/java/common/block/natural/BlockFire.java
View file

@ -12,6 +12,7 @@ import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;
import common.model.ParticleType;
import common.model.TextureAnimation;
import common.properties.Property;
import common.properties.PropertyBool;
import common.properties.PropertyInteger;
@ -1144,8 +1145,8 @@ public class BlockFire extends Block
}
public void getAnimatedTextures(Map<String, Object> map) {
map.put("blocks/fire_layer_0", "fire1");
map.put("blocks/fire_layer_1", "fire2");
map.put("blocks/fire_layer_0", TextureAnimation.FIRE1);
map.put("blocks/fire_layer_1", TextureAnimation.FIRE2);
}
public boolean canExtinguish() {

5
common/src/main/java/common/block/natural/BlockTintedFire.java
View file

@ -4,6 +4,7 @@ import java.util.Map;
import common.model.Model;
import common.model.ModelProvider;
import common.model.TextureAnimation;
import common.util.BlockPos;
import common.world.IWorldAccess;
import common.world.State;
@ -29,7 +30,7 @@ public class BlockTintedFire extends BlockFire {
}
public void getAnimatedTextures(Map<String, Object> map) {
map.put("blocks/flame_layer_0", "flame1");
map.put("blocks/flame_layer_1", "flame2");
map.put("blocks/flame_layer_0", TextureAnimation.FLAME1);
map.put("blocks/flame_layer_1", TextureAnimation.FLAME2);
}
}

5
common/src/main/java/common/init/BlockRegistry.java
View file

@ -130,6 +130,7 @@ import common.color.DyeColor;
import common.init.FluidRegistry.LiquidType;
import common.item.CheatTab;
import common.log.Log;
import common.model.TextureAnimation;
import common.util.ObjectIntIdentityMap;
import common.util.RegistryNamespacedDefaultedByKey;
import common.util.Util;
@ -285,9 +286,9 @@ public abstract class BlockRegistry {
.setDisplay("Schwarzbruchstein").setTab(CheatTab.NATURE));
registerFluid("water", "Wasser", true, LiquidType.WATER, false, 0, 5, 0.0f, "water", "waterflow");
registerFluid("water", "Wasser", true, LiquidType.WATER, false, 0, 5, 0.0f, TextureAnimation.WATER, TextureAnimation.WATERFLOW);
registerFluid("lava", "Lava", false, LiquidType.LAVA, true, 15, -30, 0.0f, 2, 3);
registerFluid("magma", "Magma", false, LiquidType.HOT, true, 15, 40, 0.0f, "lava", "lavaflow");
registerFluid("magma", "Magma", false, LiquidType.HOT, true, 15, 40, 0.0f, TextureAnimation.LAVA, TextureAnimation.LAVAFLOW);
registerFluid("mercury", "Quecksilber", false, LiquidType.COLD, true, 0, 40, 0.0f, 8, 4);
registerFluid("hydrogen", "Wasserstoff", false, LiquidType.COLD, true, 0, 50, 0.0f, 8, 4);
registerFluid("acid", "Säure", false, LiquidType.HOT, false, 0, 5, 0.0f, 1, 1);

5
common/src/main/java/common/model/TextureAnimation.java Normal file
View file

@ -0,0 +1,5 @@
package common.model;
public enum TextureAnimation {
FIRE1, FIRE2, FLAME1, FLAME2, LAVAFLOW, LAVA, WATERFLOW, WATER;
}