Locale for blocks (no descriptions)

This commit is contained in:
Fenn committed 2014-07-05 09:16:05 +01:00
1 parent 5113b1b6fb
commit 4280147ece
5 files changed
+126 -26

No files matched your search

@@ -58,6 +58,7 @@ public class Chisel
public static int particlesTickrate;
public static boolean blockDescriptions;
public static boolean ghostCloud;
public static int factoryBlockAmount;
public static final StepSoundEx soundHolystoneFootstep = new StepSoundEx("chisel:holystone", "chisel:holystone", "chisel:holystone", 1.0f);
public static final StepSoundEx soundTempleFootstep = new StepSoundEx("dig.stone", "chisel:temple-footstep", "dig.stone", 1.0f);
@@ -188,7 +189,7 @@ public class Chisel
chiselStoneToCobbleBricks = config.get("general", "chiselStoneToCobbleBricks", true, "Chisel stone to cobblestone and bricks by left-click.").getBoolean(true);
enableChiseling = config.get("general", "enableChiselingLeftClicking", false, "Change blocks to another block using the Chisel and left-click.").getBoolean(false);
ghostCloud = config.get("general", "doesCloudRenderLikeGhost", true).getBoolean(true);
//iceMelt = config.get("general", "doesIceMeltIntoWater", true).getBoolean(true);
factoryBlockAmount = config.get("general", "amountYouGetFromFactoryBlockCrafting", 32).getInt(32);
if(config.hasChanged())
{
@@ -1134,8 +1134,9 @@ public class ChiselBlocks
if(Chisel.featureEnabled("glassStained")) for(int i = 0; i < 16; i++)
{
String blockName = "chisel.stainedGlass" + sGNames[i].replaceAll(" ", "");
String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", "");
String nameWithoutSpace = sGNames[i].replaceAll(" ", "");
String blockName = "chisel.stainedGlass" + nameWithoutSpace;
String oreName = "stainedGlass" + nameWithoutSpace;
String texName = "glassdyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-";
int glassPrefix = (i & 3) << 2;
int glassId = i >> 2;
@@ -1145,7 +1146,7 @@ public class ChiselBlocks
blockStainedGlass[glassId].carverHelper.registerBlock(blockStainedGlass[glassId], blockName);
blockStainedGlass[glassId].carverHelper.blockName = "Stained Glass";
}
blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix + 0, texName + "bubble");
blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix, texName + "bubble");
blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " glass panel", glassPrefix + 1, texName + "panel");
blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " fancy glass panel", glassPrefix + 2, texName + "panel-fancy");
blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " borderless glass", glassPrefix + 3, texName + "transparent");
@@ -1153,7 +1154,8 @@ public class ChiselBlocks
Carving.chisel.registerOre(blockName, oreName);
for(CarvableVariation cv : blockStainedGlass[glassId].carverHelper.variations)
{
if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 4) continue;
if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 4)
continue;
blockStainedGlass[glassId].carverHelper.registerVariation(blockName, cv, blockStainedGlass[glassId], cv.metadata);
}
}
@@ -42,7 +42,7 @@ public class Crafting
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFft, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)});
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTyrian, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)});
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTemple, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4)});
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFactory, 32, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)});
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFactory, Chisel.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)});
if(Chisel.config.get("general", "chiselAlternateRecipe", false, "Use alternative crafting recipe for the chisel").getBoolean(false))
@@ -1,14 +1,11 @@
package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.Chisel;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import info.jbcs.minecraft.chisel.Chisel;
import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import net.minecraft.block.BlockGlass;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -16,6 +13,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.util.IIcon;
import java.util.List;
public class BlockCarvableGlass extends BlockGlass implements ICarvable
{
public CarvableHelper carverHelper;
@@ -26,7 +25,6 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable
super(Material.glass, false);
carverHelper = new CarvableHelper();
setCreativeTab(Chisel.tabChisel);
}