More Crooks

LICENSE

@@ -4,6 +4,7 @@ Copyright (c) 2015 MikeLydeamore (original Mod);
 Copyright (c) 2017 Jacky1356400 (initial Port);
 Copyright (c) 2017 BloodWorkXGaming (current Maintainer)
 Copyright (c) 2017 SirLyle (current Maintainer)
+Copyright (c) 2019 Wolforce (textures)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

generate_crook_models.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+modid=exnihilocreatio
+texture_dir=src/main/resources/assets/${modid}/textures/items/tools/crook
+models_dir=src/main/resources/assets/${modid}/models/item
+
+for i in ${texture_dir}/crook_*.png; do
+    echo $i
+    asset=`basename $i .png`
+    model=${models_dir}/${asset}.json
+    touch model
+    cat > $model << EOL
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "${modid}:items/tools/crook/${asset}"
+  }
+}
+EOL
+done

gradle.properties

@@ -1,4 +1,4 @@
-enc_version=0.3.8.2
+enc_version=0.3.8.4
 
 mc_version=1.12.2
 mc_major=1.12

src/main/java/exnihilocreatio/ModItems.java

@@ -40,8 +40,17 @@ public class ModItems {
     public static final HammerBase hammerDiamond = new HammerBase("hammer_diamond", 4096, Item.ToolMaterial.DIAMOND);
     public static final HammerBase hammerGold = new HammerBase("hammer_gold", 64, Item.ToolMaterial.GOLD);
 
-    public static final CrookBase crookWood = new CrookBase("crook_wood", 64,0);
-    public static final CrookBase crookBone = new CrookBase("crook_bone", 256, 1);
+    public static final CrookBase crookWood = new CrookBase("crook_wood", ModConfig.crooking.durabilityWood,0);
+    public static final CrookBase crookBone = new CrookBase("crook_bone", ModConfig.crooking.durabilityBone, 1);
+    public static final CrookBase crookStone = new CrookBase("crook_stone", ModConfig.crooking.durabilityStone, 1);
+    public static final CrookBase crookAndesite = new CrookBase("crook_andesite", ModConfig.crooking.durabilityAndesite, 1);
+    public static final CrookBase crookGranite = new CrookBase("crook_granite", ModConfig.crooking.durabilityGranite, 1);
+    public static final CrookBase crookDiorite = new CrookBase("crook_diorite", ModConfig.crooking.durabilityDiorite, 1);
+    public static final CrookBase crookClayUncooked = new CrookBase("crook_clay_uncooked", ModConfig.crooking.durabilityClayUncooked, 0);
+    public static final CrookBase crookClay = new CrookBase("crook_clay", ModConfig.crooking.durabilityClay, 2);
+    public static final CrookBase crookPrismarine = new CrookBase("crook_prismarine", ModConfig.crooking.durabilityPrismarine, 2);
+    public static final CrookBase crookPurpur = new CrookBase("crook_purpur", ModConfig.crooking.durabilityPurpur, 3);
+    public static final CrookBase crookBlaze = (CrookBase) (new CrookBase("crook_blaze", ModConfig.crooking.durabilityBlaze, 3)).setMaxDamage(3);
 
     public static final ItemMesh mesh = new ItemMesh();
 

src/main/java/exnihilocreatio/Recipes.java

@@ -14,6 +14,8 @@ public static void init() {
             // TODO: see above
             FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(ModBlocks.crucibleStone, 1, 0), new ItemStack(ModBlocks.crucibleStone, 1, 1), 0.7f);
         }
+        if(!ModConfig.crooking.disableCrookCrafting)
+            FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(ModItems.crookClayUncooked, 1), new ItemStack(ModItems.crookClay, 1), 0.7f);
 
         FurnaceRecipes.instance().addSmeltingRecipe(ItemResource.getResourceStack("silkworm"), new ItemStack(ModItems.cookedSilkworm), 0.7f);
     }

src/main/java/exnihilocreatio/config/ModConfig.java

@@ -1,6 +1,7 @@
 package exnihilocreatio.config;
 
 import exnihilocreatio.ExNihiloCreatio;
+import exnihilocreatio.items.tools.CrookBase;
 import net.minecraftforge.common.config.Config;
 import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
