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

clean up mapping classes

Browse source
This commit is contained in:
Sen 2025-06-22 18:34:43 +02:00
parent e85166666f
commit 7c495f3d1c
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
12 changed files with 145 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,9 +20,8 @@ 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.util.BaseMapping;
import common.world.State;
public abstract class ModelBakery
@ -47,14 +46,14 @@ public abstract class ModelBakery
}
}
public static IRegistry<String, IBakedModel> setupModelRegistry(TextureMap textureMap,
public static BaseMapping<String, IBakedModel> setupModelRegistry(TextureMap textureMap,
Map<State, String> map)
{
final Map<String, TextureAtlasSprite> sprites = Maps.<String, TextureAtlasSprite>newHashMap();
Map<String, ModelBlock> models = Maps.<String, ModelBlock>newLinkedHashMap();
List<String> variants = Lists.<String>newArrayList();
FaceBakery faceBakery = new FaceBakery();
RegistrySimple<String, IBakedModel> bakedRegistry = new RegistrySimple();
BaseMapping<String, IBakedModel> bakedRegistry = new BaseMapping();
List<String> itemLocations = Lists.<String>newArrayList();
models.put(MISSING, (ModelBlock)new ModelBlock(null).add().all());
variants.add(MISSING);

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

@ -11,16 +11,17 @@ import common.block.Block;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.properties.Property;
import common.util.IRegistry;
import common.util.BaseMapping;
import common.world.State;
public class ModelManager
{
private IRegistry<String, IBakedModel> modelRegistry;
private final TextureMap texMap;
private final Map<State, IBakedModel> bakedModelStore = Maps.<State, IBakedModel>newIdentityHashMap();
private final Map<Block, StateMap> mappers = Maps.<Block, StateMap>newIdentityHashMap();
private final Set<Block> builtin = Collections.newSetFromMap(Maps.<Block, Boolean>newIdentityHashMap());
private BaseMapping<String, IBakedModel> modelRegistry;
private IBakedModel defaultModel;
public ModelManager(TextureMap textures)