version 0.2.1 merge

build.gradle.kts

@@ -9,4 +9,4 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-version = "0.2.0.2"
+version = "0.2.1"

src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java

@@ -4,19 +4,24 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import com.nao7016.ClayiumAdditions.item.itemClayBowl;
-import com.nao7016.ClayiumAdditions.item.itemClayBowlEmpty;
-import com.nao7016.ClayiumAdditions.item.itemClayEnergy;
-import com.nao7016.ClayiumAdditions.item.itemClayHammer;
-import com.nao7016.ClayiumAdditions.item.itemClayMiningHammer;
-import com.nao7016.ClayiumAdditions.item.itemRawClayOre;
+import com.nao7016.ClayiumAdditions.item.Item3x3Hammer;
+import com.nao7016.ClayiumAdditions.item.ItemAddGadget;
+import com.nao7016.ClayiumAdditions.item.ItemClayBowl;
+import com.nao7016.ClayiumAdditions.item.ItemClayBowlEmpty;
+import com.nao7016.ClayiumAdditions.item.ItemClayEnergy;
+import com.nao7016.ClayiumAdditions.item.ItemClayHammer;
+import com.nao7016.ClayiumAdditions.item.ItemClayMiningHammer;
+import com.nao7016.ClayiumAdditions.item.ItemRawClayOre;
+import com.nao7016.ClayiumAdditions.item.gadget.GadgetNightVision;
+import com.nao7016.ClayiumAdditions.item.gadget.GadgetSpeed;
 import com.nao7016.ClayiumAdditions.item.storagebox.itemClayStorageBox;
 import com.nao7016.ClayiumAdditions.item.storagebox.itemMiningStorageBox;
 import com.nao7016.ClayiumAdditions.item.storagebox.itemStorageBox;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import ganymedes01.etfuturum.api.RawOreRegistry;
