diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index f8151fbdb..99eafa7a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -98,7 +98,7 @@ public final class ColorHandler { return 0xFFFFFF; } } - }, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, + }, ModItems.twigWand, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), Item.getItemFromBlock(ModBlocks.unstableBlock), Item.getItemFromBlock(ModBlocks.pool), Item.getItemFromBlock(ModBlocks.spreader)); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 12488bcda..64eabf358 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -48,8 +48,10 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - Block block = world.getBlockState(pos).getBlock(); - return block != this && super.shouldSideBeRendered(state, world, pos, side); + if (world.getBlockState(pos.offset(side)).getBlock() == this) { + return false; + } + return super.shouldSideBeRendered(state, world, pos, side); } @Override diff --git a/src/main/resources/assets/botania/blockstates/incensePlate.json b/src/main/resources/assets/botania/blockstates/incensePlate.json index 16318c0ad..1a9af84eb 100644 --- a/src/main/resources/assets/botania/blockstates/incensePlate.json +++ b/src/main/resources/assets/botania/blockstates/incensePlate.json @@ -14,12 +14,6 @@ "west": { "y": 90 }, "east": { "y": 270 } }, - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.35, 0 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 8e7938fd3..5c62b19bc 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -2,12 +2,7 @@ "forge_marker": 1, "defaults": { "model": "botania:pool_tinted", - "transform": { - "thirdperson": { - "translation": [ 0, 0.09375, -0.171875], - "rotation": [{"x": 10}, {"y": -45}, {"z": 0}] - } - } + "transform": "forge:default-block" }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index da87704b7..91fa6cd6d 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -9,20 +9,6 @@ }, "variants": { "normal": [{}], - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.25, 0 ] - }, - "gui": { - "translation": [ 0, 0.25, 0 ] - }, - "thirdperson": { - "translation": [ 0, 0.09375, -0.171875 ], - "rotation": [{ "x": 10 }, { "y": -45 }, { "z": 170 }], - "scale": [ 0.375, 0.375, 0.375 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json index 927faa6b9..ffec0652f 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -14,12 +14,6 @@ "true": {}, "false": {} }, - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.125, 0 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinyPotato.json index fbf298eca..91f7e87d5 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPotato.json +++ b/src/main/resources/assets/botania/blockstates/tinyPotato.json @@ -14,12 +14,6 @@ "west": { "y": 270 }, "east": { "y": 90 } }, - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.25, 0 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file