dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fullbright constructor, destructor, reader, writer. #1860

Browse Source
This commit is contained in:
raoulvdberge
2018-07-11 21:39:04 +02:00
parent 7e0e317598
commit 9eb96eef86
38 changed files with 77 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
View File

@@ -15,6 +15,7 @@ import com.raoulvdberge.refinedstorage.render.collision.AdvancedRayTracer;
import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
import com.raoulvdberge.refinedstorage.render.collision.constants.ConstantsCable;
import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelCableCover;
import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
import com.raoulvdberge.refinedstorage.tile.TileBase;
import com.raoulvdberge.refinedstorage.tile.TileCable;
import com.raoulvdberge.refinedstorage.tile.TileNode;
@@ -75,6 +76,10 @@ public class BlockCable extends BlockNode {
modelRegistration.addBakedModelOverride(info.getId(), BakedModelCableCover::new);
}
void registerCoverAndFullbright(IModelRegistration modelRegistration, String... textures) {
modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelCableCover(new BakedModelFullbright(base, textures)));
}
@Override
@SideOnly(Side.CLIENT)
public void registerModels(IModelRegistration modelRegistration) {

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java
View File

@@ -1,5 +1,6 @@
package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.block.info.BlockDirection;
import com.raoulvdberge.refinedstorage.render.IModelRegistration;
@@ -31,7 +32,7 @@ public class BlockConstructor extends BlockCable {
public void registerModels(IModelRegistration modelRegistration) {
modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
registerCover(modelRegistration);
registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/constructor/cutouts/connected");
}
@Override

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java
View File

@@ -1,5 +1,6 @@
package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.block.info.BlockDirection;
@@ -30,7 +31,7 @@ public class BlockDestructor extends BlockCable {
public void registerModels(IModelRegistration modelRegistration) {
modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
registerCover(modelRegistration);
registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/destructor/cutouts/connected");
}
@Override

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java
View File

@@ -1,5 +1,6 @@
package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel;
@@ -33,7 +34,7 @@ public class BlockReader extends BlockCable {
public void registerModels(IModelRegistration modelRegistration) {
modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
registerCover(modelRegistration);
registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/reader/cutouts/connected");
}
@Override

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java
View File

@@ -1,5 +1,6 @@
package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel;
@@ -34,7 +35,7 @@ public class BlockWriter extends BlockCable {
public void registerModels(IModelRegistration modelRegistration) {
modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
registerCover(modelRegistration);
registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/writer/cutouts/connected");
}
@Override

3
src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java
View File

@@ -16,6 +16,7 @@ import net.minecraftforge.common.property.IExtendedBlockState;
import scala.actors.threadpool.Arrays;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -66,7 +67,7 @@ public class BakedModelFullbright extends BakedModelDelegate {
private static final LoadingCache<CacheKey, List<BakedQuad>> CACHE = CacheBuilder.newBuilder().build(new CacheLoader<CacheKey, List<BakedQuad>>() {
@Override
public List<BakedQuad> load(CacheKey key) throws Exception {
List<BakedQuad> quads = key.base.getQuads(key.state, key.side, 0);
List<BakedQuad> quads = new ArrayList<>(key.base.getQuads(key.state, key.side, 0));
for (int i = 0; i < quads.size(); ++i) {
BakedQuad quad = quads.get(i);