diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index 1221c794..d839c3c0 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -35,7 +35,8 @@ public class GlassPaneConnected extends GlassBlockConnected { return icons[15]; } - return getSideTextureIndex(blockAccess.getBlockMetadata(x, y, z)); + int meta = blockAccess.getBlockMetadata(x, y, z); + return side == 0 ? getBottomIcon(meta) : getTopIcon(meta); } return super.getConnectedBlockTexture(blockAccess, x, y, z, side, icons); @@ -117,7 +118,11 @@ public class GlassPaneConnected extends GlassBlockConnected { this.setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3); } - public IIcon getSideTextureIndex(int meta) { + public IIcon getTopIcon(int meta) { + return sideIcon; + } + + public IIcon getBottomIcon(int meta) { return sideIcon; } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnectedMeta.java index 3039a71d..b9283343 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnectedMeta.java @@ -16,16 +16,18 @@ import tconstruct.util.config.PHConstruct; public class GlassPaneConnectedMeta extends GlassPaneConnected { - public String[] textures; - public IIcon[][] icons; - public IIcon[] sideIcons; + private final String[] textures; + private final IIcon[][] icons; + private final IIcon[] topIcons; + private final IIcon[] bottomIcons; public static final boolean ignoreMetaForConnectedGlass = PHConstruct.connectedTexturesMode == 2; public GlassPaneConnectedMeta(String location, boolean hasAlpha, String... textures) { super(location, hasAlpha); this.textures = textures; this.icons = new IIcon[textures.length][16]; - this.sideIcons = new IIcon[textures.length]; + this.topIcons = new IIcon[textures.length]; + this.bottomIcons = new IIcon[textures.length]; } @Override @@ -61,13 +63,19 @@ public class GlassPaneConnectedMeta extends GlassPaneConnected { public void registerBlockIcons(IIconRegister iconRegister) { for (int i = 0; i < textures.length; i++) { registerBlockIcons(iconRegister, icons[i], folder + "/" + textures[i]); - sideIcons[i] = iconRegister.registerIcon("tinker:glass/" + folder + "/" + textures[i] + "/glass_side"); + topIcons[i] = iconRegister.registerIcon("tinker:glass/" + folder + "/" + textures[i] + "/glass_top"); + bottomIcons[i] = iconRegister.registerIcon("tinker:glass/" + folder + "/" + textures[i] + "/glass_bottom"); } } @Override - public IIcon getSideTextureIndex(int meta) { - return sideIcons[meta]; + public IIcon getTopIcon(int meta) { + return topIcons[meta]; + } + + @Override + public IIcon getBottomIcon(int meta) { + return bottomIcons[meta]; } @Override diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/black/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/black/glass_bottom.png new file mode 100644 index 00000000..7bb1d516 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/black/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/black/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/black/glass_top.png new file mode 100644 index 00000000..493d357c Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/black/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_bottom.png new file mode 100644 index 00000000..9affc74a Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_top.png new file mode 100644 index 00000000..96534914 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/blue/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_bottom.png new file mode 100644 index 00000000..6d059852 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_top.png new file mode 100644 index 00000000..21ba3a29 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/brown/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_bottom.png new file mode 100644 index 00000000..e7a8d2b4 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_top.png new file mode 100644 index 00000000..8a5e7510 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/cyan/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_bottom.png new file mode 100644 index 00000000..9546e430 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_top.png new file mode 100644 index 00000000..458b5406 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/gray/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/green/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/green/glass_bottom.png new file mode 100644 index 00000000..6c7a0282 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/green/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/green/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/green/glass_top.png new file mode 100644 index 00000000..d97c7702 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/green/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_bottom.png new file mode 100644 index 00000000..2944a174 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_top.png new file mode 100644 index 00000000..16c60795 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_blue/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_bottom.png new file mode 100644 index 00000000..8d896d33 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_top.png new file mode 100644 index 00000000..b9700ee7 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/light_gray/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_bottom.png new file mode 100644 index 00000000..426b0a16 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_top.png new file mode 100644 index 00000000..79601478 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/lime/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_bottom.png new file mode 100644 index 00000000..c2844ef4 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_top.png new file mode 100644 index 00000000..c92cd059 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/magenta/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_bottom.png new file mode 100644 index 00000000..c4ca1e5c Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_top.png new file mode 100644 index 00000000..b73ea8ad Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/orange/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_bottom.png new file mode 100644 index 00000000..7d2fdf60 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_top.png new file mode 100644 index 00000000..ef05d8d6 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/pink/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_bottom.png new file mode 100644 index 00000000..d0728adf Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_top.png new file mode 100644 index 00000000..3a1370be Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/purple/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/red/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/red/glass_bottom.png new file mode 100644 index 00000000..0eb93ab9 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/red/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/red/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/red/glass_top.png new file mode 100644 index 00000000..c7757a7d Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/red/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/white/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/white/glass_bottom.png new file mode 100644 index 00000000..e87cd338 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/white/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/white/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/white/glass_top.png new file mode 100644 index 00000000..71a8707f Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/white/glass_top.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_bottom.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_bottom.png new file mode 100644 index 00000000..fd0d2585 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_bottom.png differ diff --git a/src/main/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_top.png b/src/main/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_top.png new file mode 100644 index 00000000..bda2cbe5 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/blocks/glass/stained/yellow/glass_top.png differ