It runs, kind of

This commit is contained in:
Vincent Lee committed 2019-03-21 14:55:58 -05:00
1 parent 03df0135cf
commit 33dc7033a9
13 files changed
+39 -18

No files matched your search

@@ -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;
@@ -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()));
}
}
@@ -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\" }}"
}
}
@@ -1,7 +1,7 @@
{
"display": {
"icon": {
"item": "botania:specialFlower"
"item": "botania:special_flower"
},
"title": {
"translate": "advancement.botania:nullFlower"
@@ -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\"}"
}
]
@@ -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\"}"
}
]
@@ -18,7 +18,7 @@
"conditions": {
"items": [
{
"item": "botania:flower"
"tag": "botania:flowers"
}
]
}
@@ -1,7 +1,7 @@
{
"display": {
"icon": {
"item": "botania:specialFlower",
"item": "botania:special_flower",
"nbt": "{\"type\": \"bellethorn\"}"
},
"title": {
@@ -1,7 +1,7 @@
{
"display": {
"icon": {
"item": "botania:specialFlower",
"item": "botania:special_flower",
"nbt": "{\"type\": \"endoflame\"}"
},
"title": {
@@ -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\"}"
}
]
@@ -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\"}"
}
]
@@ -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\"}"
}
]
@@ -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"
]
}