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

fix model provider

Browse source
This commit is contained in:
Sen 2025-07-25 13:33:01 +02:00
parent 0e179b0410
commit edfd5332ee
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
92 changed files with 1233 additions and 1814 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/client/Client.java
View file

@ -62,7 +62,6 @@ import client.renderer.EntityRenderer;
import client.renderer.GlState;
import client.renderer.ItemRenderer;
import client.renderer.RenderGlobal;
import client.renderer.blockmodel.ModelBlock;
import client.renderer.blockmodel.ModelManager;
import client.renderer.chunk.RenderChunk;
import client.renderer.entity.RenderItem;
@ -626,7 +625,6 @@ public class Client implements IThreadListener {
if(Util.DEVMODE)
Log.SYSTEM.warn("Entwicklungsmodus aktiv - Debugging-Features sind verfügbar");
Window.init();
ModelBlock.setAsProvider();
Registry.register();
Log.setSync(CLIENT);
CLIENT.run(time);

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

@ -19,9 +19,10 @@ import common.collect.Sets;
import common.init.BlockRegistry;
import common.init.ItemRegistry;
import common.item.Item;
import common.model.ModelProvider;
import common.model.Model.ModelProvider;
import common.model.ModelRotation;
import common.model.GuiPosition;
import common.model.Model;
import common.util.Facing;
import common.util.Pair;
import common.world.State;
@ -50,6 +51,11 @@ public abstract class ModelBakery
public static Map<String, IBakedModel> setupModelRegistry(TextureMap textureMap,
Map<State, String> map)
{
final ModelProvider provider = new ModelProvider() {
public Model getModel(String primary) {
return new ModelBlock(primary);
}
};
final Map<String, Sprite> sprites = Maps.<String, Sprite>newHashMap();
Map<String, ModelBlock> models = Maps.<String, ModelBlock>newLinkedHashMap();
List<String> variants = Lists.<String>newArrayList();
@ -59,7 +65,7 @@ public abstract class ModelBakery
models.put(MISSING, (ModelBlock)new ModelBlock(null).add().all());
variants.add(MISSING);
for(Entry<State, String> entry : map.entrySet()) {
ModelBlock model = (ModelBlock)entry.getKey().getBlock().getModel(ModelBlock.PROVIDER, BlockRegistry.getName(entry.getKey().getBlock())
ModelBlock model = (ModelBlock)entry.getKey().getBlock().getModel(provider, BlockRegistry.getName(entry.getKey().getBlock())
.toString(), entry.getKey());
models.put(entry.getValue(), model);
variants.add(entry.getValue());
@ -67,7 +73,7 @@ public abstract class ModelBakery
for (Item item : ItemRegistry.items())
{
String loc = "item/" + ItemRegistry.getName(item);
models.put(loc, getModel(item, ModelBlock.PROVIDER, ItemRegistry.getName(item)));
models.put(loc, getModel(item, provider, ItemRegistry.getName(item)));
itemLocations.add(loc);
String[] extra = item.getSprites();
if(extra != null) {

11
client/src/main/java/client/renderer/blockmodel/ModelBlock.java
View file

@ -6,19 +6,12 @@ import client.renderer.texture.TextureMap;
import common.collect.Lists;
import common.collect.Maps;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;
import common.model.GuiPosition;
import common.util.Facing;
import common.util.Vector3f;
public class ModelBlock extends Model {
static final ModelProvider PROVIDER = new ModelProvider() {
public Model getModel(String primary) {
return new ModelBlock(primary);
}
};
private final List<BlockPart> elements;
private final boolean gui3d;
private final String primary;
@ -32,10 +25,6 @@ public class ModelBlock extends Model {
private BlockPart lastPart;
private BlockPartFace[] last;
public static void setAsProvider() {
ModelProvider.setProvider(PROVIDER);
}
public ModelBlock uvLock() {
this.uvLock = true;
return this;