diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index ab8b73623..a87eb0286 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -75,11 +75,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Override public void fillItemGroup(@Nonnull ItemGroup tab, @Nonnull NonNullList list) { - super.fillItemGroup(tab, list); if(isInGroup(tab)) { - for(int i = 0; i < 4; i++) { + for(int i = 0; i <= 20; i += 5) { ItemStack s = new ItemStack(this); - s.getOrCreateTag().putInt(TAG_LEVEL, (i + 1) * 5 - 1); + s.getOrCreateTag().putInt(TAG_LEVEL, i); list.add(s); } } diff --git a/src/main/resources/data/botania/recipes/laputa_shard_0.json b/src/main/resources/data/botania/recipes/laputa_shard_0.json index 5d943b68d..367480a4d 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_0.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_0.json @@ -1,6 +1,7 @@ { "result": { - "item": "botania:laputa_shard" + "item": "botania:laputa_shard", + "nbt": "{level: 0}" }, "pattern": [ "SFS", diff --git a/src/main/resources/data/botania/recipes/laputa_shard_1.json b/src/main/resources/data/botania/recipes/laputa_shard_1.json index 6107ac262..bba42ac19 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_1.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_1.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:0}" + "nbt": { + "level": 0 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_10.json b/src/main/resources/data/botania/recipes/laputa_shard_10.json index 0d021c354..844213ec0 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_10.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_10.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:9}" + "nbt": { + "level": 9 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_11.json b/src/main/resources/data/botania/recipes/laputa_shard_11.json index 388c57c5a..1d49dc560 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_11.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_11.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:10}" + "nbt": { + "level": 10 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_12.json b/src/main/resources/data/botania/recipes/laputa_shard_12.json index cea7c14eb..b5aaf8d16 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_12.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_12.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:11}" + "nbt": { + "level": 11 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_13.json b/src/main/resources/data/botania/recipes/laputa_shard_13.json index 228ac66ae..8a095c78f 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_13.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_13.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:12}" + "nbt": { + "level": 12 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_14.json b/src/main/resources/data/botania/recipes/laputa_shard_14.json index 0eda782e0..92b88a45e 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_14.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_14.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:13}" + "nbt": { + "level": 13 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_15.json b/src/main/resources/data/botania/recipes/laputa_shard_15.json index 37d35a504..720a1f762 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_15.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_15.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:14}" + "nbt": { + "level": 14 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_16.json b/src/main/resources/data/botania/recipes/laputa_shard_16.json index e10fa7491..5068cec6f 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_16.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_16.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:15}" + "nbt": { + "level": 15 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_17.json b/src/main/resources/data/botania/recipes/laputa_shard_17.json index 4e576ba6e..6d4a3f2e9 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_17.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_17.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:16}" + "nbt": { + "level": 16 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_18.json b/src/main/resources/data/botania/recipes/laputa_shard_18.json index 75b041d98..501b0c0cd 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_18.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_18.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:17}" + "nbt": { + "level": 17 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_19.json b/src/main/resources/data/botania/recipes/laputa_shard_19.json index 85fe03147..fbbb46561 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_19.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_19.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:18}" + "nbt": { + "level": 18 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_2.json b/src/main/resources/data/botania/recipes/laputa_shard_2.json index fab45036c..292727bca 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_2.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_2.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:1}" + "nbt": { + "level": 1 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_3.json b/src/main/resources/data/botania/recipes/laputa_shard_3.json index e1f01b6e9..0a4fe307e 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_3.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_3.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:2}" + "nbt": { + "level": 2 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_4.json b/src/main/resources/data/botania/recipes/laputa_shard_4.json index 8b430852b..ee3ec1502 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_4.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_4.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:3}" + "nbt": { + "level": 3 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_5.json b/src/main/resources/data/botania/recipes/laputa_shard_5.json index 996005730..f4e05be4c 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_5.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_5.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:4}" + "nbt": { + "level": 4 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_6.json b/src/main/resources/data/botania/recipes/laputa_shard_6.json index 1b288dd72..3985badd2 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_6.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_6.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:5}" + "nbt": { + "level": 5 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_7.json b/src/main/resources/data/botania/recipes/laputa_shard_7.json index 856868e83..a28508231 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_7.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_7.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:6}" + "nbt": { + "level": 6 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_8.json b/src/main/resources/data/botania/recipes/laputa_shard_8.json index b4c26bf43..f98c1921f 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_8.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_8.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:7}" + "nbt": { + "level": 7 + } } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/laputa_shard_9.json b/src/main/resources/data/botania/recipes/laputa_shard_9.json index 771cc50a8..e805a99ec 100644 --- a/src/main/resources/data/botania/recipes/laputa_shard_9.json +++ b/src/main/resources/data/botania/recipes/laputa_shard_9.json @@ -9,8 +9,11 @@ "item": "botania:life_essence" }, { + "type": "forge:nbt", "item": "botania:laputa_shard", - "nbt": "{level:8}" + "nbt": { + "level": 8 + } } ], "type": "minecraft:crafting_shapeless"