@@ -77,6 +78,29 @@ public static class Crooking {
         public int numberOfTimesToTestVanillaDrops = 3;
         @Config.Comment("Disable the ExNihilo Crooks, useful if another mod adds compatible crooks.")
         public boolean disableCrookCrafting = Loader.isModLoaded("inspirations");
+
+        @Config.Comment("Default crook durability.")
+        public int durabilityWood = 64;
+        @Config.Comment("Default crook durability.")
+        public int durabilityBone = 256;
+        @Config.Comment("Default crook durability.")
+        public int durabilityStone = 128;
+        @Config.Comment("Default crook durability.")
+        public int durabilityAndesite = 128;
+        @Config.Comment("Default crook durability.")
+        public int durabilityGranite = 128;
+        @Config.Comment("Default crook durability.")
+        public int durabilityDiorite = 128;
+        @Config.Comment("Default crook durability.")
+        public int durabilityClayUncooked = 1;
+        @Config.Comment("Default crook durability.")
+        public int durabilityClay = 256;
+        @Config.Comment("Default crook durability.")
+        public int durabilityPrismarine = 512;
+        @Config.Comment("Default crook durability.")
+        public int durabilityPurpur = 512;
+        @Config.Comment("Default crook durability.")
+        public int durabilityBlaze = 1024;
     }
 
     public static class Misc {

src/main/java/exnihilocreatio/items/tools/CrookBase.java

@@ -15,19 +15,24 @@
 
 public class CrookBase extends ItemTool implements ICrook, IHasModel {
 
-    public CrookBase(String name, int maxUses, int miningLevel) {
-        super(ToolMaterial.WOOD, Sets.newHashSet(new Block[]{}));
+    public CrookBase(String name, int maxUses, int miningLevel, ToolMaterial mat) {
+        super(mat, Sets.newHashSet(new Block[]{}));
 
         this.setTranslationKey(name);
         this.setRegistryName(name);
         this.setMaxDamage(maxUses);
         this.setCreativeTab(ExNihiloCreatio.tabExNihilo);
-        this.setHarvestLevel("crook", miningLevel);
+        this.setHarvestLevel("crook", mat.getHarvestLevel());
+        this.attackDamage = mat.getAttackDamage();
 
         if(!ModConfig.crooking.disableCrookCrafting)
             Data.ITEMS.add(this);
     }
 
+    public CrookBase(String name, int maxUses, int miningLevel) {
+        this(name, maxUses, miningLevel, ToolMaterial.WOOD);
+    }
+
     @Override
     public boolean isCrook(ItemStack stack) {
         return true;

src/main/resources/assets/exnihilocreatio/lang/en_us.lang

@@ -10,6 +10,15 @@ item.exnihilocreatio.crook_tconstruct.desc=Who're you calling a crook? Performs
 
 item.crook_wood.name=Wooden Crook
 item.crook_bone.name=Bone Crook
+item.crook_stone.name=Stone Crook
+item.crook_andesite.name=Andestite Crook
+item.crook_granite.name=Granite Crook
+item.crook_diorite.name=Diorite Crook
+item.crook_clay_uncooked.name=Uncooked Clay Crook
+item.crook_clay.name=Clay Crook
+item.crook_prismarine.name=Prismarine Crook
+item.crook_purpur.name=Purpur Crook
+item.crook_blaze.name=Blazing Crook
 
 item.item_pebble.stone.name=Stone Pebble
 item.item_pebble.granite.name=Granite Pebble

src/main/resources/assets/exnihilocreatio/models/item/crook_andesite.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_andesite"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_blaze.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_blaze"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_bone.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/handheld",
   "textures": {
-    "layer0": "exnihilocreatio:items/crookbone"
+    "layer0": "exnihilocreatio:items/tools/crook/crook_bone"
   }
-}
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_clay.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_clay"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_clay_uncooked.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_clay_uncooked"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_granite.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_granite"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_prismarine.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_prismarine"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_purpur.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_purpur"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_stone.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "exnihilocreatio:items/tools/crook/crook_stone"
+  }
+}

src/main/resources/assets/exnihilocreatio/models/item/crook_wood.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/handheld",
   "textures": {
-    "layer0": "exnihilocreatio:items/crookwood"
+    "layer0": "exnihilocreatio:items/tools/crook/crook_wood"
   }
-}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_andesite.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_wood"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "exnihilocreatio:item_pebble", "data": 3}}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_blaze.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_blaze"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "minecraft:blaze_rod", "data": 0}}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_clay_uncooked.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_clay_uncooked"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "minecraft:clay_ball", "data": 0}}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_diorite.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_diorite"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "exnihilocreatio:item_pebble", "data": 2}}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_granite.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_granite"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "exnihilocreatio:item_pebble", "data": 1}}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_prismarine.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_prismarine"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "minecraft:prismarine_shard", "data": 0}}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_purpur.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_purpur"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "minecraft:popped_chorus", "data": 0}}
+}

src/main/resources/assets/exnihilocreatio/recipes/crook_stone.json

@@ -0,0 +1,12 @@
+{
+  "result": {
+    "item": "exnihilocreatio:crook_stone"
+  },
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "type": "minecraft:crafting_shaped",
+  "key": {"x": {"item": "exnihilocreatio:item_pebble", "data": 0}}
+}

src/main/resources/assets/exnihilocreatio/textures/items/tools/crook/crook_blaze.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}