upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Massive Fan finished and finished unification of all technical blocks

Browse Source
This commit is contained in:
Drullkus committed 2015-02-22 10:21:45 -08:00
1 parent 52ff5db188
commit c87b48f3a1
2 files changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/Features.java
+6 -5
View File
@@ -2245,6 +2245,7 @@ public enum Features {
technical.carverHelper.addVariation("tile.technical.13.desc", 13, "technical/grate");
technical.carverHelper.addVariation("tile.technical.14.desc", 14, "technical/malfunctionFan");
technical.carverHelper.addVariation("tile.technical.15.desc", 15, "technical/grateRusty");
technical.carverHelper.registerAll(technical, "technical");
BlockCarvableGlass technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F).setResistance(10F);
technical2.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffoldTransparent");
@@ -2252,12 +2253,12 @@ public enum Features {
technical2.carverHelper.addVariation("tile.technical.6.desc", 2, "technical/fanStillTransparent");
technical2.carverHelper.addVariation("tile.technical.14.desc", 3, "technical/fanStillTransparent");
technical2.carverHelper.registerAll(technical2, "technical2");
Carving.chisel.registerOre("technical2", "technical");
//Carving.chisel.registerOre("technical2", "technical");
BlockCarvable technical3 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F);
technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan");
technical2.carverHelper.registerAll(technical3, "technical3");
Carving.chisel.registerOre("technical3", "technical");
//Carving.chisel.registerOre("technical3", "technical");
for (int i = 0; i < 4; i++) {
Carving.chisel.addVariation("technical", GameRegistry.findBlock("chisel", "technical2"), i, i);
@@ -2267,7 +2268,7 @@ public enum Features {
Carving.chisel.addVariation("technical", GameRegistry.findBlock("chisel", "technical3"), i, i);
}
technical.carverHelper.registerAll(technical, "technical");
Carving.chisel.registerOre("technical", "technical");
}
@@ -2275,8 +2276,8 @@ public enum Features {
void addRecipes() {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y',
Items.iron_ingot }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y',
"ingotIron", 'z', Blocks.glass }));
/*GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y',
"ingotIron", 'z', Blocks.glass })); //*/
}
},
src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
+2 -2
View File
@@ -271,10 +271,10 @@ public class CarvableHelper {
//For WEST, SOUTH reverse the indexes for both X and Z
textureX = (variationSize - textureX - 1);
textureZ = (variationSize - textureZ - 1);
} else if (side == 0) {
} /*else if (side == 0) {
//For DOWN, reverse the indexes for only Z
textureZ = (variationSize - textureZ - 1);
}
}//*/
int index;
if (side == 0 || side == 1) {