diff --git a/.gitignore b/.gitignore index 521d7968..6981a5f7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,9 @@ run .DS_Store *.command +#windows +Thumbs.db + #workspace saves asm diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index dbb4fa1a..f5e94625 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -129,6 +129,7 @@ public class Chisel { ChiselTabs.preInit(); Features.preInit(); + Statistics.init(); PacketHandler.init(); ChiselController.INSTANCE.preInit(); if (Loader.isModLoaded("ForgeMultipart")) { diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 667dab6d..771a58a5 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1120,7 +1120,7 @@ public enum Features { ice.carverHelper.addVariation("tile.ice.8.desc", 8, "ice/a1-stonecobble-icefrench"); ice.carverHelper.addVariation("tile.ice.9.desc", 9, "ice/sunkentiles"); ice.carverHelper.addVariation("tile.ice.10.desc", 10, "ice/tiles"); - ice.carverHelper.addVariation("tile.ice.11.desc", 11, "ice/a1-stonecobble-icepanel"); +// ice.carverHelper.addVariation("tile.ice.11.desc", 11, "ice/a1-stonecobble-icepanel"); ice.carverHelper.addVariation("tile.ice.12.desc", 12, "ice/a1-stoneslab-ice"); ice.carverHelper.addVariation("tile.ice.13.desc", 13, "ice/zelda"); ice.carverHelper.addVariation("tile.ice.14.desc", 14, "ice/bismuth"); @@ -1175,7 +1175,7 @@ public enum Features { makerIceStairs.carverHelper.addVariation("tile.ice_stairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); makerIceStairs.carverHelper.addVariation("tile.ice_stairs.9.desc", 9, "ice/sunkentiles"); makerIceStairs.carverHelper.addVariation("tile.ice_stairs.10.desc", 10, "ice/tiles"); - makerIceStairs.carverHelper.addVariation("tile.ice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); +// makerIceStairs.carverHelper.addVariation("tile.ice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); makerIceStairs.carverHelper.addVariation("tile.ice_stairs.12.desc", 12, "ice/a1-stoneslab-ice"); makerIceStairs.carverHelper.addVariation("tile.ice_stairs.13.desc", 13, "ice/zelda"); makerIceStairs.carverHelper.addVariation("tile.ice_stairs.14.desc", 14, "ice/bismuth"); @@ -1797,7 +1797,7 @@ public enum Features { packedice.carverHelper.addVariation("tile.packedice.8.desc", 8, "ice/a1-stonecobble-icefrench"); packedice.carverHelper.addVariation("tile.packedice.9.desc", 9, "ice/sunkentiles"); packedice.carverHelper.addVariation("tile.packedice.10.desc", 10, "ice/tiles"); - packedice.carverHelper.addVariation("tile.packedice.11.desc", 11, "ice/a1-stonecobble-icepanel"); +// packedice.carverHelper.addVariation("tile.packedice.11.desc", 11, "ice/a1-stonecobble-icepanel"); packedice.carverHelper.addVariation("tile.packedice.12.desc", 12, "ice/a1-stoneslab-ice"); packedice.carverHelper.addVariation("tile.packedice.13.desc", 13, "ice/zelda"); packedice.carverHelper.addVariation("tile.packedice.14.desc", 14, "ice/bismuth"); @@ -1846,7 +1846,7 @@ public enum Features { makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.9.desc", 9, "ice/sunkentiles"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.10.desc", 10, "ice/tiles"); - makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); +// makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.12.desc", 12, "ice/a1-stoneslab-ice"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.13.desc", 13, "ice/zelda"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.14.desc", 14, "ice/bismuth"); diff --git a/src/main/java/com/cricketcraft/chisel/Statistics.java b/src/main/java/com/cricketcraft/chisel/Statistics.java new file mode 100644 index 00000000..1ce5aa3e --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/Statistics.java @@ -0,0 +1,15 @@ +package com.cricketcraft.chisel; + +import net.minecraft.stats.StatBase; +import net.minecraft.stats.StatBasic; +import net.minecraft.util.ChatComponentTranslation; + +public class Statistics { + + public static StatBase blocksChiseled = (new StatBasic("stat.blockChiseled", new ChatComponentTranslation("stat.blockChiseled", new Object[0]))); + + public static void init(){ + blocksChiseled.initIndependentStat(); + blocksChiseled.registerStat(); + } +} diff --git a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java index cc831c3a..183fc76e 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java @@ -1,5 +1,6 @@ package com.cricketcraft.chisel.inventory; +import com.cricketcraft.chisel.Statistics; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.item.chisel.ItemChisel; import com.cricketcraft.chisel.utils.General; @@ -106,7 +107,8 @@ public class InventoryChiselSelection implements IInventory { public void updateItems() { ItemStack chiseledItem = inventory[normalSlots]; - + if(inventory[normalSlots] != null) + container.playerInventory.player.addStat(Statistics.blocksChiseled, inventory[normalSlots].stackSize); clearItems(); if (chiseledItem == null) { diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java index c0aa31d3..6384989e 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java @@ -2,6 +2,7 @@ package com.cricketcraft.chisel.item.chisel; import java.util.List; +import com.cricketcraft.chisel.Statistics; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -56,6 +57,8 @@ public final class ChiselController { return; } + event.entityPlayer.addStat(Statistics.blocksChiseled, 1); + List list = group.getVariations(); main: for (ItemStack stack : OreDictionary.getOres(group.getOreName())) { diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index b2103013..0147efc5 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1,5 +1,8 @@ # Key localizations +#Stat localizations +stat.blockChiseled=Blocks Chiseled + # Entity localizations entity.chisel.snowman.name=Snow Golem