+import mods.clayium.item.ItemGadgetHolder;
 
 public class CAItems {
 
@@ -26,27 +31,39 @@ public class CAItems {
     public static Item rawClayOre;
     public static Item clayHammer;
     public static Item clayMiningHammer;
+    public static Item clay3x3Hammer;
     public static Item storageBox;
     public static Item clayStorageBox;
     public static Item miningStorageBox;
+    public static ItemAddGadget addGadget;
 
     private static Item register(Item item, String name) {
         GameRegistry.registerItem(item, name);
         return item;
     }
 
     public static void registerItems() {
-        if (Config.cfgSplittedEnergeticClay) {
-            clayEnergy = register(new itemClayEnergy(), "clay_energy");
+        addGadget = (ItemAddGadget) (new ItemAddGadget()).setCreativeTab(CATabs.ca_tabs)
+            .setUnlocalizedName("itemGadget")
+            .setMaxStackSize(1);
+        addGadget.addItemList("Speed0", 96, "gadget_speed0", 7);
+        addGadget.addItemList("Speed1", 97, "gadget_speed1", 9);
+        addGadget.addItemList("Speed2", 98, "gadget_speed2", 11);
+        // addGadget.addItemList("NightVision", 112, "gadget_nightvision", 7);
+        register(addGadget, "itemGadget");
+        ItemGadgetHolder.addGadget(new GadgetSpeed());
+        ItemGadgetHolder.addGadget(new GadgetNightVision());
+        if (Config.cfgSplitEnergeticClay) {
+            clayEnergy = register(new ItemClayEnergy(), "clay_energy");
         }
         if (Config.cfgModeSky) {
-            clayBowlEmpty = register(new itemClayBowlEmpty(), "clay_bowl_empty");
-            clayBowl = register(new itemClayBowl(), "clay_bowl");
-            clayHammer = register(new itemClayHammer(), "clay_hammer");
+            clayBowlEmpty = register(new ItemClayBowlEmpty(), "clay_bowl_empty");
+            clayBowl = register(new ItemClayBowl(), "clay_bowl");
+            clayHammer = register(new ItemClayHammer(), "clay_hammer");
         }
         if (Config.cfgEtFuturum) {
             if (Loader.isModLoaded("etfuturum")) {
-                rawClayOre = new itemRawClayOre();
+                rawClayOre = new ItemRawClayOre();
                 register(rawClayOre, "raw_clay_ore");
                 OreDictionary.registerOre("oreDenseClay", getMeta(rawClayOre, 1));
                 OreDictionary.registerOre("oreLargeDenseClay", getMeta(rawClayOre, 2));
@@ -55,7 +72,8 @@ public static void registerItems() {
             }
         }
         if (Config.cfgMiningHammer) {
-            clayMiningHammer = register(new itemClayMiningHammer(), "clay_mining_hammer");
+            clayMiningHammer = register(new ItemClayMiningHammer(), "clay_mining_hammer");
+            clay3x3Hammer = register(new Item3x3Hammer(), "clay_3x3_hammer");
         }
         if (Config.cfgStorageBox) {
             storageBox = register(new itemStorageBox(), "storage_box");

src/main/java/com/nao7016/ClayiumAdditions/common/Config.java

@@ -6,7 +6,7 @@
 
 public class Config {
 
-    public static boolean cfgSplittedEnergeticClay;
+    public static boolean cfgSplitEnergeticClay;
     public static boolean cfgAutoWaterWheel;
     public static boolean cfgMiningHammer;
     public static boolean cfgAddMachines;
@@ -24,20 +24,17 @@ public class Config {
     public static void synchronizeConfiguration(File configFile) {
         Configuration configuration = new Configuration(configFile);
 
-        cfgSplittedEnergeticClay = configuration.getBoolean(
-            "EnableSplittedEnergeticClay",
-            "item",
-            true,
-            "If true, Splitted Energetic Clay will be enabled.");
+        cfgSplitEnergeticClay = configuration
+            .getBoolean("EnableSplitEnergeticClay", "item", true, "If true, Split Energetic Clay will be enabled.");
         cfgAutoWaterWheel = configuration
             .getBoolean("EnableAutoWaterWheel", "item", true, "If true, Auto Water Wheel will be enabled.");
         cfgMiningHammer = configuration
             .getBoolean("EnableMiningHammer", "item", true, "If true, Clay Mining Hammer will be enabled.");
         cfgAddMachines = configuration.getBoolean(
-            "EnableAdditionalMachines",
+            "EnableAdditionalTieredMachines",
             "item",
             false,
-            "If true, additional tiers Machines will be enabled. (ex. tier 6,7 Condenser) Mainly for modpacks.");
+            "If true, additional tiered Machines will be enabled. (ex. tier 6,7 Condenser) Mainly for modpacks.");
         cfgStorageBox = configuration
             .getBoolean("EnableStorageBox", "storagebox", true, "If true, Storage Box will be enabled.");
         cfgSBMoreDisplay = configuration.getBoolean(

src/main/java/com/nao7016/ClayiumAdditions/compat/nei/NEICrushHandler.java

@@ -4,7 +4,7 @@
 
 import net.minecraft.item.ItemStack;
 
-import com.nao7016.ClayiumAdditions.item.itemClayHammer;
+import com.nao7016.ClayiumAdditions.item.ItemClayHammer;
 import com.nao7016.ClayiumAdditions.recipe.CrushRecipes;
 import com.nao7016.ClayiumAdditions.util.CrushList;
 
@@ -45,7 +45,7 @@ public void loadCraftingRecipes(ItemStack result) {
     @Override
     public void loadUsageRecipes(ItemStack ingredient) {
         for (CrushList recipe : CrushRecipes.getAll()) {
-            if (recipe.matches(ingredient) || ingredient.getItem() instanceof itemClayHammer) {
+            if (recipe.matches(ingredient) || ingredient.getItem() instanceof ItemClayHammer) {
                 arecipes.add(new CachedCrushRecipe(recipe));
             }
         }

src/main/java/com/nao7016/ClayiumAdditions/event/HammerEvent.java

@@ -4,7 +4,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.world.BlockEvent;
 
-import com.nao7016.ClayiumAdditions.item.itemClayHammer;
+import com.nao7016.ClayiumAdditions.item.ItemClayHammer;
 import com.nao7016.ClayiumAdditions.recipe.CrushRecipes;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -16,7 +16,7 @@ public void onHarvestDrops(BlockEvent.HarvestDropsEvent event) {
         EntityPlayer player = event.harvester;
         if (player != null && player.getHeldItem() != null
             && player.getHeldItem()
-                .getItem() instanceof itemClayHammer) {
+                .getItem() instanceof ItemClayHammer) {
 
             ItemStack drop = new ItemStack(event.block);
             ItemStack result = CrushRecipes.getResult(drop);

src/main/java/com/nao7016/ClayiumAdditions/event/MiningHammerEvent.java

@@ -5,7 +5,7 @@
 import net.minecraftforge.event.world.BlockEvent;
 
 import com.nao7016.ClayiumAdditions.common.CABlocks;
-import com.nao7016.ClayiumAdditions.item.itemClayMiningHammer;
+import com.nao7016.ClayiumAdditions.item.ItemClayMiningHammer;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import mods.clayium.block.CBlocks;
@@ -17,7 +17,7 @@ public void onHarvestDrops(BlockEvent.HarvestDropsEvent event) {
         EntityPlayer player = event.harvester;
         if (player != null && player.getHeldItem() != null
             && player.getHeldItem()
-                .getItem() instanceof itemClayMiningHammer) {
+                .getItem() instanceof ItemClayMiningHammer) {
 
             ItemStack held = player.getHeldItem();
 
@@ -33,7 +33,7 @@ public void onHarvestDrops(BlockEvent.HarvestDropsEvent event) {
     public void onBreak(BlockEvent.BreakEvent event) {
         ItemStack held = event.getPlayer() != null ? event.getPlayer()
             .getHeldItem() : null;
-        if (held == null || !(held.getItem() instanceof itemClayMiningHammer)) return;
+        if (held == null || !(held.getItem() instanceof ItemClayMiningHammer)) return;
 
         if (event.block == CBlocks.blockClayOre || event.block == CABlocks.blockDeepslateClayOre) {
             event.setExpToDrop(0);

src/main/java/com/nao7016/ClayiumAdditions/item/Item3x3Hammer.java

@@ -0,0 +1,60 @@
+package com.nao7016.ClayiumAdditions.item;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemPickaxe;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import com.nao7016.ClayiumAdditions.common.CATabs;
+import com.nao7016.ClayiumAdditions.util.HarvestCoord3x3;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mods.clayium.item.IAdvancedTool;
+import mods.clayium.item.IHarvestCoord;
+import mods.clayium.util.UtilAdvancedTools;
+import mods.clayium.util.UtilLocale;
+
+public class Item3x3Hammer extends ItemPickaxe implements IAdvancedTool {
+
+    private IHarvestCoord harvestCoord;
+
+    public Item3x3Hammer() {
+        super(ToolMaterial.IRON);
+        this.setMaxDamage(1000);
+        this.setCreativeTab(CATabs.ca_tabs);
+        this.setUnlocalizedName("clay_3x3_hammer");
+        this.setTextureName("clayiumadditions:3x3hammer");
+        this.harvestCoord = new HarvestCoord3x3();
+    }
+
+    public float getDigSpeed(ItemStack stack, Block block, int meta) {
+        return super.getDigSpeed(stack, block, meta) * 2.0F;
+    }
+
+    @Override
+    public IHarvestCoord getHarvestCoord() {
+        return this.harvestCoord;
+    }
+
+    public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z,
+        EntityLivingBase entity) {
+        boolean result = super.onBlockDestroyed(stack, world, block, x, y, z, entity);
+        stack.damageItem(UtilAdvancedTools.onBlockDestroyed(stack, world, block, x, y, z, entity), entity);
+        return result;
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean flag) {
+        super.addInformation(stack, player, list, flag);
+        List alist = UtilLocale.localizeTooltip(this.getUnlocalizedName(stack) + ".tooltip");
+        if (alist != null) {
+            list.addAll(alist);
+        }
+    }
+
+}

src/main/java/com/nao7016/ClayiumAdditions/item/ItemAddGadget.java

@@ -0,0 +1,43 @@
+package com.nao7016.ClayiumAdditions.item;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mods.clayium.item.ItemDamaged;
+import mods.clayium.item.ItemGadget;
+
+public class ItemAddGadget extends ItemGadget {
+
+    private Map<Integer, String> entryMap = new HashMap<>();
+    private Map<Integer, IIcon> iconMap = new HashMap<>();
+
+    @Override
+    public ItemDamaged addItemList(String itemName, int meta, String iconString, int tier) {
+        entryMap.put(meta, iconString);
+        return super.addItemList(itemName, meta, iconString, tier);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister iicon) {
+        this.itemIcon = iicon.registerIcon("clayiumadditions:gadget_blank");
+        for (Map.Entry<Integer, String> entry : entryMap.entrySet()) {
+            String iconString = "clayiumadditions:" + entry.getValue();
+            int meta = entry.getKey();
+            IIcon icon = iicon.registerIcon(iconString);
+            iconMap.put(meta, icon);
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIconFromDamage(int meta) {
+        IIcon icon = iconMap.get(meta);
+        return icon != null ? icon : this.itemIcon;
+    }
+}

src/main/java/com/nao7016/ClayiumAdditions/item/itemClayBowl.java → src/main/java/com/nao7016/ClayiumAdditions/item/ItemClayBowl.java

@@ -15,9 +15,9 @@
 import mods.clayium.item.ItemTiered;
 import mods.clayium.util.UtilLocale;
 
-public class itemClayBowl extends ItemTiered {
+public class ItemClayBowl extends ItemTiered {
 
-    public itemClayBowl() {
+    public ItemClayBowl() {
         setUnlocalizedName("clay_bowl");
         setContainerItem(CAItems.clayBowlEmpty);
         setCreativeTab(CATabs.ca_tabs);

src/main/java/com/nao7016/ClayiumAdditions/item/itemClayBowlEmpty.java → src/main/java/com/nao7016/ClayiumAdditions/item/ItemClayBowlEmpty.java

@@ -17,9 +17,9 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import mods.clayium.util.UtilLocale;
 
-public class itemClayBowlEmpty extends Item {
+public class ItemClayBowlEmpty extends Item {
 
-    public itemClayBowlEmpty() {
+    public ItemClayBowlEmpty() {
         setUnlocalizedName("clay_bowl_empty");
         setCreativeTab(CATabs.ca_tabs);
     }

src/main/java/com/nao7016/ClayiumAdditions/item/itemClayEnergy.java → src/main/java/com/nao7016/ClayiumAdditions/item/ItemClayEnergy.java

@@ -19,11 +19,11 @@
 import mods.clayium.item.ItemDamaged;
 import mods.clayium.util.UtilLocale;
 
-public class itemClayEnergy extends ItemDamaged implements IClayEnergy {
+public class ItemClayEnergy extends ItemDamaged implements IClayEnergy {
 
     private final Map<Integer, IIcon> iconMap = new HashMap<>();
 
-    public itemClayEnergy() {
+    public ItemClayEnergy() {
         setUnlocalizedName("clay_energy");
         setHasSubtypes(true);
         setCreativeTab(CATabs.ca_tabs);

src/main/java/com/nao7016/ClayiumAdditions/item/itemClayHammer.java → src/main/java/com/nao7016/ClayiumAdditions/item/ItemClayHammer.java

@@ -19,12 +19,12 @@
 import mods.clayium.block.CBlocks;
 import mods.clayium.util.UtilLocale;
 
-public class itemClayHammer extends ItemPickaxe {
+public class ItemClayHammer extends ItemPickaxe {
 
     protected float efficiencyOnClayBlocks = 40.0F;
     private float efficiencyOnClayOre = 15.0F;
 
-    public itemClayHammer() {
+    public ItemClayHammer() {
         super(ToolMaterial.STONE);
         this.setMaxDamage(300);
         this.setCreativeTab(CATabs.ca_tabs);

src/main/java/com/nao7016/ClayiumAdditions/item/itemClayMiningHammer.java → src/main/java/com/nao7016/ClayiumAdditions/item/ItemClayMiningHammer.java

@@ -17,11 +17,11 @@
 import mods.clayium.block.CBlocks;
 import mods.clayium.util.UtilLocale;
 
-public class itemClayMiningHammer extends ItemPickaxe {
+public class ItemClayMiningHammer extends ItemPickaxe {
 
     private float efficiencyOnClayOre = 40.0F;
 
-    public itemClayMiningHammer() {
+    public ItemClayMiningHammer() {
         super(ToolMaterial.IRON);
         this.setMaxDamage(400);
         this.setCreativeTab(CATabs.ca_tabs);

src/main/java/com/nao7016/ClayiumAdditions/item/itemRawClayOre.java → src/main/java/com/nao7016/ClayiumAdditions/item/ItemRawClayOre.java

@@ -14,12 +14,12 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import mods.clayium.item.ItemDamaged;
 
-public class itemRawClayOre extends ItemDamaged {
+public class ItemRawClayOre extends ItemDamaged {
 
     private IIcon[] icons = new IIcon[3];
     private static final int[] VALID_METAS = { 1, 2 };
 
-    public itemRawClayOre() {
+    public ItemRawClayOre() {
         setUnlocalizedName("raw_clay_ore");
         setCreativeTab(CATabs.ca_tabs);
         setMaxStackSize(64);