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 00000000..a3fec405 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-forestry.png differ 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 00000000..fe0586ef Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-forestry.png differ 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 00000000..0d2adad3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-forestry.png differ 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 00000000..f9f6d717 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-forestry.png new file mode 100644 index 00000000..dd68cf26 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-forestry.png new file mode 100644 index 00000000..b875ccae Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-forestry.png new file mode 100644 index 00000000..ca26a35b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-forestry.png differ 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 00000000..fcb0a88c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-forestry.png new file mode 100644 index 00000000..d1da44a1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-forestry.png new file mode 100644 index 00000000..cedb43df Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-forestry.png new file mode 100644 index 00000000..05d6ad84 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-forestry.png differ 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 00000000..ca1f8925 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-forestry.png new file mode 100644 index 00000000..a4b5a803 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-forestry.png new file mode 100644 index 00000000..8adf848a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-forestry.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-forestry.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-forestry.png new file mode 100644 index 00000000..5cc360c2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-forestry.png differ 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 00000000..23c5cac1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-forestry.png differ