mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Cache Overlay Model
This commit is contained in:
1 parent
6c869cab98
commit
375515937d
10 files changed
+94
-46
No files matched your search
@@ -34,6 +34,8 @@ public interface IModelBaker {
|
||||
|
||||
void addBakedModel(@Nullable IBlockState state, IBakedModel model);
|
||||
|
||||
void addBakedModelPost(@Nullable IBlockState state, IBakedModel model);
|
||||
|
||||
void addFace(EnumFacing facing, TextureAtlasSprite sprite);
|
||||
|
||||
void setModelState(@Nullable IModelState modelState);
|
||||
|
||||
@@ -14,9 +14,8 @@ import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import forestry.api.core.IModelBaker;
|
||||
import forestry.api.core.IModelBakerModel;
|
||||
import forestry.core.models.ModelManager;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
@@ -29,12 +28,18 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.model.IModelState;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import org.lwjgl.util.vector.Vector3f;
|
||||
|
||||
import forestry.api.core.IModelBaker;
|
||||
import forestry.api.core.IModelBakerModel;
|
||||
import forestry.core.models.ModelManager;
|
||||
|
||||
/**
|
||||
* A model baker to make custom block models with more than one texture layer.
|
||||
*/
|
||||
@@ -48,6 +53,7 @@ public final class ModelBaker implements IModelBaker {
|
||||
|
||||
private final List<ModelBakerFace> faces = new ArrayList<>();
|
||||
private final List<Pair<IBlockState, IBakedModel>> bakedModels = new ArrayList<>();
|
||||
private final List<Pair<IBlockState, IBakedModel>> bakedModelsPost = new ArrayList<>();
|
||||
|
||||
protected final ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().getDefaultBlockState());
|
||||
|
||||
@@ -103,6 +109,11 @@ public final class ModelBaker implements IModelBaker {
|
||||
this.bakedModels.add(Pair.of(state, model));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addBakedModelPost(@Nullable IBlockState state, IBakedModel model) {
|
||||
this.bakedModelsPost.add(Pair.of(state, model));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addFace(EnumFacing facing, TextureAtlasSprite sprite) {
|
||||
if (sprite != Minecraft.getMinecraft().getTextureMapBlocks().missingImage) {
|
||||
@@ -123,6 +134,10 @@ public final class ModelBaker implements IModelBaker {
|
||||
currentModel.addModelQuads(bakedModel);
|
||||
}
|
||||
|
||||
for (Pair<IBlockState, IBakedModel> bakedModel : bakedModelsPost) {
|
||||
currentModel.addModelQuadsPost(bakedModel);
|
||||
}
|
||||
|
||||
for (ModelBakerFace face : faces) {
|
||||
EnumFacing facing = face.face;
|
||||
BlockFaceUV uvFace = new BlockFaceUV(UVS, 0);
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.models.baker;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import javax.vecmath.Matrix4f;
|
||||
import java.util.ArrayList;
|
||||
@@ -17,8 +19,8 @@ import java.util.EnumMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import forestry.api.core.IModelBakerModel;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
@@ -28,11 +30,14 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformT
|
||||
import net.minecraft.client.renderer.block.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.common.model.IModelState;
|
||||
import net.minecraftforge.common.model.TRSRTransformation;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import forestry.api.core.IModelBakerModel;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelBakerModel implements IModelBakerModel {
|
||||
@@ -48,6 +53,7 @@ public class ModelBakerModel implements IModelBakerModel {
|
||||
private final Map<EnumFacing, List<BakedQuad>> faceQuads;
|
||||
private final List<BakedQuad> generalQuads;
|
||||
private final List<Pair<IBlockState, IBakedModel>> models;
|
||||
private final List<Pair<IBlockState, IBakedModel>> modelsPost;
|
||||
|
||||
private float[] rotation = getDefaultRotation();
|
||||
private float[] translation = getDefaultTranslation();
|
||||
@@ -55,6 +61,7 @@ public class ModelBakerModel implements IModelBakerModel {
|
||||
|
||||
public ModelBakerModel(IModelState modelState) {
|
||||
models = new ArrayList<>();
|
||||
modelsPost = new ArrayList<>();
|
||||
faceQuads = new EnumMap<>(EnumFacing.class);
|
||||
generalQuads = new ArrayList<>();
|
||||
particleSprite = Minecraft.getMinecraft().getTextureMapBlocks().missingImage;
|
||||
@@ -67,8 +74,9 @@ public class ModelBakerModel implements IModelBakerModel {
|
||||
}
|
||||
}
|
||||
|
||||
private ModelBakerModel(List<Pair<IBlockState, IBakedModel>> models, Map<EnumFacing, List<BakedQuad>> faceQuads, List<BakedQuad> generalQuads, boolean isGui3d, boolean isAmbientOcclusion, IModelState modelState, float[] rotation, float[] translation, float[] scale, TextureAtlasSprite particleSprite) {
|
||||
private ModelBakerModel(List<Pair<IBlockState, IBakedModel>> models, List<Pair<IBlockState, IBakedModel>> modelsPost, Map<EnumFacing, List<BakedQuad>> faceQuads, List<BakedQuad> generalQuads, boolean isGui3d, boolean isAmbientOcclusion, IModelState modelState, float[] rotation, float[] translation, float[] scale, TextureAtlasSprite particleSprite) {
|
||||
this.models = models;
|
||||
this.modelsPost = modelsPost;
|
||||
this.faceQuads = faceQuads;
|
||||
this.generalQuads = generalQuads;
|
||||
this.isGui3d = isGui3d;
|
||||
@@ -176,6 +184,10 @@ public class ModelBakerModel implements IModelBakerModel {
|
||||
this.models.add(model);
|
||||
}
|
||||
|
||||
public void addModelQuadsPost(Pair<IBlockState, IBakedModel> model) {
|
||||
this.modelsPost.add(model);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addQuad(@Nullable EnumFacing facing, BakedQuad quad) {
|
||||
if (facing != null) {
|
||||
@@ -198,11 +210,17 @@ public class ModelBakerModel implements IModelBakerModel {
|
||||
quads.addAll(faceQuads.get(side));
|
||||
}
|
||||
quads.addAll(generalQuads);
|
||||
for (Pair<IBlockState, IBakedModel> model : this.modelsPost) {
|
||||
List<BakedQuad> modelQuads = model.getRight().getQuads(model.getLeft(), side, rand);
|
||||
if (!modelQuads.isEmpty()) {
|
||||
quads.addAll(modelQuads);
|
||||
}
|
||||
}
|
||||
return quads;
|
||||
}
|
||||
|
||||
public ModelBakerModel copy() {
|
||||
return new ModelBakerModel(models, faceQuads, generalQuads, isGui3d, isAmbientOcclusion, modelState, rotation, translation, scale, particleSprite);
|
||||
return new ModelBakerModel(models, modelsPost, faceQuads, generalQuads, isGui3d, isAmbientOcclusion, modelState, rotation, translation, scale, particleSprite);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -268,7 +268,7 @@ public class BlockClimatiser extends Block implements IBlockWithMeta, ISpriteReg
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public boolean hasOverlaySprite(IBlockAccess world, BlockPos pos, int meta, int layer) {
|
||||
public boolean hasOverlaySprite(int meta, int layer) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -350,7 +350,7 @@ public class BlockGreenhouse extends BlockStructure implements ISpriteRegister,
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public boolean hasOverlaySprite(IBlockAccess world, BlockPos pos, int meta, int layer) {
|
||||
public boolean hasOverlaySprite(int meta, int layer) {
|
||||
BlockGreenhouseType type = BlockGreenhouseType.VALUES[meta];
|
||||
return layer == 0 || type.twoLayers;
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ public interface IBlockCamouflaged<B extends Block & IBlockCamouflaged<B>> {
|
||||
ICamouflageHandler getCamouflageHandler(@Nullable IBlockAccess world, @Nullable BlockPos pos);
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
boolean hasOverlaySprite(@Nullable IBlockAccess world, @Nullable BlockPos pos, int meta, int layer);
|
||||
boolean hasOverlaySprite(int meta, int layer);
|
||||
|
||||
int getLayers();
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ public class WidgetClimatePanel extends Widget {
|
||||
textField.setValidator(NUMBER_FILTER);
|
||||
textField.setEnableBackgroundDrawing(false);
|
||||
textField.setText(Float.toString(gui.container.getTargetedState().get(type)));
|
||||
table = new Table(Translator.translateToLocal("for.gui." + type.getName()));
|
||||
table = new Table();
|
||||
for(Map.Entry<String, Float> entry : data.getData(type).entrySet()){
|
||||
table.addValueEntry(entry.getKey(), StringUtil.floatAsPercent(entry.getValue()));
|
||||
}
|
||||
@@ -88,7 +88,7 @@ public class WidgetClimatePanel extends Widget {
|
||||
GlStateManager.color(1.0f, 1.0f, 1.0f);
|
||||
textField.drawTextBox();
|
||||
|
||||
table.draw(xPos + startX + 0, yPos + startY + 26, 14737632, false);
|
||||
table.draw(xPos + startX - 2, yPos + startY + 26, 14737632, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,12 +16,12 @@ import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
@@ -50,12 +50,11 @@ import forestry.greenhouse.multiblock.GreenhouseController;
|
||||
public class ModelCamouflaged<B extends Block & IBlockCamouflaged> extends ModelBlockDefault<B, ModelCamouflaged.Key> {
|
||||
public static final int DEFAULT_COLOR_INDEX = 100;
|
||||
public static final int OVERLAY_COLOR_INDEX = 101;
|
||||
public final ModelOverlay<B> overlayModel;
|
||||
|
||||
public ModelCamouflaged(Class<B> blockClass) {
|
||||
super(blockClass);
|
||||
}
|
||||
|
||||
private boolean isDefaultModel(Key key) {
|
||||
return key.pos == null || key.state == null || key.world == null;
|
||||
overlayModel = new ModelOverlay(blockClass);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -65,7 +64,7 @@ public class ModelCamouflaged<B extends Block & IBlockCamouflaged> extends Model
|
||||
|
||||
@Override
|
||||
protected Key getInventoryKey(ItemStack stack) {
|
||||
return new Key(null, null, null, stack.getItemDamage());
|
||||
return new Key(stack, stack.getItemDamage());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -82,14 +81,21 @@ public class ModelCamouflaged<B extends Block & IBlockCamouflaged> extends Model
|
||||
BlockPos pos = key.pos;
|
||||
BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer();
|
||||
addCamouflageModel(block, baker, layer, world, pos);
|
||||
if (layer == BlockRenderLayer.CUTOUT || layer == null) {
|
||||
/*if (layer == BlockRenderLayer.CUTOUT || layer == null) {
|
||||
for (int overlayLayer = 0; overlayLayer < block.getLayers(); overlayLayer++) {
|
||||
addOverlaySprite(block, baker, world, pos, key.state, key.meta, overlayLayer);
|
||||
}
|
||||
}*/
|
||||
IBakedModel model;
|
||||
if(key.state != null){
|
||||
model = overlayModel.getModel(key.state);
|
||||
}else{
|
||||
model = overlayModel.getModel(key.itemStack, Minecraft.getMinecraft().world);
|
||||
}
|
||||
baker.addBakedModelPost(key.state, model);
|
||||
}
|
||||
|
||||
private void addOverlaySprite(B block, IModelBaker baker, IBlockAccess world, BlockPos pos, IBlockState state, int meta, int layer) {
|
||||
/*private void addOverlaySprite(B block, IModelBaker baker, IBlockAccess world, BlockPos pos, IBlockState state, int meta, int layer) {
|
||||
if (block.hasOverlaySprite(world, pos, meta, layer)) {
|
||||
TextureAtlasSprite[] sprite = new TextureAtlasSprite[6];
|
||||
for (EnumFacing facing : EnumFacing.VALUES) {
|
||||
@@ -97,7 +103,7 @@ public class ModelCamouflaged<B extends Block & IBlockCamouflaged> extends Model
|
||||
}
|
||||
baker.addBlockModel(pos, sprite, OVERLAY_COLOR_INDEX + layer);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
private void addCamouflageModel(B block, IModelBaker baker, BlockRenderLayer layer, IBlockAccess world, BlockPos pos) {
|
||||
if (world == null || pos == null) {
|
||||
@@ -105,6 +111,7 @@ public class ModelCamouflaged<B extends Block & IBlockCamouflaged> extends Model
|
||||
|
||||
baker.addBlockModel(pos, defaultSprite, DEFAULT_COLOR_INDEX);
|
||||
baker.setParticleSprite(defaultSprite);
|
||||
ItemStack camouflageStack = GreenhouseController.createDefaultCamouflageBlock();
|
||||
} else {
|
||||
ItemStack camouflageStack = block.getCamouflageBlock(world, pos);
|
||||
Block camouflageBlock = Block.getBlockFromItem(camouflageStack.getItem());
|
||||
@@ -137,6 +144,7 @@ public class ModelCamouflaged<B extends Block & IBlockCamouflaged> extends Model
|
||||
public final IBlockAccess world;
|
||||
@Nullable
|
||||
public final BlockPos pos;
|
||||
public final ItemStack itemStack;
|
||||
public final int meta;
|
||||
|
||||
public Key(@Nullable IExtendedBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int meta) {
|
||||
@@ -144,6 +152,15 @@ public class ModelCamouflaged<B extends Block & IBlockCamouflaged> extends Model
|
||||
this.world = world;
|
||||
this.pos = pos;
|
||||
this.meta = meta;
|
||||
this.itemStack = ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
public Key(ItemStack itemStack, int meta) {
|
||||
this.state = null;
|
||||
this.world = null;
|
||||
this.pos = null;
|
||||
this.meta = meta;
|
||||
this.itemStack = itemStack;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,22 +14,19 @@ import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import net.minecraftforge.common.property.IExtendedBlockState;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.IModelBaker;
|
||||
import forestry.core.blocks.properties.UnlistedBlockAccess;
|
||||
import forestry.core.blocks.properties.UnlistedBlockPos;
|
||||
import forestry.core.models.ModelBlockCached;
|
||||
import forestry.greenhouse.blocks.BlockGreenhouseSprite;
|
||||
import forestry.greenhouse.blocks.BlockGreenhouseType;
|
||||
@@ -49,55 +46,54 @@ public class ModelOverlay<B extends Block & IBlockCamouflaged> extends ModelBloc
|
||||
return BlockGreenhouseSprite.getSprite(BlockGreenhouseType.PLAIN, null, null, -1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel getModel(IBlockState state) {
|
||||
return super.getModel(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel getModel(ItemStack stack, World world) {
|
||||
return super.getModel(stack, world);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Key getInventoryKey(ItemStack stack) {
|
||||
return new Key(null, null, null, stack.getItemDamage());
|
||||
return new Key(null, stack.getItemDamage());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Key getWorldKey(IBlockState state) {
|
||||
IExtendedBlockState stateExtended = (IExtendedBlockState) state;
|
||||
IBlockAccess world = stateExtended.getValue(UnlistedBlockAccess.BLOCKACCESS);
|
||||
BlockPos pos = stateExtended.getValue(UnlistedBlockPos.POS);
|
||||
int meta = state.getBlock().getMetaFromState(state);
|
||||
return new Key(stateExtended, world, pos, meta);
|
||||
return new Key(state, meta);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void bakeBlock(B block, Key key, IModelBaker baker, boolean inventory) {
|
||||
IBlockAccess world = key.world;
|
||||
BlockPos pos = key.pos;
|
||||
BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer();
|
||||
if (layer == BlockRenderLayer.CUTOUT || layer == null) {
|
||||
for (int overlayLayer = 0; overlayLayer < block.getLayers(); overlayLayer++) {
|
||||
addOverlaySprite(block, baker, world, pos, key.state, key.meta, overlayLayer);
|
||||
addOverlaySprite(block, baker, key.state, key.meta, overlayLayer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void addOverlaySprite(B block, IModelBaker baker, IBlockAccess world, BlockPos pos, IBlockState state, int meta, int layer) {
|
||||
if (block.hasOverlaySprite(world, pos, meta, layer)) {
|
||||
private void addOverlaySprite(B block, IModelBaker baker, IBlockState state, int meta, int layer) {
|
||||
if (block.hasOverlaySprite(meta, layer)) {
|
||||
TextureAtlasSprite[] sprite = new TextureAtlasSprite[6];
|
||||
for (EnumFacing facing : EnumFacing.VALUES) {
|
||||
sprite[facing.ordinal()] = block.getOverlaySprite(facing, state, meta, layer);
|
||||
}
|
||||
baker.addBlockModel(pos, sprite, OVERLAY_COLOR_INDEX + layer);
|
||||
baker.addBlockModel(null, sprite, OVERLAY_COLOR_INDEX + layer);
|
||||
}
|
||||
}
|
||||
|
||||
public static class Key {
|
||||
@Nullable
|
||||
public final IBlockState state;
|
||||
@Nullable
|
||||
public final IBlockAccess world;
|
||||
@Nullable
|
||||
public final BlockPos pos;
|
||||
public final int meta;
|
||||
|
||||
public Key(@Nullable IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int meta) {
|
||||
public Key(@Nullable IBlockState state, int meta) {
|
||||
this.state = state;
|
||||
this.world = world;
|
||||
this.pos = pos;
|
||||
this.meta = meta;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user