diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java index f24f6a45a..e2cb10905 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java @@ -6,10 +6,12 @@ import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.block.info.BlockDirection; import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; import com.raoulvdberge.refinedstorage.render.IModelRegistration; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileSecurityManager; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -28,6 +30,20 @@ public class BlockSecurityManager extends BlockNode { @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright( + base, + "refinedstorage:blocks/security_manager/cutouts/top_connected", + "refinedstorage:blocks/security_manager/cutouts/front_connected", + "refinedstorage:blocks/security_manager/cutouts/left_connected", + "refinedstorage:blocks/security_manager/cutouts/back_connected", + "refinedstorage:blocks/security_manager/cutouts/right_connected" + )); + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelCableCover.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelCableCover.java index 168f6617e..47dbd1657 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelCableCover.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelCableCover.java @@ -13,27 +13,21 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.property.IExtendedBlockState; -import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.util.vector.Vector3f; import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; import java.util.ArrayList; import java.util.List; -public class BakedModelCableCover implements IBakedModel { +public class BakedModelCableCover extends BakedModelDelegate { private static TextureAtlasSprite GREY_SPRITE; - private IBakedModel base; - public BakedModelCableCover(IBakedModel base) { - this.base = base; + super(base); } @Override @@ -362,45 +356,4 @@ public class BakedModelCableCover implements IBakedModel { .bake() ); } - - @Override - @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); - } - - @Override - public ItemOverrideList getOverrides() { - return base.getOverrides(); - } - - @Override - public boolean isAmbientOcclusion(IBlockState state) { - return base.isAmbientOcclusion(state); - } - - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return base.handlePerspective(cameraTransformType); - } - - @Override - public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() { - return base.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() { - return base.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDelegate.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDelegate.java new file mode 100644 index 000000000..683d97437 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDelegate.java @@ -0,0 +1,68 @@ +package com.raoulvdberge.refinedstorage.render.model.baked; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.EnumFacing; +import org.apache.commons.lang3.tuple.Pair; + +import javax.annotation.Nullable; +import javax.vecmath.Matrix4f; +import java.util.List; + +public class BakedModelDelegate implements IBakedModel { + protected final IBakedModel base; + + public BakedModelDelegate(IBakedModel base) { + this.base = base; + } + + @Override + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { + return base.getQuads(state, side, rand); + } + + @Override + public boolean isAmbientOcclusion() { + return base.isAmbientOcclusion(); + } + + @Override + public boolean isAmbientOcclusion(IBlockState state) { + return base.isAmbientOcclusion(state); + } + + @Override + public boolean isGui3d() { + return base.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() { + return base.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return base.getParticleTexture(); + } + + @Override + public ItemOverrideList getOverrides() { + return base.getOverrides(); + } + + @Override + @SuppressWarnings("deprecation") + public ItemCameraTransforms getItemCameraTransforms() { + return base.getItemCameraTransforms(); + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + return base.handlePerspective(cameraTransformType); + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskDrive.java index 8fde9a4a6..e3792b9ba 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskDrive.java @@ -9,9 +9,6 @@ import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -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.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; @@ -20,7 +17,7 @@ import javax.annotation.Nullable; import javax.vecmath.Vector3f; import java.util.*; -public class BakedModelDiskDrive implements IBakedModel { +public class BakedModelDiskDrive extends BakedModelDelegate { private class CacheKey { private IBlockState state; private EnumFacing side; @@ -64,7 +61,6 @@ public class BakedModelDiskDrive implements IBakedModel { } } - private IBakedModel base; private Map models = new HashMap<>(); private Map>> disks = new HashMap<>(); @@ -86,7 +82,7 @@ public class BakedModelDiskDrive implements IBakedModel { }); public BakedModelDiskDrive(IBakedModel base, IBakedModel disk, IBakedModel diskNearCapacity, IBakedModel diskFull, IBakedModel diskDisconnected) { - this.base = base; + super(base); for (EnumFacing facing : EnumFacing.HORIZONTALS) { models.put(facing, new BakedModelTRSR(base, facing)); @@ -143,35 +139,4 @@ public class BakedModelDiskDrive implements IBakedModel { return cache.getUnchecked(key); } - - @Override - public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() { - return base.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() { - return base.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); - } - - @Override - @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); - } - - @Override - public ItemOverrideList getOverrides() { - return base.getOverrides(); - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskManipulator.java index 3395a3183..1a0bb65ff 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelDiskManipulator.java @@ -9,9 +9,6 @@ import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -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.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; @@ -20,7 +17,7 @@ import javax.annotation.Nullable; import javax.vecmath.Vector3f; import java.util.*; -public class BakedModelDiskManipulator implements IBakedModel { +public class BakedModelDiskManipulator extends BakedModelDelegate { private class CacheKey { private IBlockState state; private EnumFacing side; @@ -64,7 +61,6 @@ public class BakedModelDiskManipulator implements IBakedModel { } } - private IBakedModel baseDisconnected; private Map modelsConnected = new HashMap<>(); private Map modelsDisconnected = new HashMap<>(); private Map>> disks = new HashMap<>(); @@ -87,7 +83,7 @@ public class BakedModelDiskManipulator implements IBakedModel { }); public BakedModelDiskManipulator(IBakedModel baseConnected, IBakedModel baseDisconnected, IBakedModel disk, IBakedModel diskNearCapacity, IBakedModel diskFull, IBakedModel diskDisconnected) { - this.baseDisconnected = baseDisconnected; + super(baseDisconnected); for (EnumFacing facing : EnumFacing.HORIZONTALS) { modelsConnected.put(facing, new BakedModelTRSR(baseConnected, facing)); @@ -132,48 +128,17 @@ public class BakedModelDiskManipulator implements IBakedModel { @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { if (!(state instanceof IExtendedBlockState)) { - return baseDisconnected.getQuads(state, side, rand); + return base.getQuads(state, side, rand); } Integer[] diskState = ((IExtendedBlockState) state).getValue(BlockDiskManipulator.DISK_STATE); if (diskState == null) { - return baseDisconnected.getQuads(state, side, rand); + return base.getQuads(state, side, rand); } CacheKey key = new CacheKey(((IExtendedBlockState) state).getClean(), side, diskState); return cache.getUnchecked(key); } - - @Override - public boolean isAmbientOcclusion() { - return baseDisconnected.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() { - return baseDisconnected.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() { - return baseDisconnected.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return baseDisconnected.getParticleTexture(); - } - - @Override - @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { - return baseDisconnected.getItemCameraTransforms(); - } - - @Override - public ItemOverrideList getOverrides() { - return baseDisconnected.getOverrides(); - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java new file mode 100644 index 000000000..4cfc20ef6 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java @@ -0,0 +1,129 @@ +package com.raoulvdberge.refinedstorage.render.model.baked; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.raoulvdberge.refinedstorage.util.RenderUtils; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.pipeline.VertexLighterFlat; +import net.minecraftforge.common.property.IExtendedBlockState; +import scala.actors.threadpool.Arrays; + +import javax.annotation.Nullable; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class BakedModelFullbright extends BakedModelDelegate { + private class CacheKey { + private IBakedModel base; + private Set textures; + private IBlockState state; + private EnumFacing side; + + public CacheKey(IBakedModel base, Set textures, IBlockState state, EnumFacing side) { + this.base = base; + this.textures = textures; + this.state = state; + this.side = side; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + + CacheKey cacheKey = (CacheKey) o; + + if (cacheKey.side != side) { + return false; + } + + if (!state.equals(cacheKey.state)) { + return false; + } + + return true; + } + + @Override + public int hashCode() { + return state.hashCode() + (31 * (side != null ? side.hashCode() : 0)); + } + } + + private static final LoadingCache> CACHE = CacheBuilder.newBuilder().build(new CacheLoader>() { + @Override + public List load(CacheKey key) throws Exception { + List quads = key.base.getQuads(key.state, key.side, 0); + + for (int i = 0; i < quads.size(); ++i) { + BakedQuad quad = quads.get(i); + + if (key.textures.contains(quad.getSprite().getIconName())) { + quads.set(i, transformQuad(quad, 0.007F)); + } + } + + return quads; + } + }); + + private Set textures; + + public BakedModelFullbright(IBakedModel base, String... textures) { + super(base); + + this.textures = new HashSet<>(Arrays.asList(textures)); + } + + @Override + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { + if (state == null) { + return base.getQuads(state, side, rand); + } + + return CACHE.getUnchecked(new CacheKey(base, textures, state instanceof IExtendedBlockState ? ((IExtendedBlockState) state).getClean() : state, side)); + } + + private static BakedQuad transformQuad(BakedQuad quad, float light) { + VertexFormat newFormat = RenderUtils.getFormatWithLightMap(quad.getFormat()); + + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(newFormat); + + VertexLighterFlat trans = new VertexLighterFlat(Minecraft.getMinecraft().getBlockColors()) { + @Override + protected void updateLightmap(float[] normal, float[] lightmap, float x, float y, float z) { + lightmap[0] = light; + lightmap[1] = light; + } + + @Override + public void setQuadTint(int tint) { + // NO OP + } + }; + + trans.setParent(builder); + + quad.pipe(trans); + + builder.setQuadTint(quad.getTintIndex()); + builder.setQuadOrientation(quad.getFace()); + builder.setTexture(quad.getSprite()); + builder.setApplyDiffuseLighting(false); + + return builder.build(); + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java index 126d60e2f..5946885b8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java @@ -5,29 +5,21 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import com.raoulvdberge.refinedstorage.item.ItemPattern; import com.raoulvdberge.refinedstorage.util.RenderUtils; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.model.TRSRTransformation; import org.apache.commons.lang3.tuple.Pair; -import javax.annotation.Nullable; import javax.vecmath.Matrix4f; -import java.util.List; - -public class BakedModelPattern implements IBakedModel { - private IBakedModel base; +public class BakedModelPattern extends BakedModelDelegate { public BakedModelPattern(IBakedModel base) { - this.base = base; + super(base); } @Override @@ -37,37 +29,6 @@ public class BakedModelPattern implements IBakedModel { return Pair.of(this, transform == null ? RenderUtils.EMPTY_MATRIX_TRANSFORM : transform.getMatrix()); } - @Override - public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { - return base.getQuads(state, side, rand); - } - - @Override - public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() { - return base.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() { - return base.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); - } - - @Override - @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); - } - @Override public ItemOverrideList getOverrides() { return new ItemOverrideList(base.getOverrides().getOverrides()) { diff --git a/src/main/resources/assets/refinedstorage/blockstates/security_manager.json b/src/main/resources/assets/refinedstorage/blockstates/security_manager.json index 2fed83c38..d0c365eb0 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/security_manager.json +++ b/src/main/resources/assets/refinedstorage/blockstates/security_manager.json @@ -1,15 +1,20 @@ { "forge_marker": 1, "defaults": { - "model": "cube", + "model": "refinedstorage:security_manager", "textures": { - "particle": "refinedstorage:blocks/security_manager_front_disconnected", - "down": "refinedstorage:blocks/security_manager_bottom", - "up": "refinedstorage:blocks/security_manager_top_disconnected", - "north": "refinedstorage:blocks/security_manager_front_disconnected", - "east": "refinedstorage:blocks/security_manager_left_disconnected", - "south": "refinedstorage:blocks/security_manager_back_disconnected", - "west": "refinedstorage:blocks/security_manager_right_disconnected" + "particle": "refinedstorage:blocks/security_manager/front", + "down": "refinedstorage:blocks/security_manager/bottom", + "up": "refinedstorage:blocks/security_manager/top", + "north": "refinedstorage:blocks/security_manager/front", + "east": "refinedstorage:blocks/security_manager/left", + "south": "refinedstorage:blocks/security_manager/back", + "west": "refinedstorage:blocks/security_manager/right", + "cutout_up": "refinedstorage:blocks/security_manager/cutouts/top_disconnected", + "cutout_north": "refinedstorage:blocks/security_manager/cutouts/front_disconnected", + "cutout_east": "refinedstorage:blocks/security_manager/cutouts/left_disconnected", + "cutout_south": "refinedstorage:blocks/security_manager/cutouts/back_disconnected", + "cutout_west": "refinedstorage:blocks/security_manager/cutouts/right_disconnected" } }, "variants": { @@ -21,11 +26,11 @@ "connected": { "true": { "textures": { - "up": "refinedstorage:blocks/security_manager_top_connected", - "north": "refinedstorage:blocks/security_manager_front_connected", - "east": "refinedstorage:blocks/security_manager_left_connected", - "south": "refinedstorage:blocks/security_manager_back_connected", - "west": "refinedstorage:blocks/security_manager_right_connected" + "cutout_up": "refinedstorage:blocks/security_manager/cutouts/top_connected", + "cutout_north": "refinedstorage:blocks/security_manager/cutouts/front_connected", + "cutout_east": "refinedstorage:blocks/security_manager/cutouts/left_connected", + "cutout_south": "refinedstorage:blocks/security_manager/cutouts/back_connected", + "cutout_west": "refinedstorage:blocks/security_manager/cutouts/right_connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/models/block/security_manager.json b/src/main/resources/assets/refinedstorage/models/block/security_manager.json new file mode 100644 index 000000000..a71b69487 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/security_manager.json @@ -0,0 +1,78 @@ +{ + "parent": "block/cube", + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "shade": false, + "faces": { + "up": { + "texture": "#cutout_up", + "cullface": "up" + }, + "north": { + "texture": "#cutout_north", + "cullface": "north" + }, + "south": { + "texture": "#cutout_south", + "cullface": "south" + }, + "west": { + "texture": "#cutout_west", + "cullface": "west" + }, + "east": { + "texture": "#cutout_east", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/back.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/back.png new file mode 100644 index 000000000..1b87bf05b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/back.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/bottom.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/security_manager_bottom.png rename to src/main/resources/assets/refinedstorage/textures/blocks/security_manager/bottom.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/back_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/back_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/back_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/back_disconnected.png new file mode 100644 index 000000000..bb33dbaa7 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/back_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/front_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/front_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/front_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/front_disconnected.png new file mode 100644 index 000000000..9538a69d3 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/front_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/left_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/left_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/left_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/left_disconnected.png new file mode 100644 index 000000000..e8efb48af Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/left_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/right_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/right_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/right_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/right_disconnected.png new file mode 100644 index 000000000..8648202ac Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/right_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/top_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/top_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/top_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/top_disconnected.png new file mode 100644 index 000000000..a3ae9cca5 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/cutouts/top_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/front.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/front.png new file mode 100644 index 000000000..019b77189 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/left.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/left.png new file mode 100644 index 000000000..6cc471736 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/left.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/right.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/right.png new file mode 100644 index 000000000..ec8e1f3be Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/right.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/top.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/top.png new file mode 100644 index 000000000..e3f1124a1 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager/top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected.png deleted file mode 100644 index 85ff53357..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_disconnected.png deleted file mode 100644 index 31023c88c..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected.png deleted file mode 100644 index 4ace03c7d..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_disconnected.png deleted file mode 100644 index 7b66c4921..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_front_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected.png deleted file mode 100644 index 1dd2f91ca..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_disconnected.png deleted file mode 100644 index 46362cc93..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected.png deleted file mode 100644 index 9a5948e0c..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_disconnected.png deleted file mode 100644 index 6c7f2bd4c..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected.png deleted file mode 100644 index 27f027928..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_disconnected.png deleted file mode 100644 index 94b230f55..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/security_manager_top_disconnected.png and /dev/null differ