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

inline fluid registry

Browse source
This commit is contained in:
Sen 2025-06-22 18:03:33 +02:00
parent 039a7d7d9e
commit eb5c03dda3
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
12 changed files with 105 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/src/main/java/client/renderer/BlockRenderer.java
View file

@ -16,14 +16,16 @@ import client.renderer.texture.TextureMap;
import client.renderer.tileentity.TileEntityItemStackRenderer;
import common.block.Block;
import common.block.Material;
import common.block.liquid.BlockDynamicLiquid;
import common.block.liquid.BlockLiquid;
import common.block.liquid.BlockStaticLiquid;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.init.FluidRegistry;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.ExtMath;
import common.util.Facing;
import common.util.Pair;
import common.util.Vec3i;
import common.world.IBlockAccess;
import common.world.IWorldAccess;
@ -406,12 +408,11 @@ public class BlockRenderer
private void initAtlasSprites()
{
TextureMap texturemap = Client.CLIENT.getTextureMapBlocks();
for(int z = 0; z < FluidRegistry.getNumFluids(); z++) {
BlockLiquid block = FluidRegistry.getStaticBlock(z);
String name = BlockRegistry.getNameFromBlock(block).toString();
for(Pair<BlockStaticLiquid, BlockDynamicLiquid> liquid : BlockLiquid.LIQUIDS) {
String name = BlockRegistry.getNameFromBlock(liquid.first());
TextureAtlasSprite[] sprites = new TextureAtlasSprite[] {texturemap.getAtlasSprite("blocks/" + name + "_still"), texturemap.getAtlasSprite("blocks/" + name + "_flow")};
this.fluids.put(FluidRegistry.getFluidBlock(z), sprites);
this.fluids.put(block, sprites);
this.fluids.put(liquid.second(), sprites);
this.fluids.put(liquid.first(), sprites);
}
}

9
client/src/main/java/client/renderer/blockmodel/ModelBakery.java
View file

@ -9,16 +9,19 @@ import java.util.Set;
import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import common.block.liquid.BlockDynamicLiquid;
import common.block.liquid.BlockLiquid;
import common.block.liquid.BlockStaticLiquid;
import common.collect.Lists;
import common.collect.Maps;
import common.collect.Sets;
import common.init.BlockRegistry;
import common.init.FluidRegistry;
import common.init.ItemRegistry;
import common.item.Item;
import common.model.ModelRotation;
import common.util.Facing;
import common.util.IRegistry;
import common.util.Pair;
import common.util.RegistrySimple;
import common.world.State;
@ -37,8 +40,8 @@ public abstract class ModelBakery
public static final ModelBlock MODEL_ENTITY = (ModelBlock)new ModelBlock(null).add().d("");
static {
for(int z = 0; z < FluidRegistry.getNumFluids(); z++) {
String name = BlockRegistry.getNameFromBlock(FluidRegistry.getStaticBlock(z)).toString();
for(Pair<BlockStaticLiquid, BlockDynamicLiquid> liquid : BlockLiquid.LIQUIDS) {
String name = BlockRegistry.getNameFromBlock(liquid.first());
BUILTINS.add("blocks/" + name + "_flow");
BUILTINS.add("blocks/" + name + "_still");
}

3
client/src/main/java/client/renderer/blockmodel/ModelManager.java
View file

@ -12,7 +12,6 @@ import common.block.liquid.BlockLiquid;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.init.Blocks;
import common.init.FluidRegistry;
import common.properties.Property;
import common.util.IRegistry;
import common.world.State;
@ -94,7 +93,7 @@ public class ModelManager
{
String texture = this.liquidMap.get(block);
if(texture == null)
this.liquidMap.put(block, texture = "blocks/" + BlockRegistry.getNameFromBlock(FluidRegistry.getStaticBlock(FluidRegistry.getFluidMeta((BlockLiquid)block))) + "_still");
this.liquidMap.put(block, texture = "blocks/" + BlockRegistry.getNameFromFluid((BlockLiquid)block) + "_still");
return this.texMap.getAtlasSprite(texture);
}
}

7
client/src/main/java/client/renderer/texture/TextureMap.java
View file

@ -15,7 +15,6 @@ import common.block.Block;
import common.collect.Lists;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.init.FluidRegistry;
import common.log.Log;
import common.model.TextureAnimation;
@ -45,12 +44,6 @@ public class TextureMap extends Texture
for(Block block : BlockRegistry.REGISTRY) {
block.getAnimatedTextures(map);
}
for(int z = 0; z < FluidRegistry.getNumFluids(); z++) {
map.put("blocks/" + BlockRegistry.getNameFromBlock(FluidRegistry.getStaticBlock(z)) + "_still",
FluidRegistry.getStaticAnim(z));
map.put("blocks/" + BlockRegistry.getNameFromBlock(FluidRegistry.getStaticBlock(z)) + "_flow",
FluidRegistry.getFluidAnim(z));
}
for(Entry<String, Object> entry : map.entrySet()) {
if(entry.getValue() instanceof Integer) {
this.animTextures.put(entry.getKey(), (Integer)entry.getValue());