Skip to content

Commit

Permalink
Added "Laboratory Block"
Browse files Browse the repository at this point in the history
Set of laboratory/hi-tech-themed blocks with corresponding textures
(textures made by myself).
  • Loading branch information
yschnellbach committed Sep 5, 2014
1 parent 577b174 commit 1fbb8ba
Show file tree
Hide file tree
Showing 31 changed files with 43 additions and 0 deletions.
24 changes: 24 additions & 0 deletions src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class ChiselBlocks
public static BlockCarvable blockFactory;
public static BlockCarvablePane blockPaperwall;
public static BlockCarvable blockWoolenClay;
public static BlockCarvable blockLaboratory;

public static BlockSnakestone blockSnakestone;
public static BlockSnakestone blockSandSnakestone;
Expand Down Expand Up @@ -1225,6 +1226,29 @@ public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper)

}

if(Configurations.featureEnabled("laboratory"))
{
blockLaboratory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep);
blockLaboratory.carverHelper.setChiselBlockName("blockLaboratory");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.0.desc"), 0, "laboratory/wallpanel");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.1.desc"), 1, "laboratory/dottedpanel");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.2.desc"), 2, "laboratory/largewall");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.3.desc"), 3, "laboratory/roundel");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.4.desc"), 4, "laboratory/wallvents");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.5.desc"), 5, "laboratory/largetile");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.6.desc"), 6, "laboratory/smalltile");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.7.desc"), 7, "laboratory/floortile");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.8.desc"), 8, "laboratory/checkertile");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.9.desc"), 9, "laboratory/clearscreen");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.10.desc"),10, "laboratory/fuzzscreen");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.11.desc"),11,"laboratory/largesteel");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.12.desc"),12,"laboratory/smallsteel");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.13.desc"),13,"laboratory/directionright");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.14.desc"),14,"laboratory/directionleft");
blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.15.desc"),15,"laboratory/infocon");
blockLaboratory.carverHelper.register(blockLaboratory, "blockLaboratory");
}

Blocks.stone.setHarvestLevel("chisel", 0, 0);
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/info/jbcs/minecraft/chisel/Crafting.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public static void init()
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.blockWoolenClay, 2, i), new Object[] {"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")}));
}

GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLaboratory, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)});

}
}
18 changes: 18 additions & 0 deletions src/main/resources/assets/chisel/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,24 @@ chisel.tile.woolenClay.13.desc=Green Woolen Clay
chisel.tile.woolenClay.14.desc=Red Woolen Clay
chisel.tile.woolenClay.15.desc=Black Woolen Clay

#Laboratory Block
chisel.tile.blockLaboratory.name=Laboratory Block
chisel.tile.blockLaboratory.0.desc=Wall Panel
chisel.tile.blockLaboratory.1.desc=Dotted Panel
chisel.tile.blockLaboratory.2.desc=Enameled Wall
chisel.tile.blockLaboratory.3.desc=Enameled Roundel Wall
chisel.tile.blockLaboratory.4.desc=Enameled Wall Vents
chisel.tile.blockLaboratory.5.desc=Large Enameled Tile
chisel.tile.blockLaboratory.6.desc=Small Enameled Tiles
chisel.tile.blockLaboratory.7.desc=Laboratory Floor
chisel.tile.blockLaboratory.8.desc=Checkerboard Floor
chisel.tile.blockLaboratory.9.desc=Clear Panel
chisel.tile.blockLaboratory.10.desc=Fuzzy Panel
chisel.tile.blockLaboratory.11.desc=Large Steel Tile
chisel.tile.blockLaboratory.12.desc=Small Steel Tiles
chisel.tile.blockLaboratory.13.desc=Direction Console (Right)
chisel.tile.blockLaboratory.14.desc=Direction Console (Left)
chisel.tile.blockLaboratory.15.desc=Information Console

# Creative Tab localizations
itemGroup.tabChisel=Chisel Blocks
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1fbb8ba

Please sign in to comment.