From 911c3b63b45613022f9e094fc0175bc7a675a166 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 12 Oct 2015 00:12:05 -0700 Subject: [PATCH] Add Forestry Stained Glass texture --- src/main/java/team/chisel/Features.java | 8 ++++++++ .../java/team/chisel/init/ChiselBlocks.java | 1 + .../resources/assets/chisel/lang/en_US.lang | 17 +++++++++++++++++ .../blocks/glassdyed/black-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/blue-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/brown-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/cyan-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/gray-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/green-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/lightblue-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/lightgray-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/lime-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/magenta-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/orange-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/pink-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/purple-forestry.png | Bin 0 -> 165 bytes .../textures/blocks/glassdyed/red-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/white-forestry.png | Bin 0 -> 165 bytes .../blocks/glassdyed/yellow-forestry.png | Bin 0 -> 165 bytes 19 files changed, 26 insertions(+) create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/black-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/green-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/red-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/white-forestry.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-forestry.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index d7c79e4f..8f01d439 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -905,6 +905,10 @@ public enum Features { @Override void addBlocks() { + stainedGlassForestry = new BlockCarvableGlass(); + stainedGlassForestry.setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass"); + stainedGlassForestry.carverHelper.registerBlock(stainedGlassForestry, "stained_glass_forestry"); + for (int i = 0; i < 16; i++) { final String blockName = "stained_glass_" + sGNames[i].replaceAll(" ", "").toLowerCase(); String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); @@ -927,6 +931,10 @@ public enum Features { continue; stainedGlass[glassId].carverHelper.registerVariation(blockName, info); } + + stainedGlassForestry.carverHelper.addVariation(featureColors[i] + ".glass.forestry.desc", i, texName + "forestry"); + IVariationInfo info = stainedGlassForestry.carverHelper.infoList.get(i); + stainedGlassForestry.carverHelper.registerVariation(blockName, info); } } }, diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 98e86a58..3225d3a5 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -119,6 +119,7 @@ public final class ChiselBlocks { // 1.7 public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; + public static BlockCarvableGlass stainedGlassForestry; public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8]; // 1.8 or at least so you think :P diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index b5a3311d..3d2abff7 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1267,6 +1267,7 @@ tile.chisel.stained_glass_brown.name=Stained Glass tile.chisel.stained_glass_green.name=Stained Glass tile.chisel.stained_glass_red.name=Stained Glass tile.chisel.stained_glass_black.name=Stained Glass +tile.chisel.stained_glass_forestry.name=Stained Glass #Stained GlassPane T.T tile.chisel.stained_glass_pane_white.name=Stained Glass Pane @@ -1502,81 +1503,97 @@ white.bubble.desc=White Bubble Glass white.glass.desc=White Glass Panel white.glass.fancy.desc=White Fancy Glass Panel white.glass.noborder.desc=White Borderless Glass +white.glass.forestry.desc=White Forestry Glass orange.bubble.desc=Orange Bubble Glass orange.glass.desc=Orange Glass Panel orange.glass.fancy.desc=Orange Fancy Glass Panel orange.glass.noborder.desc=Orange Borderless Glass +orange.glass.forestry.desc=Orange Forestry Glass magenta.bubble.desc=Magenta Bubble Glass magenta.glass.desc=Magenta Glass Panel magenta.glass.fancy.desc=Magenta Fancy Glass Panel magenta.glass.noborder.desc=Magenta Borderless Glass +magenta.glass.forestry.desc=Magenta Forestry Glass lightblue.bubble.desc=Light Blue Bubble Glass lightblue.glass.desc=Light Blue Glass Panel lightblue.glass.fancy.desc=Light Blue Fancy Glass Panel lightblue.glass.noborder.desc=Light Blue Borderless Glass +lightblue.glass.forestry.desc=Light Blue Forestry Glass yellow.bubble.desc=Yellow Bubble Glass yellow.glass.desc=Yellow Glass Panel yellow.glass.fancy.desc=Yellow Fancy Glass Panel yellow.glass.noborder.desc=Yellow Borderless Glass +yellow.glass.forestry.desc=Yellow Forestry Glass lime.bubble.desc=Lime Bubble Glass lime.glass.desc=Lime Glass Panel lime.glass.fancy.desc=Lime Fancy Glass Panel lime.glass.noborder.desc=Lime Borderless Glass +lime.glass.forestry.desc=Lime Forestry Glass pink.bubble.desc=Pink Bubble Glass pink.glass.desc=Pink Glass Panel pink.glass.fancy.desc=Pink Fancy Glass Panel pink.glass.noborder.desc=Pink Borderless Glass +pink.glass.forestry.desc=Pink Forestry Glass darkgray.bubble.desc=Gray Bubble Glass darkgray.glass.desc=Gray Glass Panel darkgray.glass.fancy.desc=Gray Fancy Glass Panel darkgray.glass.noborder.desc=Gray Borderless Glass +darkgray.glass.forestry.desc=Gray Forestry Glass lightgray.bubble.desc=Light Gray Bubble Glass lightgray.glass.desc=Light Gray Glass Panel lightgray.glass.fancy.desc=Light Gray Fancy Glass Panel lightgray.glass.noborder.desc=Light Gray Borderless Glass +lightgray.glass.forestry.desc=Light Gray Forestry Glass cyan.bubble.desc=Cyan Bubble Glass cyan.glass.desc=Cyan Glass Panel cyan.glass.fancy.desc=Cyan Fancy Glass Panel cyan.glass.noborder.desc=Cyan Borderless Glass +cyan.glass.forestry.desc=Cyan Forestry Glass purple.bubble.desc=Purple Bubble Glass purple.glass.desc=Purple Glass Panel purple.glass.fancy.desc=Purple Fancy Glass Panel purple.glass.noborder.desc=Purple Borderless Glass +purple.glass.forestry.desc=Purple Forestry Glass blue.bubble.desc=Blue Bubble Glass blue.glass.desc=Blue Glass Panel blue.glass.fancy.desc=Blue Fancy Glass Panel blue.glass.noborder.desc=Blue Borderless Glass +blue.glass.forestry.desc=Blue Forestry Glass brown.bubble.desc=Brown Bubble Glass brown.glass.desc=Brown Glass Panel brown.glass.fancy.desc=Brown Fancy Glass Panel brown.glass.noborder.desc=Brown Borderless Glass +brown.glass.forestry.desc=Brown Forestry Glass green.bubble.desc=Green Bubble Glass green.glass.desc=Green Glass Panel green.glass.fancy.desc=Green Fancy Glass Panel green.glass.noborder.desc=Green Borderless Glass +green.glass.forestry.desc=Green Forestry Glass red.bubble.desc=Red Bubble Glass red.glass.desc=Red Glass Panel red.glass.fancy.desc=Red Fancy Glass Panel red.glass.noborder.desc=Red Borderless Glass +red.glass.forestry.desc=Red Forestry Glass black.bubble.desc=Black Bubble Glass black.glass.desc=Black Glass Panel black.glass.fancy.desc=Black Fancy Glass Panel black.glass.noborder.desc=Black Borderless Glass +black.glass.forestry.desc=Black Forestry Glass #Stained Glass Pane white.pane.bubble.desc=White Bubble Glass diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-forestry.png new file mode 100644 index 0000000000000000000000000000000000000000..a3fec4057b1b5aac15120cf4b6436e6655edd58d GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0XoJzCNL-^FVEL_CW*(s ze{;N0Yi@>D#EaZdD>SBxT~pcBF-!4;myvYK3NPIkch3L*>w29_c8(l_IM7H2Pgg&e IbxsLQ03Mn&ZU6uP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-forestry.png new file mode 100644 index 0000000000000000000000000000000000000000..fe0586ef474b9ba50f9b1a6c2d6f0a6fca611959 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uC93(7jAprwDEb(qH7ab zRwV+(8B2ovg6kV%wwwlX+&x_!Ln`8UPa5($7%(s#Sgq%)Q`>aJU5m$!InDp&`5Mn8 z@!0ooju&dp&G3qNk^5gTe~DWM4f3NkpA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-forestry.png new file mode 100644 index 0000000000000000000000000000000000000000..0d2adad3f791d6fe1b9330f9d785e49d1ec02057 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uALEPhgZ*9vTWA8=^fXt ze?JF`GnNGT1=lykY&i|&xO=)dhE&Ayo;2ihFkoOfuv*Vor?%;cyB3cdbDICl^EIAH z;<4}F952+Go8cAlBKOk@jj3YSRCaaDQas^hB;B&YOZUZ{^S}SPUgwgXBgY^PG?Ky7 L)z4*}Q$iB}AK5tB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-forestry.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f6d7172b950a8ce57f3d21141cc0fb754ebc65 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uDUgIr|vylw&QHU%011R z@+v@a#*!ev;QEG`EvJDTcTX3`kcv3olZJc_1`G@bR_pod)HWS)*Wz(wPV;|xzQ!|2 zJof#Ya>Atvg{`X(k>s+#Pz) z*uNGi&R7!U7hK;Ev*k39F=7*Y|(d(x24!GM9`z-m2To!X`&?pi!<%xV5F&)0Y+ ziO0TwbG%S%ZiZLHi`-8uG^UDOQ`yxqOYwx4k#x%nFWnb+&j0@FdYwyljvRwH&`1VP LS3j3^P6#*!ev;QEG`EvJDTcTX3`kcv3olZJc_1`G@bR_pod)HWS)*Wz(wPV;|xzQ!|2 zJof#Ya>Atvg{`X(k>s+#PW1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|=R!Jd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-forestry.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb0a88cde3c14b1555b3d95a50f1585c815e007 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-t|v~Mc>MVB;d_twp1)|d z#?A{U&R7!U7hK;Ev*k39F=7*Y|(d(x24!GM9`z-m2To!X`&?pi!<%xV5F&)0Y+ ziO0TwbG%S%ZiZLHi`-8uG^UDOQ`yxqOYwx4k#x%nFWnb+&j0@FdYwyljvRwH&`1VP LS3j3^P6a>Atvg{`X(k>s+#P7>fz^7xI<-wl+_iYznA7}Up0Dvt z5|4fV=6Ipj+zhXX7rCESXiOEmrn0MJmf{I7Bk7hEUb-*tod5mT^*WdA961JYppguo Lu6{1-oD!MW1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|oB%n? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-forestry.png new file mode 100644 index 0000000000000000000000000000000000000000..ca1f8925f56fe6473e6a7ac90b6b2f34be7e0ce4 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u5Xv0{(9-jwR2C-@4NiK zXG=X$oUtUxFSx!TX3J?H$KBJ#F{C1n_oN}8g8>7>fz^7xI<-wl+_iYznA7}Up0Dvt z5|4fV=6Ipj+zhXX7rCESXiOEmrn0MJmf{I7Bk7hEUb-*tod5mT^*WdA961JYppguo Lu6{1-oD!MF=7*Y|(d(x24!GM9`z-m2To!X`&?pi!<%xV5F&)0Y+ ziO0TwbG%S%ZiZLHi`-8uG^UDOQ`yxqOYwx4k#x%nFWnb+&j0@FdYwyljvRwH&`1VP LS3j3^P6W1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|n;$#p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-forestry.png new file mode 100644 index 0000000000000000000000000000000000000000..23c5cac1aa9e9884e0af4275eb02bb39a9631d2e GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uFs!qefl)z^1CT#?lpbs z2-^!3XDkWw3$Aa7*>W1larbm_45^6YJ!#12V8Fm|V6~pFPHoc>cP$<_<~0A8=W9HZ z#ADyTIbNtWH^VF9Mee5+8dJrtsqE^QrFg>2NV;W(m+p%@=YRioz0M^&M~*=pXe5KD LtDnm{r-UW|``S9C literal 0 HcmV?d00001