Add evil prismarine and more tweaks

src/main/java/com/github/mechalopa/hmag/registry/ModItems.java

@@ -144,7 +144,8 @@ public int getBurnTime(ItemStack stack, @Nullable RecipeType<?> recipeType)
 	public static final RegistryObject<Item> REINFORCING_CHAIN = REGISTRY.register("reinforcing_chain", () -> new Item(new Item.Properties()));
 	public static final RegistryObject<Item> MULTIPLEX_REINFORCING_CHAIN = REGISTRY.register("multiplex_reinforcing_chain", () -> new ModItem(new Item.Properties().rarity(Rarity.UNCOMMON), new ModItem.Properties().foil()));
 	public static final RegistryObject<Item> REPULSION_GADGET = REGISTRY.register("repulsion_gadget", () -> new Item(new Item.Properties()));
-	public static final RegistryObject<Item> EVIL_FLAME = REGISTRY.register("evil_flame", () -> new EvilFlameItem(new Item.Properties()));
+	public static final RegistryObject<Item> EVIL_FLAME = REGISTRY.register("evil_flame", () -> new EvilFlameItem(new Item.Properties(), new ModItem.Properties().burnTime(1600)));
+	public static final RegistryObject<Item> EVIL_PRISMARINE = REGISTRY.register("evil_prismarine", () -> new Item(new Item.Properties()));
 	public static final RegistryObject<Item> EVIL_THORN = REGISTRY.register("evil_thorn", () -> new EvilThornItem(new Item.Properties()));
 	public static final RegistryObject<Item> GREEDY_CRYSTAL = REGISTRY.register("greedy_crystal", () -> new ModItem(new Item.Properties().rarity(Rarity.UNCOMMON), new ModItem.Properties().foil()));
 	public static final RegistryObject<Item> GREEDY_CRYSTAL_PLUS = REGISTRY.register("greedy_crystal_plus", () -> new ModItem(new Item.Properties().rarity(Rarity.RARE), new ModItem.Properties().foil()));

src/main/java/com/github/mechalopa/hmag/world/item/EvilFlameItem.java

@@ -9,11 +9,11 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 
-public class EvilFlameItem extends Item
+public class EvilFlameItem extends ModItem
 {
-	public EvilFlameItem(Item.Properties builder)
+	public EvilFlameItem(Item.Properties builder, ModItem.Properties builder2)
 	{
-		super(builder);
+		super(builder, builder2);
 	}
 
 	@Override

src/main/resources/assets/hmag/lang/en_us.json

@@ -136,6 +136,7 @@
   "item.hmag.multiplex_reinforcing_chain": "Multiplex Reinforcing Chain",
   "item.hmag.repulsion_gadget": "Repulsion Gadget",
   "item.hmag.evil_flame": "Evil Flame",
+  "item.hmag.evil_prismarine": "Evil Prismarine",
   "item.hmag.evil_thorn": "Evil Thorn",
   "item.hmag.greedy_crystal": "Greedy Crystal",
   "item.hmag.greedy_crystal_plus": "Greedy Crystal +",

src/main/resources/assets/hmag/lang/ja_jp.json

@@ -136,6 +136,7 @@
   "item.hmag.multiplex_reinforcing_chain": "多重補強鎖",
   "item.hmag.repulsion_gadget": "斥力ガジェット",
   "item.hmag.evil_flame": "邪悪な焔",
+  "item.hmag.evil_prismarine": "邪悪なプリズマリン",
   "item.hmag.evil_thorn": "邪悪な棘",
   "item.hmag.greedy_crystal": "強欲のクリスタル",
   "item.hmag.greedy_crystal_plus": "強欲のクリスタル＋",

src/main/resources/assets/hmag/models/item/evil_prismarine.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hmag:item/evil_prismarine"
+  }
+}

src/main/resources/data/hmag/hmag/enchantment_upgrade/hmag.json

@@ -42,10 +42,38 @@
       "minLevel": 0,
       "template": "hmag:evil_crystal_upgrade_smithing_template"
     },
+    {
+      "addition": "hmag:evil_prismarine",
+      "enchantment": "hmag:water_aspect",
+      "maxLevel": 4,
+      "minLevel": 0,
+      "template": "hmag:evil_crystal_upgrade_smithing_template"
+    },
+    {
+      "addition": "hmag:evil_prismarine",
+      "enchantment": "minecraft:riptide",
+      "maxLevel": 2,
+      "minLevel": 0,
+      "template": "hmag:evil_crystal_upgrade_smithing_template"
+    },
+    {
+      "addition": "hmag:evil_prismarine",
+      "enchantment": "minecraft:respiration",
+      "maxLevel": 2,
+      "minLevel": 0,
+      "template": "hmag:evil_crystal_upgrade_smithing_template"
+    },
+    {
+      "addition": "hmag:evil_prismarine",
+      "enchantment": "minecraft:depth_strider",
+      "maxLevel": 2,
+      "minLevel": 0,
+      "template": "hmag:evil_crystal_upgrade_smithing_template"
+    },
     {
       "addition": "hmag:evil_thorn",
       "enchantment": "minecraft:thorns",
-      "maxLevel": 9,
+      "maxLevel": 6,
       "minLevel": 0,
       "template": "hmag:evil_crystal_upgrade_smithing_template"
     },

src/main/resources/data/hmag/loot_tables/blocks/heart_of_the_sea_block.json

@@ -3,11 +3,6 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ],
       "entries": [
         {
           "type": "minecraft:item",

src/main/resources/data/hmag/loot_tables/blocks/nether_star_block.json

@@ -3,11 +3,6 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ],
       "entries": [
         {
           "type": "minecraft:item",

src/main/resources/data/hmag/loot_tables/blocks/reinforced_block.json

@@ -3,11 +3,6 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ],
       "entries": [
         {
           "type": "minecraft:item",

src/main/resources/data/hmag/loot_tables/blocks/reinforced_glass.json

@@ -3,11 +3,6 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ],
       "entries": [
         {
           "type": "minecraft:item",

src/main/resources/data/hmag/loot_tables/blocks/tinted_reinforced_glass.json

@@ -3,11 +3,6 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ],
       "entries": [
         {
           "type": "minecraft:item",

src/main/resources/data/hmag/recipes/evil_prismarine.json

@@ -0,0 +1,23 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "minecraft:ink_sac"
+    },
+    {
+      "item": "minecraft:glow_ink_sac"
+    },
+    {
+      "tag": "forge:gems/prismarine"
+    },
+    {
+      "tag": "forge:dusts/prismarine"
+    },
+    {
+      "item": "hmag:evil_crystal_fragment"
+    }
+  ],
+  "result": {
+    "item": "hmag:evil_prismarine"
+  }
+}

src/main/resources/data/hmag/recipes/prismarine_shard_from_blasting.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:blasting",
+  "ingredient": [
+    {
+      "item": "hmag:evil_prismarine"
+    }
+  ],
+  "result": "minecraft:prismarine_shard",
+  "experience": 0.1,
+  "cookingtime": 100
+}

src/main/resources/data/hmag/recipes/prismarine_shard_from_smelting.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:smelting",
+  "ingredient": [
+    {
+      "item": "hmag:evil_prismarine"
+    }
+  ],
+  "result": "minecraft:prismarine_shard",
+  "experience": 0.1,
+  "cookingtime": 200
+}