aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-14 03:44:25 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-14 03:44:25 +0100
commitbaa391cc662db69168abb05630d757d225d45aa9 (patch)
tree146f055066e4c39cfa3789702e42812154a3d1d2 /src
parent2c1f93533419864702f3b79fd5a9add19cf2da3d (diff)
downloadGT5-Unofficial-baa391cc662db69168abb05630d757d225d45aa9.tar.gz
GT5-Unofficial-baa391cc662db69168abb05630d757d225d45aa9.tar.bz2
GT5-Unofficial-baa391cc662db69168abb05630d757d225d45aa9.zip
glass blocks texture
+added Connected Textures +added decorative colored blocks +added a shitton of needed Texture files +updated en_US.lang Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java92
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java133
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java34
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java19
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_BioLab.java1
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_BioVat.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java28
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/NEIbartworksConfig.java2
-rw-r--r--src/main/resources/assets/bartworks/lang/en_US.lang18
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.pngbin177 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.pngbin184 -> 0 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos.pngbin0 -> 177 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_0.pngbin0 -> 186 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_1.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_10.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_11.pngbin0 -> 182 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_12.pngbin0 -> 188 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_13.pngbin0 -> 183 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_14.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_15.pngbin0 -> 177 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_2.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_3.pngbin0 -> 182 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_4.pngbin0 -> 187 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_5.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_6.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_7.pngbin0 -> 180 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_8.pngbin0 -> 186 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_9.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_0.pngbin0 -> 211 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_1.pngbin0 -> 207 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_10.pngbin0 -> 228 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_11.pngbin0 -> 227 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_12.pngbin0 -> 207 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_13.pngbin0 -> 205 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_14.pngbin0 -> 207 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_15.pngbin0 -> 203 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_2.pngbin0 -> 211 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_3.pngbin0 -> 208 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_4.pngbin0 -> 209 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_5.pngbin0 -> 207 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_6.pngbin0 -> 206 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_7.pngbin0 -> 202 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_8.pngbin0 -> 227 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_9.pngbin0 -> 226 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock1.pngbin0 -> 187 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock2.pngbin0 -> 185 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock3.pngbin0 -> 187 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock4.pngbin0 -> 188 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock5.pngbin0 -> 187 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock6.pngbin0 -> 187 bytes
52 files changed, 313 insertions, 24 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java
new file mode 100644
index 0000000000..25f5c9220e
--- /dev/null
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2019 bartimaeusnek
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.bartimaeusnek.bartworks.client.renderer;
+
+import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks;
+import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList;
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.world.IBlockAccess;
+import org.lwjgl.opengl.GL11;
+
+public class RendererGlasBlock implements ISimpleBlockRenderingHandler {
+
+ public static final int RID = RenderingRegistry.getNextAvailableRenderId();
+ public static final RendererGlasBlock instance = new RendererGlasBlock();
+
+ @Override
+ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
+ Tessellator tessellator = Tessellator.instance;
+ block.setBlockBoundsForItemRender();
+ renderer.setRenderBoundsFromBlock(block);
+ GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
+ GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, -1.0F, 0.0F);
+ renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 1.0F, 0.0F);
+ renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 0.0F, -1.0F);
+ renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 0.0F, 1.0F);
+ renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(-1.0F, 0.0F, 0.0F);
+ renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(1.0F, 0.0F, 0.0F);
+ renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata));
+ tessellator.draw();
+ GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+ }
+
+ @Override
+ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
+ //renderer.setRenderBounds(0.001,0.001,0.001,0.999,0.999,0.999);
+ renderer.renderStandardBlock(BioItemList.bw_fake_glasses, x, y, z);
+ //renderer.setRenderBounds(0,0,0,1,1,1);
+ renderer.renderStandardBlockWithColorMultiplier(block, x, y, z, ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[0] / 255f, ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[1] / 255f, ((BW_GlasBlocks) block).getColor(world.getBlockMetadata(x, y, z))[2] / 255f);
+ return true;
+ }
+
+ @Override
+ public boolean shouldRender3DInInventory(int modelId) {
+ return true;
+ }
+
+ @Override
+ public int getRenderId() {
+ return RID;
+ }
+}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java
index ea7869c982..a067dae815 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java
@@ -41,9 +41,9 @@ import java.util.List;
public class BW_Blocks extends Block {
@SideOnly(Side.CLIENT)
- private IIcon[] texture;
- private String[] textureNames;
- private String name;
+ protected IIcon[] texture;
+ protected String[] textureNames;
+ protected String name;
public BW_Blocks(String name, String[] texture) {
super(Material.anvil);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java
index db93c1cfe6..4b10f1dc9a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java
@@ -22,16 +22,39 @@
package com.github.bartimaeusnek.bartworks.common.blocks;
+import com.github.bartimaeusnek.bartworks.client.renderer.RendererGlasBlock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
public class BW_GlasBlocks extends BW_Blocks {
+ @SideOnly(Side.CLIENT)
+ IIcon[] connectedTexture;
+
+ boolean connectedTex, fake;
+ short[][] color = new short[textureNames.length][3];
+
public BW_GlasBlocks(String name, String[] texture, CreativeTabs tabs) {
super(name, texture, tabs, Material.glass);
+ connectedTex = false;
+ }
+
+
+ public BW_GlasBlocks(String name, String[] texture, short[][] color, CreativeTabs tabs, boolean connectedTex, boolean fake) {
+ super(name, texture, tabs, Material.glass);
+ this.connectedTex = connectedTex;
+ this.color = color;
+ this.fake = fake;
+ }
+
+ public short[] getColor(int meta) {
+ return meta < texture.length ? color[meta] : color[0];
}
@Override
@@ -47,6 +70,108 @@ public class BW_GlasBlocks extends BW_Blocks {
return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide);
}
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIcon(int side, int meta) {
+ return meta < texture.length ? texture[meta] : texture[0];
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void registerBlockIcons(IIconRegister par1IconRegister) {
+ if (!connectedTex) {
+ texture = new IIcon[textureNames.length];
+ for (int i = 0; i < textureNames.length; i++) {
+ texture[i] = par1IconRegister.registerIcon(textureNames[i]);
+ }
+ return;
+ }
+ texture = new IIcon[textureNames.length];
+ connectedTexture = new IIcon[16];
+ for (int i = 0; i < textureNames.length; i++) {
+ texture[i] = par1IconRegister.registerIcon(textureNames[i]);
+ for (int j = 0; j < 16; j++) {
+ connectedTexture[j] = par1IconRegister.registerIcon(textureNames[0] + "_" + j);
+ }
+ }
+ }
+
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIcon(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) {
+ if (!connectedTex)
+ return super.getIcon(worldClient, xCoord, yCoord, zCoord, aSide);
+
+ ForgeDirection dir = ForgeDirection.getOrientation(aSide);
+ byte sides = 0;
+ switch (dir) {
+ case UP:
+ case DOWN: {
+ if (worldClient.getBlock(xCoord, yCoord, zCoord - 1) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0001);
+ if (worldClient.getBlock(xCoord, yCoord, zCoord + 1) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0010);
+ if (worldClient.getBlock(xCoord - 1, yCoord, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0100);
+ if (worldClient.getBlock(xCoord + 1, yCoord, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b1000);
+ break;
+ }
+ case EAST: {
+ if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0001);
+ if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0010);
+ if (worldClient.getBlock(xCoord, yCoord, zCoord + 1) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0100);
+ if (worldClient.getBlock(xCoord, yCoord, zCoord - 1) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b1000);
+ break;
+ }
+ case WEST: {
+ if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0001);
+ if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0010);
+ if (worldClient.getBlock(xCoord, yCoord, zCoord - 1) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0100);
+ if (worldClient.getBlock(xCoord, yCoord, zCoord + 1) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b1000);
+ break;
+
+ }
+ case NORTH: {
+ if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0001);
+ if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0010);
+ if (worldClient.getBlock(xCoord + 1, yCoord, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0100);
+ if (worldClient.getBlock(xCoord - 1, yCoord, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b1000);
+ break;
+ }
+ case SOUTH: {
+ if (worldClient.getBlock(xCoord, yCoord + 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0001);
+ if (worldClient.getBlock(xCoord, yCoord - 1, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0010);
+ if (worldClient.getBlock(xCoord - 1, yCoord, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b0100);
+ if (worldClient.getBlock(xCoord + 1, yCoord, zCoord) instanceof BW_GlasBlocks)
+ sides = (byte) (sides | 0b1000);
+ break;
+ }
+ case UNKNOWN:
+ default: {
+ break;
+ }
+ }
+ return connectedTexture[sides];
+ }
+
@Override
@SideOnly(Side.CLIENT)
public int getRenderBlockPass() {
@@ -54,6 +179,14 @@ public class BW_GlasBlocks extends BW_Blocks {
}
@Override
+ public int getRenderType() {
+ if (!fake)
+ return RendererGlasBlock.RID;
+ else
+ return 0;
+ }
+
+ @Override
public boolean renderAsNormalBlock() {
return false;
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java
index 088736025e..60614afde0 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java
@@ -48,17 +48,34 @@ public class BioItemList {
public static final Block[] bw_glasses = {
- new BW_GlasBlocks("BW_GlasBlocks", new String[]{
- MainMod.modID + ":BoronSilicateGlassBlock",
- MainMod.modID + ":NickelReinforcedBoronSilicateGlassBlock",
- MainMod.modID + ":TungstenReinforcedBoronSilicateGlassBlock",
- MainMod.modID + ":ChromeReinforcedBoronSilicateGlassBlock",
- MainMod.modID + ":IridiumReinforcedBoronSilicateGlassBlock",
- MainMod.modID + ":OsmiumReinforcedBoronSilicateGlassBlock",
- }, MainMod.BioTab
+ new BW_GlasBlocks(
+ "BW_GlasBlocks",
+ new String[]{
+ MainMod.modID + ":BoronSilicateGlassBlock",
+ MainMod.modID + ":NickelReinforcedBoronSilicateGlassBlock",
+ MainMod.modID + ":TungstenReinforcedBoronSilicateGlassBlock",
+ MainMod.modID + ":ChromeReinforcedBoronSilicateGlassBlock",
+ MainMod.modID + ":IridiumReinforcedBoronSilicateGlassBlock",
+ MainMod.modID + ":OsmiumReinforcedBoronSilicateGlassBlock",
+ MainMod.modID + ":ColoredBoronSilicateGlassBlock1",
+ MainMod.modID + ":ColoredBoronSilicateGlassBlock2",
+ MainMod.modID + ":ColoredBoronSilicateGlassBlock3",
+ MainMod.modID + ":ColoredBoronSilicateGlassBlock4",
+ MainMod.modID + ":ColoredBoronSilicateGlassBlock5",
+ MainMod.modID + ":ColoredBoronSilicateGlassBlock6",
+ },
+ new short[][]{Materials.BorosilicateGlass.getRGBA(), Materials.Nickel.getRGBA(), Materials.Tungsten.getRGBA(), Materials.Chrome.getRGBA(), Materials.Iridium.getRGBA(), Materials.Osmium.getRGBA(), new short[]{0xff, 0, 0}, new short[]{0, 0xff, 0}, new short[]{0x80, 0, 0xff}, new short[]{0xff, 0xff, 0}, new short[]{0, 0xff, 0x80}, new short[]{0x80, 0x33, 0}},
+ MainMod.BioTab,
+ true, false
)
};
+ public static final Block bw_fake_glasses =
+ new BW_GlasBlocks("BW_GlasBlocks", new String[]{
+ MainMod.modID + ":BoronSilicateGlassBlockRandlos"
+ }, null, null, true, true);
+
+
private static final Item mItemBioLabParts = new LabModule(new String[]{"DNAExtractionModule", "PCRThermoclyclingModule", "PlasmidSynthesisModule", "TransformationModule", "ClonalCellularSynthesisModule"});
public static final ItemStack[] mBioLabParts = {new ItemStack(mItemBioLabParts), new ItemStack(mItemBioLabParts, 1, 1), new ItemStack(mItemBioLabParts, 1, 2), new ItemStack(mItemBioLabParts, 1, 3), new ItemStack(mItemBioLabParts, 1, 4)};
private static final Item vanillaBioLabParts = new LabParts(new String[]{"petriDish", "DNASampleFlask", "PlasmidCell", "DetergentPowder", "Agarose", "IncubationModule", "PlasmaMembrane"});
@@ -67,6 +84,7 @@ public class BioItemList {
GameRegistry.registerItem(mItemBioLabParts, "BioLabModules");
GameRegistry.registerItem(vanillaBioLabParts, "BioLabParts");
GameRegistry.registerBlock(bw_glasses[0], BW_ItemBlocks.class, "BW_GlasBlocks");
+ GameRegistry.registerBlock(bw_fake_glasses, "BW_FakeGlasBlock");
//fixing BorosilicateGlass... -_-'
Materials.BorosilicateGlass.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_RECYCLING, SubTag.SMELTING_TO_FLUID);
GT_OreDictUnificator.add(OrePrefixes.block, Materials.BorosilicateGlass, new ItemStack(bw_glasses[0], 1, 0));
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
index 5fc32bcfc8..0987005a7f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
@@ -30,10 +30,7 @@ import com.github.bartimaeusnek.bartworks.util.BWRecipes;
import com.github.bartimaeusnek.bartworks.util.BW_Util;
import com.github.bartimaeusnek.bartworks.util.BioCulture;
import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -364,6 +361,14 @@ public class BioRecipeLoader extends RecipeLoader {
GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 3), Materials.Iridium.getMolten(3888), new ItemStack(BioItemList.bw_glasses[0], 1, 4), 800, BW_Util.getMachineVoltageFromTier(7));
GT_Values.RA.addFluidSolidifierRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 4), Materials.Osmium.getMolten(1296), new ItemStack(BioItemList.bw_glasses[0], 1, 5), 800, BW_Util.getMachineVoltageFromTier(8));
+ for (int i = 0; i < Dyes.dyeBrown.getSizeOfFluidList(); ++i) {
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 0), Dyes.dyeRed.getFluidDye(i, 36), new ItemStack(BioItemList.bw_glasses[0], 1, 6), null, null, null, 64, 2);
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 0), Dyes.dyeGreen.getFluidDye(i, 36), new ItemStack(BioItemList.bw_glasses[0], 1, 7), null, null, null, 64, 2);
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 0), Dyes.dyePurple.getFluidDye(i, 36), new ItemStack(BioItemList.bw_glasses[0], 1, 8), null, null, null, 64, 2);
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 0), Dyes.dyeYellow.getFluidDye(i, 36), new ItemStack(BioItemList.bw_glasses[0], 1, 9), null, null, null, 64, 2);
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 0), Dyes.dyeLime.getFluidDye(i, 36), new ItemStack(BioItemList.bw_glasses[0], 1, 10), null, null, null, 64, 2);
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 0), Dyes.dyeBrown.getFluidDye(i, 36), new ItemStack(BioItemList.bw_glasses[0], 1, 11), null, null, null, 64, 2);
+ }
//and reverse recipes... cause im nice :P
GT_Values.RA.addPulveriserRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 1), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nickel.getDust(36)}, null, 800, BW_Util.getMachineVoltageFromTier(3));
GT_Values.RA.addPulveriserRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 2), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nickel.getDust(36), Materials.Tungsten.getDust(9)}, null, 800, BW_Util.getMachineVoltageFromTier(5));
@@ -371,5 +376,11 @@ public class BioRecipeLoader extends RecipeLoader {
GT_Values.RA.addPulveriserRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 4), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nichrome.getDust(45), Materials.Tungsten.getDust(9), Materials.Iridium.getDust(27)}, null, 800, BW_Util.getMachineVoltageFromTier(7));
GT_Values.RA.addPulveriserRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, 5), new ItemStack[]{Materials.BorosilicateGlass.getDust(9), Materials.Nichrome.getDust(45), Materials.Tungsten.getDust(9), Materials.Osmiridium.getDust(36)}, null, 800, BW_Util.getMachineVoltageFromTier(8));
+ for (int i = 6; i < 11; i++) {
+ GT_Values.RA.addPulveriserRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, i), new ItemStack[]{Materials.BorosilicateGlass.getDust(9)}, null, 400, BW_Util.getMachineVoltageFromTier(1));
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(BioItemList.bw_glasses[0], 1, i), Materials.Chlorine.getGas(50), new ItemStack(BioItemList.bw_glasses[0], 1, 0), null, null, null, 64, 2);
+ }
+
+
}
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
index b060002b38..4646d850e0 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
@@ -22,6 +22,7 @@
package com.github.bartimaeusnek.bartworks.common.loaders;
+import com.github.bartimaeusnek.bartworks.client.renderer.RendererGlasBlock;
import com.github.bartimaeusnek.bartworks.client.renderer.RendererSwitchingColorFluid;
import com.github.bartimaeusnek.bartworks.common.blocks.BioFluidBlock;
import com.github.bartimaeusnek.bartworks.common.tileentities.BWTileEntityDimIDBridge;
@@ -81,5 +82,6 @@ public class FluidLoader implements Runnable {
GameRegistry.registerBlock(bioFluidBlock, "coloredFluidBlock");
GameRegistry.registerTileEntity(BWTileEntityDimIDBridge.class, "bwTEDimIDBridge");
RenderingRegistry.registerBlockHandler(RendererSwitchingColorFluid.instance);
+ RenderingRegistry.registerBlockHandler(RendererGlasBlock.instance);
}
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_BioLab.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_BioLab.java
index b68e399511..b6cb2dea3e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_BioLab.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_BioLab.java
@@ -132,7 +132,6 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine {
if (DNABioDataTag == null)
return super.checkRecipe(skipOC);
BioData cultureDNABioData = BioData.getBioDataFromName(DNABioDataTag.getString("Name"));
-
if (cultureDNABioData == null)
return super.checkRecipe(skipOC);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_BioVat.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_BioVat.java
index a7e153bdc1..f7f5024f4e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_BioVat.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_BioVat.java
@@ -390,7 +390,7 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_MultiBlockBase {
private byte calculateGlassTier(@Nonnull Block block, @Nonnegative Byte meta) {
if (block.equals(BioItemList.bw_glasses[0]))
- return meta > 1 ? (byte) (meta + 3) : 4;
+ return meta > 1 && meta < 6 ? (byte) (meta + 3) : 4;
if (block.getUnlocalizedName().equals("blockAlloyGlass"))
return 4;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java
index 388d888cf4..e1502041ed 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java
@@ -26,6 +26,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
import java.util.HashSet;
@@ -33,6 +34,32 @@ public class ConnectedBlocksChecker {
public final HashSet<Coords> hashset = new HashSet<Coords>();
+ public static byte check_sourroundings(Coords C, Block b) {
+ byte ret = 0;
+ World w = DimensionManager.getWorld(C.wID);
+ int x = C.x, y = C.y, z = C.z;
+
+ if (w.getBlock(x, y + 1, z).equals(b))
+ ret = (byte) (ret | 0b000001);
+
+ if (w.getBlock(x, y - 1, z).equals(b))
+ ret = (byte) (ret | 0b000010);
+
+ if (w.getBlock(x + 1, y, z).equals(b))
+ ret = (byte) (ret | 0b000100);
+
+ if (w.getBlock(x - 1, y, z).equals(b))
+ ret = (byte) (ret | 0b001000);
+
+ if (w.getBlock(x, y, z + 1).equals(b))
+ ret = (byte) (ret | 0b010000);
+
+ if (w.getBlock(x, y, z - 1).equals(b))
+ ret = (byte) (ret | 0b100000);
+
+ return ret;
+ }
+
public int get_connected(World w, int x, int y, int z, Block b) {
int ret = 0;
@@ -73,7 +100,6 @@ public class ConnectedBlocksChecker {
return ret;
}
-
public byte check_sourroundings(World w, int x, int y, int z, Block b) {
byte ret = 0;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/NEIbartworksConfig.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/NEIbartworksConfig.java
index e1e1df39c2..770f5edfe5 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/NEIbartworksConfig.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/NEIbartworksConfig.java
@@ -25,6 +25,7 @@ package com.github.bartimaeusnek.bartworks.util;
import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import com.github.bartimaeusnek.bartworks.MainMod;
+import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList;
import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import cpw.mods.fml.common.Optional;
@@ -50,5 +51,6 @@ public class NEIbartworksConfig implements IConfigureNEI {
public void loadConfig() {
API.hideItem(new ItemStack(ItemRegistry.tab));
API.hideItem(new ItemStack(FluidLoader.bioFluidBlock));
+ API.hideItem(new ItemStack(BioItemList.bw_fake_glasses));
}
} \ No newline at end of file
diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang
index cdcef27970..23cb370e17 100644
--- a/src/main/resources/assets/bartworks/lang/en_US.lang
+++ b/src/main/resources/assets/bartworks/lang/en_US.lang
@@ -38,9 +38,15 @@ labModule.item.PCRThermoclyclingModule.name=PCR Thermoclycle Module
labModule.item.PlasmidSynthesisModule.name=Plasmid Synthesis Module
labModule.item.TransformationModule.name=Transformation Module
labModule.item.ClonalCellularSynthesisModule.name=Clonal Cellular Synthesis Module
-BW_GlasBlocks.0.name=Borosilicate Glass Blocks
-BW_GlasBlocks.1.name=Nickel Reinforced Boroilicate GlassBlock
-BW_GlasBlocks.2.name=Tungsten Reinforced Boroilicate GlassBlock
-BW_GlasBlocks.3.name=Chrome Reinforced Boroilicate GlassBlock
-BW_GlasBlocks.4.name=Iridium Reinforced Boroilicate GlassBlock
-BW_GlasBlocks.5.name=Osmium Reinforced Boroilicate GlassBlock \ No newline at end of file
+BW_GlasBlocks.0.name=Borosilicate Glass Block
+BW_GlasBlocks.1.name=Nickel Reinforced Borosilicate Glass Block
+BW_GlasBlocks.2.name=Tungsten Reinforced Borosilicate Glass Block
+BW_GlasBlocks.3.name=Chrome Reinforced Borosilicate Glass Block
+BW_GlasBlocks.4.name=Iridium Reinforced Borosilicate Glass Block
+BW_GlasBlocks.5.name=Osmium Reinforced Borosilicate Glass Block
+BW_GlasBlocks.6.name=Colored Borosilicate Glass Block (Red)
+BW_GlasBlocks.7.name=Colored Borosilicate Glass Block (Green)
+BW_GlasBlocks.8.name=Colored Borosilicate Glass Block (Purple)
+BW_GlasBlocks.9.name=Colored Borosilicate Glass Block (Yellow)
+BW_GlasBlocks.10.name=Colored Borosilicate Glass Block (Light Green)
+BW_GlasBlocks.11.name=Colored Borosilicate Glass Block (Brown) \ No newline at end of file
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png
index 4ea5e5973f..0e27ddbb62 100644
--- a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.png
deleted file mode 100644
index 0e27ddbb62..0000000000
--- a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos.png
new file mode 100644
index 0000000000..f711908135
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_0.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_0.png
new file mode 100644
index 0000000000..5622806282
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_0.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_1.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_1.png
new file mode 100644
index 0000000000..c0b5b0da4d
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_1.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_10.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_10.png
new file mode 100644
index 0000000000..3c8b4c66d7
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_10.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_11.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_11.png
new file mode 100644
index 0000000000..036adac6f3
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_11.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_12.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_12.png
new file mode 100644
index 0000000000..ea67c34b23
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_12.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_13.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_13.png
new file mode 100644
index 0000000000..1727d6228a
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_13.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_14.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_14.png
new file mode 100644
index 0000000000..8795c1dacc
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_14.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_15.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_15.png
new file mode 100644
index 0000000000..f711908135
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_15.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_2.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_2.png
new file mode 100644
index 0000000000..c69982d8e7
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_2.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_3.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_3.png
new file mode 100644
index 0000000000..18eadf45ed
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_3.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_4.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_4.png
new file mode 100644
index 0000000000..269de3edb1
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_4.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_5.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_5.png
new file mode 100644
index 0000000000..198701e1bb
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_5.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_6.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_6.png
new file mode 100644
index 0000000000..9f050cc629
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_6.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_7.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_7.png
new file mode 100644
index 0000000000..4969508f31
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_7.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_8.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_8.png
new file mode 100644
index 0000000000..c73f1f5320
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_8.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_9.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_9.png
new file mode 100644
index 0000000000..f9a450ae2d
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRandlos_9.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_0.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_0.png
new file mode 100644
index 0000000000..f66994bcd2
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_0.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_1.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_1.png
new file mode 100644
index 0000000000..1249814be6
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_1.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_10.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_10.png
new file mode 100644
index 0000000000..0bb400b3dc
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_10.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_11.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_11.png
new file mode 100644
index 0000000000..e40c597ceb
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_11.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_12.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_12.png
new file mode 100644
index 0000000000..2ddabd3331
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_12.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_13.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_13.png
new file mode 100644
index 0000000000..617758a4b6
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_13.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_14.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_14.png
new file mode 100644
index 0000000000..a8ab0806e2
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_14.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_15.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_15.png
new file mode 100644
index 0000000000..d3f697ab1f
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_15.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_2.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_2.png
new file mode 100644
index 0000000000..543b011c03
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_2.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_3.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_3.png
new file mode 100644
index 0000000000..d69e640fb3
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_3.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_4.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_4.png
new file mode 100644
index 0000000000..48509772ce
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_4.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_5.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_5.png
new file mode 100644
index 0000000000..93dc271b8e
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_5.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_6.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_6.png
new file mode 100644
index 0000000000..da2f1deb4a
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_6.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_7.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_7.png
new file mode 100644
index 0000000000..4a7a5b4a3f
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_7.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_8.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_8.png
new file mode 100644
index 0000000000..fdf64c2958
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_8.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_9.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_9.png
new file mode 100644
index 0000000000..d4110a3b06
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock_9.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock1.png b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock1.png
new file mode 100644
index 0000000000..92ce6cb9a2
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock1.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock2.png b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock2.png
new file mode 100644
index 0000000000..0cc6e08ae3
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock2.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock3.png b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock3.png
new file mode 100644
index 0000000000..f230acbe3f
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock3.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock4.png b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock4.png
new file mode 100644
index 0000000000..2febb0540d
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock4.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock5.png b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock5.png
new file mode 100644
index 0000000000..89e0b0d84e
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock5.png
Binary files differ
diff --git a/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock6.png b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock6.png
new file mode 100644
index 0000000000..54c29e5ae9
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/blocks/ColoredBoronSilicateGlassBlock6.png
Binary files differ