From 33dc7033a9e6f6202d1d902b3fb646bb99871297 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Mar 2019 14:55:58 -0500 Subject: [PATCH] It runs, kind of --- .../core/handler/BoundTileRenderer.java | 2 +- .../client/core/handler/DebugHandler.java | 2 +- .../advancements/challenge/desu_gun.json | 4 ++-- .../advancements/challenge/null_flower.json | 2 +- .../advancements/main/bubbell_pickup.json | 4 ++-- .../advancements/main/dandelifeon_pickup.json | 4 ++-- .../advancements/main/flower_pickup.json | 2 +- .../advancements/main/functional_flower.json | 2 +- .../advancements/main/generating_flower.json | 2 +- .../main/heisei_dream_pickup.json | 4 ++-- .../advancements/main/kekimurus_pickup.json | 4 ++-- .../advancements/main/pollidisiac_pickup.json | 4 ++-- .../resources/data/botania/tags/flowers.json | 21 +++++++++++++++++++ 13 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/data/botania/tags/flowers.json diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 577eeaddf..df57aae29 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -64,7 +64,7 @@ public final class BoundTileRenderer { renderBlockOutlineAt(coords, color); } - IItemHandlerModifiable mainInv = (IItemHandlerModifiable) player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP); + IItemHandlerModifiable mainInv = (IItemHandlerModifiable) player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP).orElseThrow(IllegalStateException::new); IItemHandlerModifiable baublesInv = BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player); IItemHandler joined = baublesInv != null ? new CombinedInvWrapper(mainInv, baublesInv) : mainInv; diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 6f2afd80f..0ee4c3b4f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -67,7 +67,7 @@ public final class DebugHandler { Entity ent = Minecraft.getInstance().getIntegratedServer().getWorld(dim).getEntityFromUuid(id); if (ent != null) { World serverWorld = ent.world; - event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", dimName, ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); + event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER DIM %s) netColl : %d, netPool: %d", dimName, ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); } } diff --git a/src/main/resources/data/botania/advancements/challenge/desu_gun.json b/src/main/resources/data/botania/advancements/challenge/desu_gun.json index 5e532023d..306ba42f0 100644 --- a/src/main/resources/data/botania/advancements/challenge/desu_gun.json +++ b/src/main/resources/data/botania/advancements/challenge/desu_gun.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:manaGun", + "item": "botania:mana_gun", "nbt": "{\"display\": { \"Name\": \"desu gun\" }}" }, "title": { @@ -18,7 +18,7 @@ "trigger": "botania:use_item_success", "conditions": { "item": { - "item": "botania:manaGun", + "item": "botania:mana_gun", "nbt": "{\"display\": { \"Name\": \"desu gun\" }}" } } diff --git a/src/main/resources/data/botania/advancements/challenge/null_flower.json b/src/main/resources/data/botania/advancements/challenge/null_flower.json index 0ddd9f361..f72ae5e0c 100644 --- a/src/main/resources/data/botania/advancements/challenge/null_flower.json +++ b/src/main/resources/data/botania/advancements/challenge/null_flower.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower" + "item": "botania:special_flower" }, "title": { "translate": "advancement.botania:nullFlower" diff --git a/src/main/resources/data/botania/advancements/main/bubbell_pickup.json b/src/main/resources/data/botania/advancements/main/bubbell_pickup.json index 09b1fc145..a0776c87a 100644 --- a/src/main/resources/data/botania/advancements/main/bubbell_pickup.json +++ b/src/main/resources/data/botania/advancements/main/bubbell_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"bubbell\"}" }, "title": { @@ -18,7 +18,7 @@ "conditions": { "items": [ { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"bubbell\"}" } ] diff --git a/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json b/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json index 2f26e2651..914006b03 100644 --- a/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json +++ b/src/main/resources/data/botania/advancements/main/dandelifeon_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"dandelifeon\"}" }, "title": { @@ -18,7 +18,7 @@ "conditions": { "items": [ { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"dandelifeon\"}" } ] diff --git a/src/main/resources/data/botania/advancements/main/flower_pickup.json b/src/main/resources/data/botania/advancements/main/flower_pickup.json index eea05c6a3..975bfb55f 100644 --- a/src/main/resources/data/botania/advancements/main/flower_pickup.json +++ b/src/main/resources/data/botania/advancements/main/flower_pickup.json @@ -18,7 +18,7 @@ "conditions": { "items": [ { - "item": "botania:flower" + "tag": "botania:flowers" } ] } diff --git a/src/main/resources/data/botania/advancements/main/functional_flower.json b/src/main/resources/data/botania/advancements/main/functional_flower.json index ba68bdfd3..369640afd 100644 --- a/src/main/resources/data/botania/advancements/main/functional_flower.json +++ b/src/main/resources/data/botania/advancements/main/functional_flower.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"bellethorn\"}" }, "title": { diff --git a/src/main/resources/data/botania/advancements/main/generating_flower.json b/src/main/resources/data/botania/advancements/main/generating_flower.json index 2ae447c93..cbb794498 100644 --- a/src/main/resources/data/botania/advancements/main/generating_flower.json +++ b/src/main/resources/data/botania/advancements/main/generating_flower.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"endoflame\"}" }, "title": { diff --git a/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json b/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json index 19b3fc52b..777c9dadc 100644 --- a/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json +++ b/src/main/resources/data/botania/advancements/main/heisei_dream_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"heiseiDream\"}" }, "title": { @@ -18,7 +18,7 @@ "conditions": { "items": [ { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"heiseiDream\"}" } ] diff --git a/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json b/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json index 93cd79cd8..eb5d7ba2a 100644 --- a/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json +++ b/src/main/resources/data/botania/advancements/main/kekimurus_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"kekimurus\"}" }, "title": { @@ -18,7 +18,7 @@ "conditions": { "items": [ { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"kekimurus\"}" } ] diff --git a/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json b/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json index 986af67f4..00aeac5d8 100644 --- a/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json +++ b/src/main/resources/data/botania/advancements/main/pollidisiac_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"pollidisiac\"}" }, "title": { @@ -18,7 +18,7 @@ "conditions": { "items": [ { - "item": "botania:specialFlower", + "item": "botania:special_flower", "nbt": "{\"type\": \"pollidisiac\"}" } ] diff --git a/src/main/resources/data/botania/tags/flowers.json b/src/main/resources/data/botania/tags/flowers.json new file mode 100644 index 000000000..2e8ae4e0c --- /dev/null +++ b/src/main/resources/data/botania/tags/flowers.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#botania:flowers/white", + "#botania:flowers/orange", + "#botania:flowers/magenta", + "#botania:flowers/light_blue", + "#botania:flowers/yellow", + "#botania:flowers/lime", + "#botania:flowers/pink", + "#botania:flowers/gray", + "#botania:flowers/light_gray", + "#botania:flowers/cyan", + "#botania:flowers/purple", + "#botania:flowers/blue", + "#botania:flowers/brown", + "#botania:flowers/green", + "#botania:flowers/red", + "#botania:flowers/black" + ] +} \ No newline at end of file